xmlsec: 1.2.34 -> 1.3.5

Also make the Darwin patch unconditional, since it has no reason to be conditional.

pkgs/development/libraries/xmlsec/default.nix

@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool
+{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool
 , openssl, nss, lib, runCommandCC, writeText }:
 
 lib.fix (self:
 stdenv.mkDerivation rec {
   pname = "xmlsec";
-  version = "1.2.34";
+  version = "1.3.5";
 
   src = fetchurl {
     url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
-    sha256 = "sha256-Us7UlD81vX0IGKOCmMFSjKSsilRED9cRNKB9LRNwomI=";
+    sha256 = "sha256-L/1K0fhg7JPkemgDEKsryUlovQdWbnGXa9lhM9lQSRc=";
   };
 
   patches = [
     ./lt_dladdsearchdir.patch
+    ./remove_bsd_base64_decode_flag.patch
+  ];
 
-    # Fix build with libxml2 2.12
-    (fetchpatch {
-      url = "https://github.com/lsh123/xmlsec/commit/ffb327376f5bb69e8dfe7f805529e45a40118c2b.patch";
-      hash = "sha256-o8CLemOiGIHJsYfVQtNzJNVyk03fdmCbvgA8c3OYxo4=";
-    })
-  ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ];
   postPatch = ''
     substituteAllInPlace src/dl.c
   '';
@@ -39,9 +35,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
   nativeCheckInputs = [ nss.tools ];
   preCheck = ''
-    substituteInPlace tests/testrun.sh \
-      --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \
-      --replace 'TMPFOLDER=/tmp' '$(mktemp -d)'
+    export TMPFOLDER=$(mktemp -d)
+    substituteInPlace tests/testrun.sh --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000'
   '';
 
   # enable deprecated soap headers required by lasso

pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch

@@ -1,11 +1,11 @@
---- 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 @@
+--- a/tests/testEnc.sh
++++ b/tests/testEnc.sh
+@@ -1181,9 +1181,6 @@ for aesgcm_k_l in $aesgcm_key_lengths ; do
              else
                  # generate binary file out of base64
                  DECODE="-d"
 -                if [ "`uname`" = "Darwin" ]; then
--		    DECODE="-D"
+-		            DECODE="-D"
 -                fi
                  cat "$topfolder/$base_test_name.data" | base64 $DECODE > $tmpfile.3
                  execEncTest "$res_success" \