View | Details | Raw Unified | Return to bug 273108 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/xmlsec1/Makefile (-48 / +25 lines)
Lines 1-8 Link Here
1
PORTNAME=	xmlsec1
1
PORTNAME=	xmlsec1
2
PORTVERSION=	1.2.37
2
DISTVERSION=	1.3.1
3
CATEGORIES=	security
3
CATEGORIES=	security
4
MASTER_SITES=	https://www.aleksey.com/xmlsec/download/ \
4
MASTER_SITES=	https://github.com/lsh123/xmlsec/releases/download/xmlsec_${DISTVERSION:S,.,_,g}/ \
5
		https://github.com/lsh123/xmlsec/releases/download/xmlsec-${PORTVERSION:S,.,_,g}/
5
		https://www.aleksey.com/xmlsec/download/
6
6
7
MAINTAINER=	hrs@FreeBSD.org
7
MAINTAINER=	hrs@FreeBSD.org
8
COMMENT=	XML Security Library
8
COMMENT=	XML Security Library
Lines 11-71 WWW= https://www.aleksey.com/xmlsec/ Link Here
11
LICENSE=	MIT
11
LICENSE=	MIT
12
LICENSE_FILE=	${WRKSRC}/Copyright
12
LICENSE_FILE=	${WRKSRC}/Copyright
13
13
14
LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
14
LIB_DEPENDS=	libltdl.so:devel/libltdl
15
		libgpg-error.so:security/libgpg-error \
16
		libltdl.so:devel/libltdl
17
15
18
USES=		gmake gnome libtool localbase pathfix pkgconfig ssl
16
USES=		gmake gnome libtool localbase pathfix pkgconfig
19
USE_GNOME=	libxml2 libxslt
17
USE_GNOME=	libxml2 libxslt
20
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
19
21
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
22
CONFIGURE_ARGS=	--with-openssl="${OPENSSLBASE}" \
21
23
		--with-gcrypt="${LOCALBASE}" \
24
		--enable-werror \
25
		--enable-soap \
26
		--disable-docs-build
27
MAKE_ENV=	ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC}
28
INSTALL_TARGET=	install-strip
22
INSTALL_TARGET=	install-strip
29
PORTDOCS=	*
23
PORTDOCS=	*
30
PLIST_SUB=	PORTVERSION=${PORTVERSION}
24
PLIST_SUB=	DISTVERSION=${DISTVERSION}
31
25
32
OPTIONS_DEFINE=	DOCS GNUTLS NSS
26
CONFIGURE_ARGS=	--disable-static \
33
OPTIONS_DEFAULT=	NSS
27
		--with-libltdl \
34
OPTIONS_SUB=	yes
28
		--without-gcrypt \
29
		--without-nspr \
30
		--without-nss
35
31
36
GNUTLS_DESC=		Enable GNUTLS support
32
OPTIONS_DEFINE=		DOCS
37
GNUTLS_CONFIGURE_ON=	--with-gnutls="${LOCALBASE}"
33
OPTIONS_MULTI=		SSL
38
GNUTLS_CONFIGURE_OFF=	--without-gnutls
34
OPTIONS_MULTI_SSL=	OPENSSL GNUTLS
39
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
35
OPTIONS_DEFAULT=	OPENSSL
40
NSS_DESC=		Enable Mozilla's NSS support
36
OPTIONS_SUB=		yes
41
NSS_CONFIGURE_ON=	--with-nss="${LOCALBASE}" \
42
			--with-nspr="${LOCALBASE}"
43
NSS_CONFIGURE_OFF=	--without-nss \
44
			--without-nspr
45
NSS_LIB_DEPENDS=	libnss3.so:security/nss \
46
			libnspr4.so:devel/nspr \
47
			libplds4.so:devel/nspr \
48
			libplc4.so:devel/nspr
49
37
50
post-patch:
38
OPENSSL_USES=		ssl
51
	@${REINPLACE_CMD} -e 's/mozilla-nss/nss/' \
52
		-e 's/mozilla-nspr/nspr/' ${WRKSRC}/configure
53
	@${REINPLACE_CMD} -e 's/(CP) -ru/(CP) -r/' \
54
		-e 's/(CP) -u/(CP)/' \
55
		${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in \
56
		${WRKSRC}/docs/api/Makefile.am ${WRKSRC}/docs/api/Makefile.in \
57
		${WRKSRC}/man/Makefile.am ${WRKSRC}/man/Makefile.in
58
39
59
post-patch-GNUTLS-on:
40
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
60
# Don't rely on broken autodetection
41
GNUTLS_CONFIGURE_WITH=	gnutls
61
	@${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \
42
GNUTLS_CONFIGURE_OFF=	--without-gnutls
62
	    -e '/^GNUTLS_LIBS=/s,"","-L${LOCALBASE}/lib -lgnutls",' \
63
		${WRKSRC}/${CONFIGURE_SCRIPT}
64
43
65
post-patch-NSS-on:
44
OPENSSL_USES=		ssl
66
# Makeing the xmlsec1 executable multi-threaded to let load -lnss,
45
OPENSSL_CONFIGURE_OFF=	--without-openssl
67
# when needed.
46
OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
68
	@${REINPLACE_CMD} -e 's,^\(xmlsec1_LDADD = \)\\$$,\1 -L${LOCALBASE}/lib -lpthread\\,' \
69
		${WRKSRC}/apps/Makefile.in
70
47
71
.include <bsd.port.mk>
48
.include <bsd.port.mk>
(-)b/security/xmlsec1/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1670335424
1
TIMESTAMP = 1691834936
2
SHA256 (xmlsec1-1.2.37.tar.gz) = 5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
2
SHA256 (xmlsec1-1.3.1.tar.gz) = 10f48384d4fd1afc05fea545b74fbf7c152582f0a895c189f164d55270400c63
3
SIZE (xmlsec1-1.2.37.tar.gz) = 2009175
3
SIZE (xmlsec1-1.3.1.tar.gz) = 2432943
(-)a/security/xmlsec1/files/patch-src-openssl-app.c (-70 lines)
Removed Link Here
1
--- src/openssl/app.c.orig	2022-11-28 21:40:24 UTC
2
+++ src/openssl/app.c
3
@@ -46,6 +46,29 @@
4
 
5
 #include "../cast_helpers.h"
6
 
7
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER)
8
+static UI_METHOD *
9
+ui_null_create(void)
10
+{
11
+	return (UI_create_method("OpenSSL NULL UI"));
12
+}
13
+static void
14
+ui_null_destroy(UI_METHOD *ui)
15
+{
16
+	UI_destroy_method(ui);
17
+}
18
+#else
19
+static const UI_METHOD *
20
+ui_null_create(void)
21
+{
22
+	return (UI_null());
23
+}
24
+static void
25
+ui_null_destroy(const UI_METHOD *ui)
26
+{
27
+}
28
+#endif
29
+
30
 static int      xmlSecOpenSSLDefaultPasswordCallback    (char *buf,
31
                                                          int bufsiz,
32
                                                          int verify,
33
@@ -462,6 +485,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, 
34
     EVP_PKEY* pKey = NULL;
35
     int engineInit = 0;
36
     int ret;
37
+#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER)
38
+    UI_METHOD *ui_null = ui_null_create();
39
+#else
40
+    const UI_METHOD *ui_null = ui_null_create();
41
+#endif
42
 
43
     xmlSecAssert2(engineName != NULL, NULL);
44
     xmlSecAssert2(engineKeyId != NULL, NULL);
45
@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, 
46
         }
47
     }
48
 
49
-    if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)UI_null(), 0, 1) < 0) {
50
+    if(ENGINE_ctrl_cmd(engine, "SET_USER_INTERFACE", 0, (void *)ui_null, 0, 1) < 0) {
51
         xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL);
52
         goto done;
53
     }
54
@@ -503,7 +531,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, 
55
 
56
     /* load private key */
57
     pKey = ENGINE_load_private_key(engine, engineKeyId,
58
-                                   (UI_METHOD *)UI_null(),
59
+                                   (UI_METHOD *)ui_null,
60
                                    NULL);
61
     if(pKey == NULL) {
62
         xmlSecOpenSSLError("ENGINE_load_private_key", NULL);
63
@@ -534,6 +562,7 @@ done:
64
     data = NULL;
65
 
66
 done:
67
+    ui_null_destroy(ui_null);
68
     /* cleanup */
69
     if(pKey != NULL) {
70
         EVP_PKEY_free(pKey);
(-)b/security/xmlsec1/pkg-plist (-36 / +13 lines)
Lines 9-19 include/xmlsec1/xmlsec/crypto.h Link Here
9
include/xmlsec1/xmlsec/dl.h
9
include/xmlsec1/xmlsec/dl.h
10
include/xmlsec1/xmlsec/errors.h
10
include/xmlsec1/xmlsec/errors.h
11
include/xmlsec1/xmlsec/exports.h
11
include/xmlsec1/xmlsec/exports.h
12
include/xmlsec1/xmlsec/gcrypt/app.h
13
include/xmlsec1/xmlsec/gcrypt/crypto.h
14
include/xmlsec1/xmlsec/gcrypt/symbols.h
15
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/app.h
12
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/app.h
16
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/crypto.h
13
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/crypto.h
14
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/keysstore.h
17
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/symbols.h
15
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/symbols.h
18
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/x509.h
16
%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/x509.h
19
include/xmlsec1/xmlsec/io.h
17
include/xmlsec1/xmlsec/io.h
Lines 24-45 include/xmlsec1/xmlsec/keysmngr.h Link Here
24
include/xmlsec1/xmlsec/list.h
22
include/xmlsec1/xmlsec/list.h
25
include/xmlsec1/xmlsec/membuf.h
23
include/xmlsec1/xmlsec/membuf.h
26
include/xmlsec1/xmlsec/nodeset.h
24
include/xmlsec1/xmlsec/nodeset.h
27
%%NSS%%include/xmlsec1/xmlsec/nss/app.h
25
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/app.h
28
%%NSS%%include/xmlsec1/xmlsec/nss/bignum.h
26
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/crypto.h
29
%%NSS%%include/xmlsec1/xmlsec/nss/crypto.h
27
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/evp.h
30
%%NSS%%include/xmlsec1/xmlsec/nss/keysstore.h
28
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/keysstore.h
31
%%NSS%%include/xmlsec1/xmlsec/nss/pkikeys.h
29
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/symbols.h
32
%%NSS%%include/xmlsec1/xmlsec/nss/symbols.h
30
%%OPENSSL%%include/xmlsec1/xmlsec/openssl/x509.h
33
%%NSS%%include/xmlsec1/xmlsec/nss/x509.h
34
include/xmlsec1/xmlsec/openssl/app.h
35
include/xmlsec1/xmlsec/openssl/bn.h
36
include/xmlsec1/xmlsec/openssl/crypto.h
37
include/xmlsec1/xmlsec/openssl/evp.h
38
include/xmlsec1/xmlsec/openssl/symbols.h
39
include/xmlsec1/xmlsec/openssl/x509.h
40
include/xmlsec1/xmlsec/parser.h
31
include/xmlsec1/xmlsec/parser.h
41
include/xmlsec1/xmlsec/private.h
32
include/xmlsec1/xmlsec/private.h
42
include/xmlsec1/xmlsec/soap.h
43
include/xmlsec1/xmlsec/strings.h
33
include/xmlsec1/xmlsec/strings.h
44
include/xmlsec1/xmlsec/templates.h
34
include/xmlsec1/xmlsec/templates.h
45
include/xmlsec1/xmlsec/transforms.h
35
include/xmlsec1/xmlsec/transforms.h
Lines 49-78 include/xmlsec1/xmlsec/xmldsig.h Link Here
49
include/xmlsec1/xmlsec/xmlenc.h
39
include/xmlsec1/xmlsec/xmlenc.h
50
include/xmlsec1/xmlsec/xmlsec.h
40
include/xmlsec1/xmlsec/xmlsec.h
51
include/xmlsec1/xmlsec/xmltree.h
41
include/xmlsec1/xmlsec/xmltree.h
52
lib/libxmlsec1-gcrypt.a
53
lib/libxmlsec1-gcrypt.so
54
lib/libxmlsec1-gcrypt.so.1
55
%%GNUTLS%%lib/libxmlsec1-gnutls.a
56
%%GNUTLS%%lib/libxmlsec1-gnutls.so
42
%%GNUTLS%%lib/libxmlsec1-gnutls.so
57
%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
43
%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
58
%%GNUTLS%%lib/libxmlsec1-gnutls.so.%%PORTVERSION%%
44
%%GNUTLS%%lib/libxmlsec1-gnutls.so.%%DISTVERSION%%
59
%%NSS%%lib/libxmlsec1-nss.a
45
%%OPENSSL%%lib/libxmlsec1-openssl.so
60
%%NSS%%lib/libxmlsec1-nss.so
46
%%OPENSSL%%lib/libxmlsec1-openssl.so.1
61
%%NSS%%lib/libxmlsec1-nss.so.1
47
%%OPENSSL%%lib/libxmlsec1-openssl.so.%%DISTVERSION%%
62
%%NSS%%lib/libxmlsec1-nss.so.%%PORTVERSION%%
63
lib/libxmlsec1-gcrypt.so.%%PORTVERSION%%
64
lib/libxmlsec1-openssl.a
65
lib/libxmlsec1-openssl.so
66
lib/libxmlsec1-openssl.so.1
67
lib/libxmlsec1-openssl.so.%%PORTVERSION%%
68
lib/libxmlsec1.a
69
lib/libxmlsec1.so
48
lib/libxmlsec1.so
70
lib/libxmlsec1.so.1
49
lib/libxmlsec1.so.1
71
lib/libxmlsec1.so.%%PORTVERSION%%
50
lib/libxmlsec1.so.%%DISTVERSION%%
72
libdata/pkgconfig/xmlsec1-gcrypt.pc
73
%%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc
51
%%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc
74
%%NSS%%libdata/pkgconfig/xmlsec1-nss.pc
52
%%OPENSSL%%libdata/pkgconfig/xmlsec1-openssl.pc
75
libdata/pkgconfig/xmlsec1-openssl.pc
76
libdata/pkgconfig/xmlsec1.pc
53
libdata/pkgconfig/xmlsec1.pc
77
man/man1/xmlsec1-config.1.gz
54
man/man1/xmlsec1-config.1.gz
78
man/man1/xmlsec1.1.gz
55
man/man1/xmlsec1.1.gz

Return to bug 273108