From 0351829bf8e7adc89bc0c9e9e6084fca63284837 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Dec 2019 12:59:32 +0000 Subject: [PATCH 1/2] libofx: 0.9.14 -> 0.9.15 (security) resolving CVE-2019-9656 --- pkgs/development/libraries/libofx/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 6723c08f0822..7e5e1cec9258 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: - -stdenv.mkDerivation rec { - name = "libofx-0.9.14"; +{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl +, autoconf, automake, libtool, gengetopt }: - src = fetchurl { - url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "02i9zxkp66yxjpjay5dscfh53bz5vxy03zcxncpw09svl6zmf9xq"; +stdenv.mkDerivation rec { + pname = "libofx"; + version = "0.9.15"; + + src = fetchFromGitHub { + owner = "LibOFX"; + repo = pname; + rev = version; + sha256 = "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy"; }; + preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ]; buildInputs = [ opensp libxml2 curl ]; meta = { @@ -20,4 +25,3 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; } - From 8169d30c0c9ca7291f15075b513336c243ac2c57 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Dec 2019 13:11:50 +0000 Subject: [PATCH 2/2] libofx: enable for darwin --- pkgs/development/libraries/libofx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 7e5e1cec9258..76276f0ce0fc 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl -, autoconf, automake, libtool, gengetopt }: +, autoconf, automake, libtool, gengetopt, libiconv }: stdenv.mkDerivation rec { pname = "libofx"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ]; - buildInputs = [ opensp libxml2 curl ]; + buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; meta = { description = "Opensource implementation of the Open Financial eXchange specification"; homepage = http://libofx.sourceforge.net/; license = "LGPL"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; }