amd64 consumers build fine, tests needed light fixing to yield
--- TOTAL OK: 521; OK (percent): 89; TOTAL FAILED: 0; TOTAL SKIPPED: 58
Runtime tests from actual oauth-toolkit or aqbanking users?
Feedback? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/xmlsec/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 23 May 2022 20:23:02 -0000 1.56
+++ Makefile 2 Sep 2023 17:09:39 -0000
@@ -1,15 +1,15 @@
COMMENT-main= XML security library
COMMENT-docs= XML security library documentation
-VERSION= 1.2.34
+VERSION= 1.3.1
DISTNAME= xmlsec1-${VERSION}
PKGNAME-main= xmlsec-${VERSION}
PKGNAME-docs= xmlsec-docs-${VERSION}
CATEGORIES= security
-SHARED_LIBS= xmlsec1-gnutls 5.0 \
- xmlsec1-openssl 4.1 \
- xmlsec1-gcrypt 0.0 \
- xmlsec1 8.2
+SHARED_LIBS= xmlsec1-gnutls 6.0 \
+ xmlsec1-openssl 5.0 \
+ xmlsec1-gcrypt 1.0 \
+ xmlsec1 9.0
HOMEPAGE= https://www.aleksey.com/xmlsec/
@@ -46,7 +46,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}
# see /usr/local/include/libxml2/libxml/xmlversion.h:413
CONFIGURE_ENV += ac_cv_header_ansidecl_h=no
-TEST_DEPENDS= xmlsec-${VERSION}:security/xmlsec
+TEST_DEPENDS= converters/base64 \
+ xmlsec-${VERSION}:security/xmlsec
TEST_FLAGS= ABS_BUILDDIR="${WRKSRC}"
.include <bsd.port.arch.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/xmlsec/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 12 May 2022 21:19:06 -0000 1.20
+++ distinfo 2 Sep 2023 15:50:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (xmlsec1-1.2.34.tar.gz) = Us7UlD81vX0IGKOCmMFSjKSsilRED9cRNKB9LRNwomI=
-SIZE (xmlsec1-1.2.34.tar.gz) = 1991505
+SHA256 (xmlsec1-1.3.1.tar.gz) = EPSDhNT9GvwF/qVFt0+/fBUlgvColcGJ8WTVUnBADGM=
+SIZE (xmlsec1-1.3.1.tar.gz) = 2432943
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/security/xmlsec/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 12 May 2022 21:19:06 -0000 1.4
+++ patches/patch-Makefile_in 2 Sep 2023 15:50:37 -0000
@@ -1,12 +1,12 @@
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -1177,7 +1177,7 @@ check: check-all check-info
+@@ -1206,7 +1206,7 @@ check: check-all check-info
- check-all: $(TEST_APP)
+ check-all: $(TEST_APP)
for crypto in $(CHECK_CRYPTO_LIST) ; do \
- make check-crypto-$$crypto || exit 1 ; \
+ $(MAKE) check-crypto-$$crypto || exit 1 ; \
done
- check-crypto-%: $(TEST_APP)
+ check-crypto-%: $(TEST_APP)
Index: patches/patch-tests_testrun_sh
===================================================================
RCS file: /cvs/ports/security/xmlsec/patches/patch-tests_testrun_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-tests_testrun_sh
--- patches/patch-tests_testrun_sh 12 May 2022 21:19:06 -0000 1.6
+++ patches/patch-tests_testrun_sh 2 Sep 2023 16:55:17 -0000
@@ -1,14 +1,46 @@
+GNU uname aka. guname(1) -o, --operating-system is uname(1) -s.
+Fix a few tests (probably shell quote/file handling messed up).
Remove bash-ism.
Index: tests/testrun.sh
--- tests/testrun.sh.orig
+++ tests/testrun.sh
-@@ -472,7 +472,7 @@ execEncTest() {
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+
+-OS_ARCH=`uname -o`
++OS_ARCH=`uname -s`
+ OS_KERNEL=`uname -s`
+
+ #
+@@ -704,7 +704,9 @@ execEncTest() {
+ cat $tmpfile | $outputTransform > $tmpfile.2
+ mv $tmpfile.2 $tmpfile
+ fi
+- diff $diff_param $full_file.data $tmpfile >> $curlogfile 2>>
$curlogfile
++ # $outputTransform may be set to "base64" in which case identical
++ # strings happen to differ, ignoring trailing spaces fixes that
++ diff -b $diff_param $full_file.data $tmpfile >> $curlogfile 2>>
$curlogfile
+ printRes $expected_res $?
+ else
+ printRes $expected_res $res
+@@ -736,7 +738,9 @@ execEncTest() {
+ cat $tmpfile.2 | $outputTransform > $tmpfile
+ mv $tmpfile $tmpfile.2
+ fi
+- diff $diff_param $full_file.data $tmpfile.2 >> $curlogfile 2>>
$curlogfile
++ # $outputTransform may be set to "base64" in which case identical
++ # strings happen to differ, ignoring trailing spaces fixes that
++ diff -b $diff_param $full_file.data $tmpfile.2 >> $curlogfile 2>>
$curlogfile
+ printRes $res_success $?
+ else
+ printRes $res_success $res
+@@ -761,7 +765,7 @@ execEncTest() {
rm -rf $tmpfile $tmpfile.2 tmpfile.3
# run tests
-source "$testfile"
+. "$testfile"
- # print results
- echo "--- TOTAL OK: $count_success; TOTAL FAILED: $count_fail; TOTAL SKIPPED:
$count_skip" >> $logfile
+ # calculate success
+ percent_success=0
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/security/xmlsec/pkg/PLIST-docs,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-docs
--- pkg/PLIST-docs 11 Mar 2022 19:54:09 -0000 1.9
+++ pkg/PLIST-docs 2 Sep 2023 15:51:48 -0000
@@ -85,7 +85,6 @@ share/doc/xmlsec1/api/xmlsec-notes-new-c
share/doc/xmlsec1/api/xmlsec-notes-new-crypto-klasses.html
share/doc/xmlsec1/api/xmlsec-notes-new-crypto-sharing-results.html
share/doc/xmlsec1/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
-share/doc/xmlsec1/api/xmlsec-notes-new-crypto-skeleton.html
share/doc/xmlsec1/api/xmlsec-notes-new-crypto-transforms.html
share/doc/xmlsec1/api/xmlsec-notes-new-crypto.html
share/doc/xmlsec1/api/xmlsec-notes-overview.html
@@ -125,7 +124,6 @@ share/doc/xmlsec1/api/xmlsec-verify-with
share/doc/xmlsec1/api/xmlsec-verify-with-restrictions.html
share/doc/xmlsec1/api/xmlsec-verify-with-x509.html
share/doc/xmlsec1/api/xmlsec-version.html
-share/doc/xmlsec1/api/xmlsec-x509.html
share/doc/xmlsec1/api/xmlsec-xmldsig.html
share/doc/xmlsec1/api/xmlsec-xmlenc.html
share/doc/xmlsec1/api/xmlsec-xmlsec.html
@@ -145,6 +143,7 @@ share/doc/xmlsec1/images/logo.gif
share/doc/xmlsec1/images/openssl-logo.png
share/doc/xmlsec1/images/xmlsec-logo.gif
share/doc/xmlsec1/index.html
+share/doc/xmlsec1/mailing-list.html
share/doc/xmlsec1/news.html
share/doc/xmlsec1/related.html
share/doc/xmlsec1/xmldsig-verifier.html
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/security/xmlsec/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 12 May 2022 21:19:06 -0000 1.10
+++ pkg/PLIST-main 2 Sep 2023 15:51:48 -0000
@@ -18,6 +18,7 @@ include/xmlsec1/xmlsec/gcrypt/symbols.h
include/xmlsec1/xmlsec/gnutls/
include/xmlsec1/xmlsec/gnutls/app.h
include/xmlsec1/xmlsec/gnutls/crypto.h
+include/xmlsec1/xmlsec/gnutls/keysstore.h
include/xmlsec1/xmlsec/gnutls/symbols.h
include/xmlsec1/xmlsec/gnutls/x509.h
include/xmlsec1/xmlsec/io.h
@@ -30,9 +31,9 @@ include/xmlsec1/xmlsec/membuf.h
include/xmlsec1/xmlsec/nodeset.h
include/xmlsec1/xmlsec/openssl/
include/xmlsec1/xmlsec/openssl/app.h
-include/xmlsec1/xmlsec/openssl/bn.h
include/xmlsec1/xmlsec/openssl/crypto.h
include/xmlsec1/xmlsec/openssl/evp.h
+include/xmlsec1/xmlsec/openssl/keysstore.h
include/xmlsec1/xmlsec/openssl/symbols.h
include/xmlsec1/xmlsec/openssl/x509.h
include/xmlsec1/xmlsec/parser.h
