aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-12-28 23:57:17 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-12-29 18:49:46 +0700
commitbb6cb10691e91139699411946e982f92a0aa29da (patch)
treee0b9be45964f927d6a6b4b8793f8c92e5834d1bd /libraries
parent4b702b560871adee167a5418c2ba63b5e3cd864a (diff)
libraries/xmlsec: Updated for version 1.2.39.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/xmlsec/libxml2.patch132
-rw-r--r--libraries/xmlsec/xmlsec.SlackBuild3
-rw-r--r--libraries/xmlsec/xmlsec.info6
3 files changed, 4 insertions, 137 deletions
diff --git a/libraries/xmlsec/libxml2.patch b/libraries/xmlsec/libxml2.patch
deleted file mode 100644
index a20dc73d6d82..000000000000
--- a/libraries/xmlsec/libxml2.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From ffb327376f5bb69e8dfe7f805529e45a40118c2b Mon Sep 17 00:00:00 2001
-From: lsh123 <aleksey@aleksey.com>
-Date: Mon, 20 Nov 2023 11:50:43 -0500
-Subject: [PATCH] Fix libxml2 v2.12.0 includes (#729)
-
----
- apps/crypto.c | 1 +
- apps/xmlsec.c | 3 ++-
- include/xmlsec/xmlsec.h | 1 +
- src/errors_helpers.h | 10 +++++-----
- src/mscrypto/certkeys.c | 1 +
- src/mscrypto/signatures.c | 1 +
- 6 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/apps/crypto.c b/apps/crypto.c
-index 8561dd659..4411233da 100644
---- a/apps/crypto.c
-+++ b/apps/crypto.c
-@@ -12,6 +12,7 @@
- #endif
-
- #include <string.h>
-+#include <stdlib.h>
-
- #include <xmlsec/xmlsec.h>
- #include <xmlsec/keys.h>
-diff --git a/apps/xmlsec.c b/apps/xmlsec.c
-index 7655c1dbd..4bedb16a7 100644
---- a/apps/xmlsec.c
-+++ b/apps/xmlsec.c
-@@ -22,6 +22,7 @@
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
- #include <libxml/xpath.h>
-+#include <libxml/xmlsave.h>
- #include <libxml/xpathInternals.h>
-
- #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/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
-index 5757fc570..6f9101229 100644
---- a/include/xmlsec/xmlsec.h
-+++ b/include/xmlsec/xmlsec.h
-@@ -12,6 +12,7 @@
- #define __XMLSEC_H__
-
- #include <libxml/tree.h>
-+#include <libxml/parser.h>
-
- #include <xmlsec/version.h>
- #include <xmlsec/exports.h>
-diff --git a/src/errors_helpers.h b/src/errors_helpers.h
-index 1a4f41837..470fdde65 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 db74517a8..7e02a199e 100644
---- a/src/mscrypto/certkeys.c
-+++ b/src/mscrypto/certkeys.c
-@@ -18,6 +18,7 @@
- #include "globals.h"
-
- #include <string.h>
-+#include <stdlib.h>
-
- #ifndef XMLSEC_NO_GOST
- #include "csp_oid.h"
-diff --git a/src/mscrypto/signatures.c b/src/mscrypto/signatures.c
-index 61b954070..c5c62cedd 100644
---- a/src/mscrypto/signatures.c
-+++ b/src/mscrypto/signatures.c
-@@ -17,6 +17,7 @@
- #include "globals.h"
-
- #include <string.h>
-+#include <stdlib.h>
-
- #ifndef XMLSEC_NO_GOST
- #include "csp_calg.h"
diff --git a/libraries/xmlsec/xmlsec.SlackBuild b/libraries/xmlsec/xmlsec.SlackBuild
index 0cbe2b5909f7..5e5378819255 100644
--- a/libraries/xmlsec/xmlsec.SlackBuild
+++ b/libraries/xmlsec/xmlsec.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xmlsec
SRCNAM=xmlsec1
-VERSION=${VERSION:-1.2.38}
+VERSION=${VERSION:-1.2.39}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -77,7 +77,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch -p1 < $CWD/libxml2.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/libraries/xmlsec/xmlsec.info b/libraries/xmlsec/xmlsec.info
index 9abb74fe2e5a..da777eecfa5e 100644
--- a/libraries/xmlsec/xmlsec.info
+++ b/libraries/xmlsec/xmlsec.info
@@ -1,8 +1,8 @@
PRGNAM="xmlsec"
-VERSION="1.2.38"
+VERSION="1.2.39"
HOMEPAGE="https://www.aleksey.com/xmlsec/"
-DOWNLOAD="https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.38.tar.gz"
-MD5SUM="f221c39c86e69772fc04f767f1fb2dab"
+DOWNLOAD="https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.39.tar.gz"
+MD5SUM="1d268a53b930aff8d4c352a29399fda1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""