diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 0f6dd467bbb4..3db31e03ceca 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,71 +1,69 @@ 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/ MAINTAINER= hrs@FreeBSD.org COMMENT= XML Security Library WWW= https://www.aleksey.com/xmlsec/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/Copyright LIB_DEPENDS= libltdl.so:devel/libltdl USES= gmake gnome libtool localbase pathfix pkgconfig USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share INSTALL_TARGET= install-strip PORTDOCS= * PLIST_SUB= DISTVERSION=${DISTVERSION} CONFIGURE_ARGS= --disable-static OPTIONS_DEFINE= DOCS OPTIONS_MULTI= SSL OPTIONS_MULTI_SSL= GNUTLS NSS OPENSSL OPTIONS_DEFAULT= OPENSSL NSS OPTIONS_SUB= yes GNUTLS_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gcrypt gnutls NSS_LIB_DEPENDS= libnspr4.so:devel/nspr \ libnss3.so:security/nss NSS_CONFIGURE_WITH= nspr nss OPENSSL_USES= ssl OPENSSL_CONFIGURE_OFF= --without-openssl OPENSSL_CONFIGURE_ON= --with-openssl="${OPENSSLBASE}" post-patch: @${REINPLACE_CMD} -e 's/(CP) -ru/(CP) -r/' \ -e 's/(CP) -u/(CP)/' \ ${PATCH_WRKSRC}/docs/Makefile.am \ ${PATCH_WRKSRC}/docs/Makefile.in \ ${PATCH_WRKSRC}/docs/api/Makefile.am \ ${PATCH_WRKSRC}/docs/api/Makefile.in \ ${PATCH_WRKSRC}/man/Makefile.am \ ${PATCH_WRKSRC}/man/Makefile.in post-patch-GNUTLS-on: # Don't rely on broken autodetection @${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \ -e '/^GNUTLS_LIBS=/s,"","-L${LOCALBASE}/lib -lgnutls",' \ ${PATCH_WRKSRC}/${CONFIGURE_SCRIPT} post-patch-NSS-on: @${REINPLACE_CMD} -e 's/mozilla-nss/nss/' \ -e 's/mozilla-nspr/nspr/' ${PATCH_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib -lpthread\\,' \ ${PATCH_WRKSRC}/apps/Makefile.in .include 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,11 +1,11 @@ ---- 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 -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = xmlsec1Conf.sh m4datadir = $(datadir)/aclocal m4data_DATA = xmlsec1.m4 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,70 +1,61 @@ ---- 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 * +ui_null_create(void) +{ + return (UI_create_method("OpenSSL NULL UI")); +} +static void +ui_null_destroy(UI_METHOD *ui) +{ + UI_destroy_method(ui); +} +#else +static const UI_METHOD * +ui_null_create(void) +{ + return (UI_null()); +} +static void +ui_null_destroy(const UI_METHOD *ui) +{ +} +#endif + 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; +#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER) + UI_METHOD *ui_null = ui_null_create(); +#else + const UI_METHOD *ui_null = ui_null_create(); +#endif xmlSecAssert2(engineName != NULL, NULL); xmlSecAssert2(engineKeyId != NULL, NULL); -@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, +@@ -538,7 +566,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, } } - if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)UI_null(), 0, 1) < 0) { + if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)ui_null, 0, 1) < 0) { 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: + ui_null_destroy(ui_null); /* cleanup */ if(pKey != NULL) { EVP_PKEY_free(pKey); 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 @@ -1,73 +1,73 @@ bin/xmlsec1 bin/xmlsec1-config etc/xmlsec1Conf.sh include/xmlsec1/xmlsec/app.h include/xmlsec1/xmlsec/base64.h include/xmlsec1/xmlsec/bn.h include/xmlsec1/xmlsec/buffer.h include/xmlsec1/xmlsec/crypto.h include/xmlsec1/xmlsec/dl.h include/xmlsec1/xmlsec/errors.h include/xmlsec1/xmlsec/exports.h %%GNUTLS%%include/xmlsec1/xmlsec/gcrypt/app.h %%GNUTLS%%include/xmlsec1/xmlsec/gcrypt/crypto.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 include/xmlsec1/xmlsec/keyinfo.h include/xmlsec1/xmlsec/keys.h include/xmlsec1/xmlsec/keysdata.h include/xmlsec1/xmlsec/keysmngr.h 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 include/xmlsec1/xmlsec/private.h include/xmlsec1/xmlsec/strings.h include/xmlsec1/xmlsec/templates.h include/xmlsec1/xmlsec/transforms.h include/xmlsec1/xmlsec/version.h include/xmlsec1/xmlsec/x509.h include/xmlsec1/xmlsec/xmldsig.h include/xmlsec1/xmlsec/xmlenc.h include/xmlsec1/xmlsec/xmlsec.h include/xmlsec1/xmlsec/xmltree.h %%GNUTLS%%lib/libxmlsec1-gcrypt.so %%GNUTLS%%lib/libxmlsec1-gcrypt.so.1 %%GNUTLS%%lib/libxmlsec1-gcrypt.so.%%DISTVERSION%% %%GNUTLS%%lib/libxmlsec1-gnutls.so %%GNUTLS%%lib/libxmlsec1-gnutls.so.1 %%GNUTLS%%lib/libxmlsec1-gnutls.so.%%DISTVERSION%% %%NSS%%lib/libxmlsec1-nss.so %%NSS%%lib/libxmlsec1-nss.so.1 %%NSS%%lib/libxmlsec1-nss.so.%%DISTVERSION%% %%OPENSSL%%lib/libxmlsec1-openssl.so %%OPENSSL%%lib/libxmlsec1-openssl.so.1 %%OPENSSL%%lib/libxmlsec1-openssl.so.%%DISTVERSION%% lib/libxmlsec1.so lib/libxmlsec1.so.1 lib/libxmlsec1.so.%%DISTVERSION%% %%GNUTLS%%libdata/pkgconfig/xmlsec1-gcrypt.pc %%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc %%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