diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 6a1359ffb91e..6d6ccfa6822c 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,74 +1,74 @@ # Created by: Jim Geovedi PORTNAME= xmlsec1 -PORTVERSION= 1.2.29 -PORTREVISION= 2 +PORTVERSION= 1.2.34 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/ MAINTAINER= hrs@FreeBSD.org COMMENT= XML Security Library 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 3a9d3c2debff..baa844e7f7ee 100644 --- a/security/xmlsec1/distinfo +++ b/security/xmlsec1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581996323 -SHA256 (xmlsec1-1.2.29.tar.gz) = b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d2839ab -SIZE (xmlsec1-1.2.29.tar.gz) = 1989360 +TIMESTAMP = 1651858077 +SHA256 (xmlsec1-1.2.34.tar.gz) = 52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262 +SIZE (xmlsec1-1.2.34.tar.gz) = 1991505 diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in index 40393dc3aeb4..250d09d1d46d 100644 --- a/security/xmlsec1/files/patch-Makefile.in +++ b/security/xmlsec1/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2017-12-12 16:05:23.187628000 +0300 -+++ Makefile.in 2017-12-12 16:07:19.241092000 +0300 -@@ -480,7 +480,7 @@ +--- Makefile.in.orig 2022-05-06 17:33:38 UTC ++++ Makefile.in +@@ -490,7 +490,7 @@ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ 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 new file mode 100644 index 000000000000..ce1c62f81e60 --- /dev/null +++ b/security/xmlsec1/files/patch-apps-xmlsec.c @@ -0,0 +1,11 @@ +--- 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_openssl__compat.h b/security/xmlsec1/files/patch-src_openssl_openssl__compat.h index ab20e6310f2d..21eed249a79a 100644 --- a/security/xmlsec1/files/patch-src_openssl_openssl__compat.h +++ b/security/xmlsec1/files/patch-src_openssl_openssl__compat.h @@ -1,22 +1,24 @@ ---- src/openssl/openssl_compat.h.orig 2017-09-12 13:21:09 UTC +--- src/openssl/openssl_compat.h.orig 2022-05-03 14:36:17 UTC +++ src/openssl/openssl_compat.h -@@ -49,4 +49,19 @@ +@@ -51,6 +51,21 @@ - #endif /* !defined(XMLSEC_OPENSSL_API_110) */ - -+/****************************************************************************** -+ * + /****************************************************************************** + * + * LibreSSL 2.7+ compatibility (implements most of OpenSSL 1.1 API) + * + *****************************************************************************/ +#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER) +/* EVP_CIPHER_CTX stuff */ +#define EVP_CIPHER_CTX_encrypting(x) ((x)->encrypt) + +/* X509 stuff */ +#define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject +#define X509_OBJECT_new() (calloc(1, sizeof(X509_OBJECT))) +#define X509_OBJECT_free(x) { X509_OBJECT_free_contents(x); free(x); } +#endif + - #endif /* __XMLSEC_OPENSSL_OPENSSL_COMPAT_H__ */ ++/****************************************************************************** ++ * + * boringssl compatibility + * + *****************************************************************************/