From bff8c48305d078b8107fa656b1effb5c231abc96 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Mon, 20 Nov 2023 16:29:58 +0100 Subject: [PATCH] xmlsec: rebuild against libxml 2.12.0 --- xmlsec/.signature | 5 +- xmlsec/729.patch | 150 ++++++++++++++++++++++++++++++++++++++++++++++ xmlsec/Pkgfile | 7 ++- 3 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 xmlsec/729.patch diff --git a/xmlsec/.signature b/xmlsec/.signature index 249baec49..7b05eacb1 100644 --- a/xmlsec/.signature +++ b/xmlsec/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39L4bDMVYgaUkwlDofsYuQwn0g/lBwID2+ALVBFY1xZASADa1RUCjhgM+duv5Odc+nASJue4mYOXpay2nkodZQY= -SHA256 (Pkgfile) = 2eba71dd59b0a93e8a6d04bdda4590b5a2f0d95c18b1a58b93862d42a8e85207 +RWSagIOpLGJF3y+/1RJYKUWnuJaBxEd8Sf78CIgrtYI+fmU3lzRPUbxH+03wyYOKfnf/tfnENc+iXR6IXFUlmA+zDHmba6waCAA= +SHA256 (Pkgfile) = 3c58f622fffad2358d429b536153ec24c265426b84f8e35b25e7c7caaba0f94e SHA256 (.footprint) = 4e63bcd4e89e06f59d71b686e1841b252952a2f1444d15a21fb98efaaa093e75 SHA256 (xmlsec1-1.3.2.tar.gz) = 4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf +SHA256 (729.patch) = ff7461e3089852cbadc05e57ca1547077493e49b55c4f81d718a2cb66ce6c879 diff --git a/xmlsec/729.patch b/xmlsec/729.patch new file mode 100644 index 000000000..2899d201d --- /dev/null +++ b/xmlsec/729.patch @@ -0,0 +1,150 @@ +From 098a4d0219d3ed672bf8e5934ca7482dc739b103 Mon Sep 17 00:00:00 2001 +From: Aleksey Sanin +Date: Mon, 20 Nov 2023 09:27:33 -0500 +Subject: [PATCH 1/3] Fix libxml2 includes + +--- + include/xmlsec/xmlsec.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h +index 5757fc57..6f910122 100644 +--- a/include/xmlsec/xmlsec.h ++++ b/include/xmlsec/xmlsec.h +@@ -12,6 +12,7 @@ + #define __XMLSEC_H__ + + #include ++#include + + #include + #include + +From bd909345a8dcf093ac7acb0bc2f415717dad77b4 Mon Sep 17 00:00:00 2001 +From: Aleksey Sanin +Date: Mon, 20 Nov 2023 09:36:38 -0500 +Subject: [PATCH 2/3] Fix libxml2 includes + +--- + apps/xmlsec.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/apps/xmlsec.c b/apps/xmlsec.c +index 7655c1db..4bedb16a 100644 +--- a/apps/xmlsec.c ++++ b/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 */ + +From c29133fbeea739640ad4aace67cb4242b16f7757 Mon Sep 17 00:00:00 2001 +From: Aleksey Sanin +Date: Mon, 20 Nov 2023 09:43:23 -0500 +Subject: [PATCH 3/3] Fix all warnings + +--- + apps/crypto.c | 1 + + src/errors_helpers.h | 10 +++++----- + src/mscrypto/certkeys.c | 1 + + src/mscrypto/signatures.c | 1 + + 4 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/apps/crypto.c b/apps/crypto.c +index 8561dd65..4411233d 100644 +--- a/apps/crypto.c ++++ b/apps/crypto.c +@@ -12,6 +12,7 @@ + #endif + + #include ++#include + + #include + #include +diff --git a/src/errors_helpers.h b/src/errors_helpers.h +index 1a4f4183..470fdde6 100644 +--- a/src/errors_helpers.h ++++ b/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/src/mscrypto/certkeys.c b/src/mscrypto/certkeys.c +index db74517a..7e02a199 100644 +--- a/src/mscrypto/certkeys.c ++++ b/src/mscrypto/certkeys.c +@@ -18,6 +18,7 @@ + #include "globals.h" + + #include ++#include + + #ifndef XMLSEC_NO_GOST + #include "csp_oid.h" +diff --git a/src/mscrypto/signatures.c b/src/mscrypto/signatures.c +index 61b95407..c5c62ced 100644 +--- a/src/mscrypto/signatures.c ++++ b/src/mscrypto/signatures.c +@@ -17,6 +17,7 @@ + #include "globals.h" + + #include ++#include + + #ifndef XMLSEC_NO_GOST + #include "csp_calg.h" diff --git a/xmlsec/Pkgfile b/xmlsec/Pkgfile index 5816b1135..e48d88188 100644 --- a/xmlsec/Pkgfile +++ b/xmlsec/Pkgfile @@ -6,12 +6,15 @@ name=xmlsec version=1.3.2 -release=1 -source=(https://www.aleksey.com/xmlsec/download/${name}1-$version.tar.gz) +release=2 +source=(https://www.aleksey.com/xmlsec/download/${name}1-$version.tar.gz + 729.patch) build() { cd ${name}1-$version + patch -Np1 -i $SRC/729.patch + ./configure --prefix=/usr make