diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix | 19 | ||||
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch | 12 |
2 files changed, 25 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 0d6fd9611c4e..6d310443e70c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool -, openssl, nss, lib, runCommandCC, writeText }: +# nss_3_53 is used instead of the latest due to a number of issues: +# https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss +, openssl, nss_3_53, lib, runCommandCC, writeText }: lib.fix (self: let - version = "1.2.30"; + version = "1.2.31"; in stdenv.mkDerivation { pname = "xmlsec"; @@ -11,12 +13,12 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1j5bf7ni45jghyrbf7a14wx2pvfara557zyry7g7h8840c5kd11d"; + sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY="; }; patches = [ ./lt_dladdsearchdir.patch - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c ''; @@ -25,11 +27,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; + buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; enableParallelBuilding = true; doCheck = true; - checkInputs = [ nss.tools ]; + checkInputs = [ nss_3_53.tools ]; + preCheck = '' + substituteInPlace tests/testrun.sh \ + --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ + --replace 'TMPFOLDER=/tmp' '$(mktemp -d)' + ''; # enable deprecated soap headers required by lasso # https://dev.entrouvert.org/issues/18771 diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch new file mode 100644 index 000000000000..700fad7e3dd4 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch @@ -0,0 +1,12 @@ +--- a/tests/testEnc.sh 2020-04-20 14:30:32.000000000 -0400 ++++ b/tests/testEnc.sh 2020-10-21 22:09:25.000000000 -0400 +@@ -405,9 +405,6 @@ + else + # generate binary file out of base64 + DECODE="-d" +- if [ "`uname`" = "Darwin" ]; then +- DECODE="-D" +- fi + cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3 + execEncTest "$res_success" \ + "" \ |