git: 61f0255bbe1b - main - security/xmlsec1: update to 1.3.2 release (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 13 Feb 2024 15:50:53 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=61f0255bbe1b64f3e3d4f95a839d9a1f5c535735
commit 61f0255bbe1b64f3e3d4f95a839d9a1f5c535735
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-02-13 15:36:59 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-02-13 15:36:59 +0000
security/xmlsec1: update to 1.3.2 release (+)
It's a minimal requirement for upcoming LibreOffice
With hat: office
---
security/xmlsec1/Makefile | 4 +---
security/xmlsec1/distinfo | 6 +++---
security/xmlsec1/files/patch-Makefile.in | 4 ++--
security/xmlsec1/files/patch-src-openssl-app.c | 21 ++++++---------------
security/xmlsec1/pkg-plist | 8 ++++----
5 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 0f6dd467bbb4..3db31e03ceca 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xmlsec1
-DISTVERSION= 1.2.38
-PORTREVISION= 1
+DISTVERSION= 1.3.2
CATEGORIES= security
MASTER_SITES= https://github.com/lsh123/xmlsec/releases/download/xmlsec_${DISTVERSION:S,.,_,g}/ \
https://www.aleksey.com/xmlsec/download/
@@ -19,7 +18,6 @@ USE_GNOME= libxml2 libxslt
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
INSTALL_TARGET= install-strip
PORTDOCS= *
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index 31fac1f0c55f..92ea6dd27f1f 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691949373
-SHA256 (xmlsec1-1.2.38.tar.gz) = 9de8cf8d7d2e288a9cef205cc6cb93c926a67dadfaf44aaff76ed63c28ce9902
-SIZE (xmlsec1-1.2.38.tar.gz) = 2036578
+TIMESTAMP = 1702077731
+SHA256 (xmlsec1-1.3.2.tar.gz) = 4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf
+SIZE (xmlsec1-1.3.2.tar.gz) = 2437263
diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in
index be5659c14e62..7999ab5cc924 100644
--- a/security/xmlsec1/files/patch-Makefile.in
+++ b/security/xmlsec1/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2022-12-06 14:04:01 UTC
+--- Makefile.in.orig 2023-12-08 23:22:46 UTC
+++ Makefile.in
-@@ -491,7 +491,7 @@ pkgconfigdir = $(prefix)/libdata/pkgconfig
+@@ -504,7 +504,7 @@ pkgconfigdir = $(prefix)/libdata/pkgconfig
bin_SCRIPTS = xmlsec1-config
pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/security/xmlsec1/files/patch-src-openssl-app.c b/security/xmlsec1/files/patch-src-openssl-app.c
index bbb25c3f4030..e20b9da3e1ca 100644
--- a/security/xmlsec1/files/patch-src-openssl-app.c
+++ b/security/xmlsec1/files/patch-src-openssl-app.c
@@ -1,8 +1,8 @@
---- src/openssl/app.c.orig 2022-11-28 21:40:24 UTC
+--- src/openssl/app.c.orig 2023-10-30 22:27:05 UTC
+++ src/openssl/app.c
-@@ -46,6 +46,29 @@
-
+@@ -59,6 +59,29 @@
#include "../cast_helpers.h"
+ #include "private.h"
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER)
+static UI_METHOD *
@@ -30,7 +30,7 @@
static int xmlSecOpenSSLDefaultPasswordCallback (char *buf,
int bufsiz,
int verify,
-@@ -462,6 +485,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName,
+@@ -490,6 +513,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName,
EVP_PKEY* pKey = NULL;
int engineInit = 0;
int ret;
@@ -42,7 +42,7 @@
xmlSecAssert2(engineName != NULL, NULL);
xmlSecAssert2(engineKeyId != NULL, NULL);
-@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName,
+@@ -538,7 +566,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName,
}
}
@@ -51,16 +51,7 @@
xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL);
goto done;
}
-@@ -503,7 +531,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName,
-
- /* load private key */
- pKey = ENGINE_load_private_key(engine, engineKeyId,
-- (UI_METHOD *)UI_null(),
-+ (UI_METHOD *)ui_null,
- NULL);
- if(pKey == NULL) {
- xmlSecOpenSSLError("ENGINE_load_private_key", NULL);
-@@ -534,6 +562,7 @@ done:
+@@ -601,6 +629,7 @@ done:
data = NULL;
done:
diff --git a/security/xmlsec1/pkg-plist b/security/xmlsec1/pkg-plist
index 60e7f180d675..1437ee113a81 100644
--- a/security/xmlsec1/pkg-plist
+++ b/security/xmlsec1/pkg-plist
@@ -14,6 +14,7 @@ include/xmlsec1/xmlsec/exports.h
%%GNUTLS%%include/xmlsec1/xmlsec/gcrypt/symbols.h
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/app.h
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/crypto.h
+%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/keysstore.h
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/symbols.h
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/x509.h
include/xmlsec1/xmlsec/io.h
@@ -25,16 +26,15 @@ include/xmlsec1/xmlsec/list.h
include/xmlsec1/xmlsec/membuf.h
include/xmlsec1/xmlsec/nodeset.h
%%NSS%%include/xmlsec1/xmlsec/nss/app.h
-%%NSS%%include/xmlsec1/xmlsec/nss/bignum.h
%%NSS%%include/xmlsec1/xmlsec/nss/crypto.h
%%NSS%%include/xmlsec1/xmlsec/nss/keysstore.h
%%NSS%%include/xmlsec1/xmlsec/nss/pkikeys.h
%%NSS%%include/xmlsec1/xmlsec/nss/symbols.h
%%NSS%%include/xmlsec1/xmlsec/nss/x509.h
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/app.h
-%%OPENSSL%%include/xmlsec1/xmlsec/openssl/bn.h
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/crypto.h
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/evp.h
+%%OPENSSL%%include/xmlsec1/xmlsec/openssl/keysstore.h
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/symbols.h
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/x509.h
include/xmlsec1/xmlsec/parser.h
@@ -68,6 +68,6 @@ lib/libxmlsec1.so.%%DISTVERSION%%
%%NSS%%libdata/pkgconfig/xmlsec1-nss.pc
%%OPENSSL%%libdata/pkgconfig/xmlsec1-openssl.pc
libdata/pkgconfig/xmlsec1.pc
-share/man/man1/xmlsec1-config.1.gz
-share/man/man1/xmlsec1.1.gz
+man/man1/xmlsec1-config.1.gz
+man/man1/xmlsec1.1.gz
share/aclocal/xmlsec1.m4