diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index aca23bcc2800..7d44f009d6f3 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,74 +1,71 @@ PORTNAME= xmlsec1 -PORTVERSION= 1.2.34 -PORTREVISION= 1 +PORTVERSION= 1.2.37 CATEGORIES= security -MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ - ftp://ftp.aleksey.com/pub/xmlsec/releases/ \ - ftp://ftp.xmlsoft.org/xmlsec/releases/ \ - ftp://ftp.rpmfind.net/pub/XML/xmlsec/releases/ +MASTER_SITES= https://www.aleksey.com/xmlsec/download/ \ + https://github.com/lsh123/xmlsec/releases/download/xmlsec-${PORTVERSION:S,.,_,g}/ MAINTAINER= hrs@FreeBSD.org COMMENT= XML Security Library WWW= https://www.aleksey.com/xmlsec/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/Copyright LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libltdl.so:devel/libltdl USES= gmake gnome libtool localbase pathfix pkgconfig ssl USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl="${OPENSSLBASE}" \ --with-gcrypt="${LOCALBASE}" \ --enable-werror \ --enable-soap \ --disable-docs-build MAKE_ENV= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC} INSTALL_TARGET= install-strip PORTDOCS= * PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS GNUTLS NSS OPTIONS_DEFAULT= NSS OPTIONS_SUB= yes GNUTLS_DESC= Enable GNUTLS support GNUTLS_CONFIGURE_ON= --with-gnutls="${LOCALBASE}" GNUTLS_CONFIGURE_OFF= --without-gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls NSS_DESC= Enable Mozilla's NSS support NSS_CONFIGURE_ON= --with-nss="${LOCALBASE}" \ --with-nspr="${LOCALBASE}" NSS_CONFIGURE_OFF= --without-nss \ --without-nspr NSS_LIB_DEPENDS= libnss3.so:security/nss \ libnspr4.so:devel/nspr \ libplds4.so:devel/nspr \ libplc4.so:devel/nspr post-patch: @${REINPLACE_CMD} -e 's/mozilla-nss/nss/' \ -e 's/mozilla-nspr/nspr/' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's/(CP) -ru/(CP) -r/' \ -e 's/(CP) -u/(CP)/' \ ${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in \ ${WRKSRC}/docs/api/Makefile.am ${WRKSRC}/docs/api/Makefile.in \ ${WRKSRC}/man/Makefile.am ${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",' \ ${WRKSRC}/${CONFIGURE_SCRIPT} post-patch-NSS-on: # Makeing the xmlsec1 executable multi-threaded to let load -lnss, # when needed. @${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib -lpthread\\,' \ ${WRKSRC}/apps/Makefile.in .include diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo index baa844e7f7ee..0482e6233802 100644 --- a/security/xmlsec1/distinfo +++ b/security/xmlsec1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651858077 -SHA256 (xmlsec1-1.2.34.tar.gz) = 52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262 -SIZE (xmlsec1-1.2.34.tar.gz) = 1991505 +TIMESTAMP = 1670335424 +SHA256 (xmlsec1-1.2.37.tar.gz) = 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c +SIZE (xmlsec1-1.2.37.tar.gz) = 2009175 diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in index 250d09d1d46d..be5659c14e62 100644 --- a/security/xmlsec1/files/patch-Makefile.in +++ b/security/xmlsec1/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2022-05-06 17:33:38 UTC +--- Makefile.in.orig 2022-12-06 14:04:01 UTC +++ Makefile.in -@@ -490,7 +490,7 @@ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ +@@ -491,7 +491,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-apps-xmlsec.c b/security/xmlsec1/files/patch-apps-xmlsec.c deleted file mode 100644 index ce1c62f81e60..000000000000 --- a/security/xmlsec1/files/patch-apps-xmlsec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/xmlsec.c.orig 2022-05-03 14:36:17 UTC -+++ apps/xmlsec.c -@@ -1210,7 +1210,7 @@ int main(int argc, const char **argv) { - (xmlSecAppCmdLineParamGetInt(&repeatParam, 1) > 0)) { - - repeats = xmlSecAppCmdLineParamGetInt(&repeatParam, 1); -- fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (1000 * total_time) / CLOCKS_PER_SEC); -+ fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (long)(1000 * total_time) / CLOCKS_PER_SEC); - } - - goto success; diff --git a/security/xmlsec1/files/patch-src-openssl-app.c b/security/xmlsec1/files/patch-src-openssl-app.c index c723cad64dad..bbb25c3f4030 100644 --- a/security/xmlsec1/files/patch-src-openssl-app.c +++ b/security/xmlsec1/files/patch-src-openssl-app.c @@ -1,70 +1,70 @@ ---- src/openssl/app.c.orig 2022-05-03 23:36:17.000000000 +0900 -+++ src/openssl/app.c 2022-05-07 05:18:46.065103000 +0900 -@@ -43,6 +43,29 @@ +--- src/openssl/app.c.orig 2022-11-28 21:40:24 UTC ++++ src/openssl/app.c +@@ -46,6 +46,29 @@ - #include "openssl_compat.h" + #include "../cast_helpers.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 xmlSecOpenSSLAppLoadRANDFile (const char *filename); - static int xmlSecOpenSSLAppSaveRANDFile (const char *filename); static int xmlSecOpenSSLDefaultPasswordCallback (char *buf, -@@ -415,6 +438,11 @@ + int bufsiz, + int verify, +@@ -462,6 +485,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 - #ifndef OPENSSL_NO_ENGINE xmlSecAssert2(engineName != NULL, NULL); -@@ -437,7 +465,7 @@ + xmlSecAssert2(engineKeyId != NULL, NULL); +@@ -487,7 +515,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; } -@@ -453,7 +481,7 @@ +@@ -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); -@@ -484,6 +512,7 @@ +@@ -534,6 +562,7 @@ done: data = NULL; done: + ui_null_destroy(ui_null); /* cleanup */ if(pKey != NULL) { EVP_PKEY_free(pKey);