Attachment #188760 for bug #224282




# $FreeBSD$

PORTNAME=	xmlsec1
PORTVERSION=	1.2.25
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \

		libgpg-error.so:security/libgpg-error \
		libltdl.so:devel/libltdl

USES=		libtool localbase pathfix pkgconfig ssl gmake
USE_GNOME=	libxml2 libxslt
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

		xmlsec-man.html

OPTIONS_DEFINE=	DOCS GNUTLS NSS
OPTIONS_DEFAULT=	NSS
OPTIONS_SUB=	yes

DOCS_CONFIGURE_ENABLE=	docs-build
DOCS_BUILD_DEPENDS=	gtkdoc-mkhtml:textproc/gtk-doc \
	gtkdoc-mktmpl:textproc/gtk-doc \
	gtkdoc-mkdb:textproc/gtk-doc \
	gtkdoc-scan:textproc/gtk-doc \
	xsltproc:textproc/libxslt \
	perl:lang/perl5
GNUTLS_DESC=		Enable GNUTLS support
GNUTLS_CONFIGURE_ON=	--with-gnutls="${LOCALBASE}"
GNUTLS_CONFIGURE_OFF=	--without-gnutls

			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/' \

Lines 1-3 Link Here

(-)w/security/xmlsec1/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483094320	1	TIMESTAMP = 1513083917
2	SHA256 (xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f	2	SHA256 (xmlsec1-1.2.25.tar.gz) = 967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
3	SIZE (xmlsec1-1.2.23.tar.gz) = 1794694	3	SIZE (xmlsec1-1.2.25.tar.gz) = 1839160




--- 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 @@
 top_srcdir = @top_srcdir@
 NULL = 
 SAFE_VERSION = @XMLSEC_VERSION_SAFE@
-SUBDIRS = include src apps man docs
+SUBDIRS = include src apps man ${DOCS}
 TEST_APP = apps/xmlsec1$(EXEEXT)
 DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
 bin_SCRIPTS = xmlsec1-config
 pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
 pkgconfigdir = $(prefix)/libdata/pkgconfig




--- src/openssl/app.c.orig	2017-01-05 18:07:26.936917000 +0900
+++ src/openssl/app.c	2017-01-05 18:08:34.388575000 +0900
@@ -61,7 +61,7 @@
 int
 xmlSecOpenSSLAppInit(const char* config) {
     
-#if (OPENSSL_VERSION_NUMBER < 0x10100000)
+#if !defined(XMLSEC_OPENSSL_110)
     ERR_load_crypto_strings();
     OPENSSL_config(NULL);
     OpenSSL_add_all_algorithms();
@@ -119,7 +119,7 @@
 xmlSecOpenSSLAppShutdown(void) {
     xmlSecOpenSSLAppSaveRANDFile(NULL);
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000)
+#if !defined(XMLSEC_OPENSSL_110)
     RAND_cleanup();
     EVP_cleanup();
 

Removed Link Here

(-)i/security/xmlsec1/files/patch-src-openssl-openssl11_wrapper.h (-11 lines)
1	--- src/openssl/openssl11_wrapper.h.orig 2016-10-16 22:48:17.000000000 +0000
2	+++ src/openssl/openssl11_wrapper.h 2017-01-16 14:02:41.553210002 +0000
3	@@ -9,7 +9,7 @@
4	* same syntax. This file won't be required once OpenSSL 1.1.0 is the minimum
5	* suported version.
6	*/
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER))
9
10	#define EVP_PKEY_up_ref(pKey) CRYPTO_add(&((pKey)->references), 1, CRYPTO_LOCK_EVP_PKEY)
11

Removed Link Here

(-)i/security/xmlsec1/files/patch-src_openssl_signatures.c (-10 lines)
1	--- src/openssl/signatures.c.orig 2016-04-20 16:26:22 UTC
2	+++ src/openssl/signatures.c
3	@@ -10,6 +10,7 @@
4
5	#include <string.h>
6
7	+#include <openssl/ecdsa.h> // ECDSA_SIG
8	#include <openssl/evp.h>
9	#include <openssl/rand.h>
10	#include <openssl/sha.h>




include/xmlsec1/xmlsec/parser.h
include/xmlsec1/xmlsec/private.h
include/xmlsec1/xmlsec/private/xslt.h
include/xmlsec1/xmlsec/soap.h
include/xmlsec1/xmlsec/strings.h
include/xmlsec1/xmlsec/templates.h
include/xmlsec1/xmlsec/transforms.h

%%GNUTLS%%lib/libxmlsec1-gnutls.a
%%GNUTLS%%lib/libxmlsec1-gnutls.so
%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.25
%%NSS%%lib/libxmlsec1-nss.a
%%NSS%%lib/libxmlsec1-nss.so
%%NSS%%lib/libxmlsec1-nss.so.1
%%NSS%%lib/libxmlsec1-nss.so.1.2.25
lib/libxmlsec1-gcrypt.so.1.2.25
lib/libxmlsec1-openssl.a
lib/libxmlsec1-openssl.so
lib/libxmlsec1-openssl.so.1
lib/libxmlsec1-openssl.so.1.2.25
lib/libxmlsec1.a
lib/libxmlsec1.so
lib/libxmlsec1.so.1
lib/libxmlsec1.so.1.2.25
libdata/pkgconfig/xmlsec1-gcrypt.pc
%%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc
%%NSS%%libdata/pkgconfig/xmlsec1-nss.pc

Return to bug 224282

Lines 2-8 Link Here

(-)w/security/xmlsec1/Makefile (-3 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xmlsec1	4	PORTNAME= xmlsec1
5	PORTVERSION= 1.2.23	5	PORTVERSION= 1.2.25
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \	8	MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \
Lines 20-26 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ Link Here
20	libgpg-error.so:security/libgpg-error \	20	libgpg-error.so:security/libgpg-error \
21	libltdl.so:devel/libltdl	21	libltdl.so:devel/libltdl
22		22
23	USES= libtool localbase pathfix pkgconfig ssl	23	USES= libtool localbase pathfix pkgconfig ssl gmake
24	USE_GNOME= libxml2 libxslt	24	USE_GNOME= libxml2 libxslt
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
Lines 37-45 PORTDOCS= api authors.html bugs.html c14n.html documentation.html \ Link Here
37	xmlsec-man.html	37	xmlsec-man.html
38		38
39	OPTIONS_DEFINE= DOCS GNUTLS NSS	39	OPTIONS_DEFINE= DOCS GNUTLS NSS
		40	OPTIONS_DEFAULT= NSS
40	OPTIONS_SUB= yes	41	OPTIONS_SUB= yes
41		42
42	DOCS_MAKE_ENV= DOCS=docs	43	DOCS_CONFIGURE_ENABLE= docs-build
		44	DOCS_BUILD_DEPENDS= gtkdoc-mkhtml:textproc/gtk-doc \
		45	gtkdoc-mktmpl:textproc/gtk-doc \
		46	gtkdoc-mkdb:textproc/gtk-doc \
		47	gtkdoc-scan:textproc/gtk-doc \
		48	xsltproc:textproc/libxslt \
		49	perl:lang/perl5
43	GNUTLS_DESC= Enable GNUTLS support	50	GNUTLS_DESC= Enable GNUTLS support
44	GNUTLS_CONFIGURE_ON= --with-gnutls="${LOCALBASE}"	51	GNUTLS_CONFIGURE_ON= --with-gnutls="${LOCALBASE}"
45	GNUTLS_CONFIGURE_OFF= --without-gnutls	52	GNUTLS_CONFIGURE_OFF= --without-gnutls
Lines 54-59 NSS_LIB_DEPENDS= libnss3.so:security/nss \ Link Here
54	libplds4.so:devel/nspr \	61	libplds4.so:devel/nspr \
55	libplc4.so:devel/nspr	62	libplc4.so:devel/nspr
56		63
		64	post-patch:
		65	@${REINPLACE_CMD} -e 's/mozilla-nss/nss/' \
		66	-e 's/mozilla-nspr/nspr/' ${WRKSRC}/configure
		67	@${REINPLACE_CMD} -e 's/(CP) -ru/(CP) -r/' \
		68	-e 's/(CP) -u/(CP)/' \
		69	${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in \
		70	${WRKSRC}/docs/api/Makefile.am ${WRKSRC}/docs/api/Makefile.in \
		71	${WRKSRC}/man/Makefile.am ${WRKSRC}/man/Makefile.in
		72
57	post-patch-GNUTLS-on:	73	post-patch-GNUTLS-on:
58	# Don't rely on broken autodetection	74	# Don't rely on broken autodetection
59	@${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \	75	@${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \

Lines 1-13 Link Here

(-)w/security/xmlsec1/files/patch-Makefile.in (-10 / +3 lines)
1	--- Makefile.in.orig 2017-01-05 17:38:02.402682000 +0900	1	--- Makefile.in.orig 2017-12-12 16:05:23.187628000 +0300
2	+++ Makefile.in 2017-01-05 17:39:12.079701000 +0900	2	+++ Makefile.in 2017-12-12 16:07:19.241092000 +0300
3	@@ -468,13 +468,13 @@	3	@@ -480,7 +480,7 @@
4	top_srcdir = @top_srcdir@
5	NULL =
6	SAFE_VERSION = @XMLSEC_VERSION_SAFE@
7	-SUBDIRS = include src apps man docs
8	+SUBDIRS = include src apps man ${DOCS}
9	TEST_APP = apps/xmlsec1$(EXEEXT)
10	DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
11	bin_SCRIPTS = xmlsec1-config	4	bin_SCRIPTS = xmlsec1-config
12	pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@	5	pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
13	pkgconfigdir = $(prefix)/libdata/pkgconfig	6	pkgconfigdir = $(prefix)/libdata/pkgconfig

Removed Link Here

(-)i/security/xmlsec1/files/patch-src-openssl-app.c (-20 lines)
1	--- src/openssl/app.c.orig 2017-01-05 18:07:26.936917000 +0900
2	+++ src/openssl/app.c 2017-01-05 18:08:34.388575000 +0900
3	@@ -61,7 +61,7 @@
4	int
5	xmlSecOpenSSLAppInit(const char* config) {
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000)
8	+#if !defined(XMLSEC_OPENSSL_110)
9	ERR_load_crypto_strings();
10	OPENSSL_config(NULL);
11	OpenSSL_add_all_algorithms();
12	@@ -119,7 +119,7 @@
13	xmlSecOpenSSLAppShutdown(void) {
14	xmlSecOpenSSLAppSaveRANDFile(NULL);
15
16	-#if (OPENSSL_VERSION_NUMBER < 0x10100000)
17	+#if !defined(XMLSEC_OPENSSL_110)
18	RAND_cleanup();
19	EVP_cleanup();
20

Lines 40-46 include/xmlsec1/xmlsec/openssl/x509.h Link Here

(-)w/security/xmlsec1/pkg-plist (-6 / +5 lines)
40	include/xmlsec1/xmlsec/parser.h	40	include/xmlsec1/xmlsec/parser.h
41	include/xmlsec1/xmlsec/private.h	41	include/xmlsec1/xmlsec/private.h
42	include/xmlsec1/xmlsec/private/xslt.h	42	include/xmlsec1/xmlsec/private/xslt.h
43	include/xmlsec1/xmlsec/soap.h
44	include/xmlsec1/xmlsec/strings.h	43	include/xmlsec1/xmlsec/strings.h
45	include/xmlsec1/xmlsec/templates.h	44	include/xmlsec1/xmlsec/templates.h
46	include/xmlsec1/xmlsec/transforms.h	45	include/xmlsec1/xmlsec/transforms.h
Lines 56-75 lib/libxmlsec1-gcrypt.so.1 Link Here
56	%%GNUTLS%%lib/libxmlsec1-gnutls.a	55	%%GNUTLS%%lib/libxmlsec1-gnutls.a
57	%%GNUTLS%%lib/libxmlsec1-gnutls.so	56	%%GNUTLS%%lib/libxmlsec1-gnutls.so
58	%%GNUTLS%%lib/libxmlsec1-gnutls.so.1	57	%%GNUTLS%%lib/libxmlsec1-gnutls.so.1
59	%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.23	58	%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.25
60	%%NSS%%lib/libxmlsec1-nss.a	59	%%NSS%%lib/libxmlsec1-nss.a
61	%%NSS%%lib/libxmlsec1-nss.so	60	%%NSS%%lib/libxmlsec1-nss.so
62	%%NSS%%lib/libxmlsec1-nss.so.1	61	%%NSS%%lib/libxmlsec1-nss.so.1
63	%%NSS%%lib/libxmlsec1-nss.so.1.2.23	62	%%NSS%%lib/libxmlsec1-nss.so.1.2.25
64	lib/libxmlsec1-gcrypt.so.1.2.23	63	lib/libxmlsec1-gcrypt.so.1.2.25
65	lib/libxmlsec1-openssl.a	64	lib/libxmlsec1-openssl.a
66	lib/libxmlsec1-openssl.so	65	lib/libxmlsec1-openssl.so
67	lib/libxmlsec1-openssl.so.1	66	lib/libxmlsec1-openssl.so.1
68	lib/libxmlsec1-openssl.so.1.2.23	67	lib/libxmlsec1-openssl.so.1.2.25
69	lib/libxmlsec1.a	68	lib/libxmlsec1.a
70	lib/libxmlsec1.so	69	lib/libxmlsec1.so
71	lib/libxmlsec1.so.1	70	lib/libxmlsec1.so.1
72	lib/libxmlsec1.so.1.2.23	71	lib/libxmlsec1.so.1.2.25
73	libdata/pkgconfig/xmlsec1-gcrypt.pc	72	libdata/pkgconfig/xmlsec1-gcrypt.pc
74	%%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc	73	%%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc
75	%%NSS%%libdata/pkgconfig/xmlsec1-nss.pc	74	%%NSS%%libdata/pkgconfig/xmlsec1-nss.pc