From 42e8a5f2b99decb4f34ed0b5ac26ded1b00434ff Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 8 Jan 2024 08:03:04 +0000 Subject: [PATCH] update to xmlsec-1.3.3 --- security/xmlsec/Makefile | 10 ++-- security/xmlsec/distinfo | 4 +- security/xmlsec/patches/patch-apps_crypto_c | 16 ------ security/xmlsec/patches/patch-apps_xmlsec_c | 25 --------- .../patches/patch-include_xmlsec_xmlsec_h | 16 ------ .../xmlsec/patches/patch-src_errors_helpers_h | 53 ------------------- .../patches/patch-src_mscrypto_certkeys_c | 16 ------ .../patches/patch-src_mscrypto_signatures_c | 16 ------ .../xmlsec/patches/patch-tests_testrun_sh | 6 +-- security/xmlsec/pkg/PLIST-docs | 1 + 10 files changed, 11 insertions(+), 152 deletions(-) delete mode 100644 security/xmlsec/patches/patch-apps_crypto_c delete mode 100644 security/xmlsec/patches/patch-apps_xmlsec_c delete mode 100644 security/xmlsec/patches/patch-include_xmlsec_xmlsec_h delete mode 100644 security/xmlsec/patches/patch-src_errors_helpers_h delete mode 100644 security/xmlsec/patches/patch-src_mscrypto_certkeys_c delete mode 100644 security/xmlsec/patches/patch-src_mscrypto_signatures_c diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile index 6064529a152..88331a306c4 100644 --- a/security/xmlsec/Makefile +++ b/security/xmlsec/Makefile @@ -1,15 +1,15 @@ COMMENT-main= XML security library COMMENT-docs= XML security library documentation -VERSION= 1.3.2 +VERSION= 1.3.3 DISTNAME= xmlsec1-${VERSION} PKGNAME-main= xmlsec-${VERSION} PKGNAME-docs= xmlsec-docs-${VERSION} CATEGORIES= security -SHARED_LIBS= xmlsec1-gnutls 6.1 \ - xmlsec1-openssl 5.0 \ - xmlsec1-gcrypt 1.0 \ - xmlsec1 9.0 +SHARED_LIBS= xmlsec1-gnutls 7.0 \ + xmlsec1-openssl 6.0 \ + xmlsec1-gcrypt 2.0 \ + xmlsec1 10.0 HOMEPAGE= https://www.aleksey.com/xmlsec/ diff --git a/security/xmlsec/distinfo b/security/xmlsec/distinfo index f6810832a8b..6399afd9300 100644 --- a/security/xmlsec/distinfo +++ b/security/xmlsec/distinfo @@ -1,2 +1,2 @@ -SHA256 (xmlsec1-1.3.2.tar.gz) = QAPFaz01bSGx23d1MYVA+ta/7a9fEX6PfAEIESGb488= -SIZE (xmlsec1-1.3.2.tar.gz) = 2437263 +SHA256 (xmlsec1-1.3.3.tar.gz) = q1uan/1pYPRvdGbZ2R8XTsN+jDGYkje6a56s3YFkZPI= +SIZE (xmlsec1-1.3.3.tar.gz) = 2435741 diff --git a/security/xmlsec/patches/patch-apps_crypto_c b/security/xmlsec/patches/patch-apps_crypto_c deleted file mode 100644 index e6711f42b20..00000000000 --- a/security/xmlsec/patches/patch-apps_crypto_c +++ /dev/null @@ -1,16 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - -Index: apps/crypto.c ---- apps/crypto.c.orig -+++ apps/crypto.c -@@ -12,6 +12,7 @@ - #endif - - #include -+#include - - #include - #include diff --git a/security/xmlsec/patches/patch-apps_xmlsec_c b/security/xmlsec/patches/patch-apps_xmlsec_c deleted file mode 100644 index 9839e1e71d4..00000000000 --- a/security/xmlsec/patches/patch-apps_xmlsec_c +++ /dev/null @@ -1,25 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - -Index: apps/xmlsec.c ---- apps/xmlsec.c.orig -+++ apps/xmlsec.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - #ifndef XMLSEC_NO_XSLT -@@ -3030,7 +3031,7 @@ xmlSecAppInit(void) { - /* Init libxml */ - xmlInitParser(); - LIBXML_TEST_VERSION -- xmlTreeIndentString = "\t"; -+ xmlThrDefTreeIndentString("\t"); - #ifndef XMLSEC_NO_XSLT - xmlIndentTreeOutput = 1; - #endif /* XMLSEC_NO_XSLT */ diff --git a/security/xmlsec/patches/patch-include_xmlsec_xmlsec_h b/security/xmlsec/patches/patch-include_xmlsec_xmlsec_h deleted file mode 100644 index a1b9abf9b4a..00000000000 --- a/security/xmlsec/patches/patch-include_xmlsec_xmlsec_h +++ /dev/null @@ -1,16 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - -Index: include/xmlsec/xmlsec.h ---- include/xmlsec/xmlsec.h.orig -+++ include/xmlsec/xmlsec.h -@@ -12,6 +12,7 @@ - #define __XMLSEC_H__ - - #include -+#include - - #include - #include diff --git a/security/xmlsec/patches/patch-src_errors_helpers_h b/security/xmlsec/patches/patch-src_errors_helpers_h deleted file mode 100644 index 9d22e9f6a0e..00000000000 --- a/security/xmlsec/patches/patch-src_errors_helpers_h +++ /dev/null @@ -1,53 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - -Index: src/errors_helpers.h ---- src/errors_helpers.h.orig -+++ src/errors_helpers.h -@@ -136,7 +136,7 @@ extern "C" { - */ - #define xmlSecXmlError(errorFunction, errorObject) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -159,7 +159,7 @@ extern "C" { - */ - #define xmlSecXmlError2(errorFunction, errorObject, msg, param) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -181,7 +181,7 @@ extern "C" { - */ - #define xmlSecXmlParserError(errorFunction, ctxt, errorObject) \ - { \ -- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\ -+ const xmlError * error = xmlCtxtGetLastError(ctxt);\ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -205,7 +205,7 @@ extern "C" { - */ - #define xmlSecXmlParserError2(errorFunction, ctxt, errorObject, msg, param) \ - { \ -- xmlErrorPtr error = xmlCtxtGetLastError(ctxt);\ -+ const xmlError * error = xmlCtxtGetLastError(ctxt);\ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ -@@ -227,7 +227,7 @@ extern "C" { - */ - #define xmlSecXsltError(errorFunction, ctxt, errorObject) \ - { \ -- xmlErrorPtr error = xmlGetLastError(); \ -+ const xmlError * error = xmlGetLastError(); \ - int code = (error != NULL) ? error->code : 0; \ - const char* message = (error != NULL) ? error->message : NULL; \ - xmlSecError(XMLSEC_ERRORS_HERE, \ diff --git a/security/xmlsec/patches/patch-src_mscrypto_certkeys_c b/security/xmlsec/patches/patch-src_mscrypto_certkeys_c deleted file mode 100644 index 8b5d340d197..00000000000 --- a/security/xmlsec/patches/patch-src_mscrypto_certkeys_c +++ /dev/null @@ -1,16 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - -Index: src/mscrypto/certkeys.c ---- src/mscrypto/certkeys.c.orig -+++ src/mscrypto/certkeys.c -@@ -18,6 +18,7 @@ - #include "globals.h" - - #include -+#include - - #ifndef XMLSEC_NO_GOST - #include "csp_oid.h" diff --git a/security/xmlsec/patches/patch-src_mscrypto_signatures_c b/security/xmlsec/patches/patch-src_mscrypto_signatures_c deleted file mode 100644 index 4b7f9e4a1fe..00000000000 --- a/security/xmlsec/patches/patch-src_mscrypto_signatures_c +++ /dev/null @@ -1,16 +0,0 @@ -From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001 -From: lsh123 -Date: Mon, 20 Nov 2023 11:50:43 -0500 -Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729) - -Index: src/mscrypto/signatures.c ---- src/mscrypto/signatures.c.orig -+++ src/mscrypto/signatures.c -@@ -17,6 +17,7 @@ - #include "globals.h" - - #include -+#include - - #ifndef XMLSEC_NO_GOST - #include "csp_calg.h" diff --git a/security/xmlsec/patches/patch-tests_testrun_sh b/security/xmlsec/patches/patch-tests_testrun_sh index 38d607e845f..434ade84653 100644 --- a/security/xmlsec/patches/patch-tests_testrun_sh +++ b/security/xmlsec/patches/patch-tests_testrun_sh @@ -13,7 +13,7 @@ Index: tests/testrun.sh OS_KERNEL=`uname -s` # -@@ -705,7 +705,9 @@ execEncTest() { +@@ -712,7 +712,9 @@ execEncTest() { cat $tmpfile | $outputTransform > $tmpfile.2 mv $tmpfile.2 $tmpfile fi @@ -24,7 +24,7 @@ Index: tests/testrun.sh printRes $expected_res $? else printRes $expected_res $res -@@ -737,7 +739,9 @@ execEncTest() { +@@ -744,7 +746,9 @@ execEncTest() { cat $tmpfile.2 | $outputTransform > $tmpfile mv $tmpfile $tmpfile.2 fi @@ -35,7 +35,7 @@ Index: tests/testrun.sh printRes $res_success $? else printRes $res_success $res -@@ -762,7 +766,7 @@ execEncTest() { +@@ -769,7 +773,7 @@ execEncTest() { rm -rf $tmpfile $tmpfile.2 tmpfile.3 # run tests diff --git a/security/xmlsec/pkg/PLIST-docs b/security/xmlsec/pkg/PLIST-docs index 25998c76cbe..0e7a55d33ef 100644 --- a/security/xmlsec/pkg/PLIST-docs +++ b/security/xmlsec/pkg/PLIST-docs @@ -131,6 +131,7 @@ share/doc/xmlsec1/api/xmlsec-xmltree.html share/doc/xmlsec1/authors.html share/doc/xmlsec1/bugs.html share/doc/xmlsec1/c14n.html +share/doc/xmlsec1/css/ share/doc/xmlsec1/documentation.html share/doc/xmlsec1/download.html share/doc/xmlsec1/faq.html