summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/xmlsec/APKBUILD12
-rw-r--r--user/xmlsec/fix-tests.patch176
2 files changed, 5 insertions, 183 deletions
diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD
index 4b7f83509..5c71b8f19 100644
--- a/user/xmlsec/APKBUILD
+++ b/user/xmlsec/APKBUILD
@@ -1,20 +1,19 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=xmlsec
-pkgver=1.2.28
+pkgver=1.2.29
_pkgname="$pkgname${pkgver%%.*}"
-pkgrel=1
+pkgrel=0
pkgdesc="C-based XML signature and encryption syntax and processing library"
url="https://www.aleksey.com/xmlsec/"
arch="all"
license="MIT"
depends=""
checkdepends="nss-tools"
-makedepends="libxml2-dev libxslt-dev openssl-dev
+makedepends="libtool libxml2-dev libxslt-dev openssl-dev
gnutls-dev libgcrypt-dev nss-dev"
subpackages="$pkgname-dev $pkgname-doc
$pkgname-gcrypt $pkgname-gnutls $pkgname-nss"
-source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz
- fix-tests.patch"
+source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
@@ -69,5 +68,4 @@ nss() {
mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/
}
-sha512sums="17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 xmlsec1-1.2.28.tar.gz
-2f146b31460ae1843a696c77cef03b36a0bf212028189055834e2e50d7a3142f6a069ce18a5c6b2251b5846fad7e96a6d9e26a6445fd182ac4c44c70afc4f8a3 fix-tests.patch"
+sha512sums="07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d xmlsec1-1.2.29.tar.gz"
diff --git a/user/xmlsec/fix-tests.patch b/user/xmlsec/fix-tests.patch
deleted file mode 100644
index 73acdf800..000000000
--- a/user/xmlsec/fix-tests.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-Backport of the following commits:
-
-b841f2c0b1e9cf24d991cc8b5d21e5a3b7c6ad80
-f25e8f07428b9475fa576bf78d77fb4fa366bc70
-106e7dbf39d96c46aedecf229d55a09e7593f1ec
-
-diff --git a/tests/testDSig.sh b/tests/testDSig.sh
-index 77372311..f2014464 100755
---- a/tests/testDSig.sh
-+++ b/tests/testDSig.sh
-@@ -805,98 +805,98 @@ execDSigTest $res_success \
- "signature-rsa-detached-b64-transform" \
- "base64 sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached-xpath-transform" \
- "xpath sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached-xslt-transform-retrieval-method" \
- "xslt sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached-xslt-transform" \
- "xslt sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-enveloped" \
- "enveloped-signature sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-enveloping" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-cert-chain" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-cert" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-issuer-serial" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-ski" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-subject-name" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-xpath-transform-enveloped" \
- "enveloped-signature xpath sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00"
-
-
- ##########################################################################
-@@ -940,7 +940,7 @@ execDSigTest $res_fail \
- "merlin-xmldsig-twenty-three/signature-x509-crt-crl" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--X509-skip-strict-checks --trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018"
-+ "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018"
-
- execDSigTest $res_fail \
- "" \
-diff --git a/tests/testrun.sh b/tests/testrun.sh
-index ea65802b..fe0334c7 100755
---- a/tests/testrun.sh
-+++ b/tests/testrun.sh
-@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
- elif [ "z$crypto" != "z" ] ; then
- xmlsec_params="$xmlsec_params --crypto $crypto"
- fi
--xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
-+xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
-
- #
- # Setup keys config
-@@ -308,8 +308,8 @@ execDSigTest() {
- # run tests
- if [ -n "$params1" ] ; then
- printf " Verify existing signature "
-- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
- printRes $expected_res $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -328,8 +328,8 @@ execDSigTest() {
-
- if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
- printf " Verify new signature "
-- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
-- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
- printRes $res_success $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -406,7 +406,7 @@ execEncTest() {
- if [ -n "$params1" ] ; then
- rm -f $tmpfile
- printf " Decrypt existing document "
-- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile
- $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile
- res=$?
- echo "=== TEST RESULT: $res; expected: $expected_res" >> $curlogfile
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-12 11:28:36 +0000