Attachment #150096 for bug #195580




# $FreeBSD$

PORTNAME=	strongswan
PORTVERSION=	5.2.1
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	http://download.strongswan.org/ \
		http://download2.strongswan.org/

		--with-lib-prefix=${PREFIX}

OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE IKEv1 \
		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SQLITE \
		TESTVECTOR UNBOUND XAUTH
OPTIONS_SUB=	yes
CURL_DESC=	Enable CURL to fetch CRL/OCSP
EAPAKA3GPP2_DESC=	Enable EAP AKA with 3gpp2 backend

KERNELLIBIPSEC_DESC=	Enable IPSec userland backend
LOADTESTER_DESC=	Enable load testing plugin
TESTVECTOR_DESC=	Enable crypto test vectors
PKI_DESC=	Enable PKI tools
SCEP_DESC=	Enable Simple Certificate Enrollment Protocol
UNBOUND_DESC=	Enable DNSSEC-enabled resolver
XAUTH_DESC=	Enable XAuth password verification


SQLITE_CONFIGURE_ON=	--enable-sqlite
SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
PKI_CONFIGURE_OFF=	--disable-pki
SCEP_CONFIGURE_OFF=	--disable-scepclient
UNBOUND_CONFIGURE_ON=	--enable-unbound
UNBOUND_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
XAUTH_CONFIGURE_ON=	--enable-xauth-eap --enable-xauth-generic

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (strongswan-5.2.0.tar.bz2) = b00c30bd2e60ff2e5fc85f54bbad54fe246585812fdf212dbe777a5258da26ce	1	SHA256 (strongswan-5.2.1.tar.bz2) = ea51ab33b5bb39fecaf10668833a9936583b42145948ae9da1ab98f74e939215
2	SIZE (strongswan-5.2.0.tar.bz2) = 4063992	2	SIZE (strongswan-5.2.1.tar.bz2) = 4075576

Lines 1-9 Link Here

(-)files/patch-conf__Makefile.in (-6 / +6 lines)
1	--- ./conf/Makefile.in.orig 2014-07-08 16:06:08.000000000 +0200	1	--- conf/Makefile.in.orig 2014-10-18 08:23:39 UTC
2	+++ ./conf/Makefile.in 2014-08-19 09:48:46.000000000 +0200	2	+++ conf/Makefile.in
3	@@ -842,15 +842,15 @@	3	@@ -852,15 +852,15 @@
4	test -e "$(DESTDIR)${strongswanconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)"	4	test -e "$(DESTDIR)${strongswanconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" \|\| true
5	test -e "$(DESTDIR)${strongswanddir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanddir)"	5	test -e "$(DESTDIR)${strongswanddir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" \|\| true
6	test -e "$(DESTDIR)${charonconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(charonconfdir)"	6	test -e "$(DESTDIR)${charonconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" \|\| true
7	- test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" \|\| $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf \|\| true	7	- test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" \|\| $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf \|\| true
8	+ test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" \|\| $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf.sample \|\| true	8	+ test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" \|\| $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf.sample \|\| true
9	for f in $(options_install_src); do \	9	for f in $(options_install_src); do \




--- ./src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c.orig	2014-06-26 09:10:00.000000000 +0200
+++ ./src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c	2014-08-19 09:48:46.000000000 +0200
@@ -1518,8 +1518,8 @@
 			{	/* timed out? */
 				break;
 			}
-			if (this->reply->rtm_msglen < sizeof(*this->reply) ||
-				msg.hdr.rtm_seq != this->reply->rtm_seq)
+			if ((this->reply == 0) || (this->reply->rtm_msglen < sizeof(*this->reply) ||
+				msg.hdr.rtm_seq != this->reply->rtm_seq))
 			{
 				continue;
 			}




%%TESTVECTOR%%lib/ipsec/plugins/libstrongswan-test-vectors.so
%%TESTVECTOR%%%%DATADIR%%/templates/config/plugins/test-vectors.conf
%%TESTVECTOR%%@sample %%ETCDIR%%.d/charon/test-vectors.conf.sample
%%PKI%%bin/pki
%%PKI%%man/man1/pki---acert.1.gz
%%PKI%%man/man1/pki---gen.1.gz
%%PKI%%man/man1/pki---issue.1.gz
%%PKI%%man/man1/pki---keyid.1.gz
%%PKI%%man/man1/pki---pkcs7.1.gz
%%PKI%%man/man1/pki---print.1.gz
%%PKI%%man/man1/pki---pub.1.gz
%%PKI%%man/man1/pki---req.1.gz
%%PKI%%man/man1/pki---self.1.gz
%%PKI%%man/man1/pki---signcrl.1.gz
%%PKI%%man/man1/pki---verify.1.gz
%%PKI%%man/man1/pki.1.gz
%%PKI%%%%DATADIR%%/templates/config/strongswan.d/pki.conf
%%PKI%%@sample %%ETCDIR%%.d/pki.conf.sample
%%SCEP%%libexec/ipsec/scepclient
%%SCEP%%man/man8/scepclient.8.gz
%%SCEP%%%%DATADIR%%/templates/config/strongswan.d/scepclient.conf
%%SCEP%%@sample %%ETCDIR%%.d/scepclient.conf.sample
%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a
%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la
%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so

lib/ipsec/libhydra.so.0.0.0
lib/ipsec/libstrongswan.so.0.0.0
lib/ipsec/libtls.so.0.0.0
@dirrmtry etc/ipsec.d/aacerts
@dirrmtry etc/ipsec.d/acerts
@dirrmtry etc/ipsec.d/cacerts
@dirrmtry etc/ipsec.d/certs
@dirrmtry etc/ipsec.d/crls
@dirrmtry etc/ipsec.d/ocspcerts
@dirrmtry etc/ipsec.d/private
@dirrmtry etc/ipsec.d/reqs
@dirrmtry etc/ipsec.d
@dirrmtry %%ETCDIR%%.d/charon
@dirrmtry %%ETCDIR%%.d
@dirrmtry lib/ipsec/plugins
@dirrmtry lib/ipsec
@dirrmtry libexec/ipsec
@dirrmtry %%DATADIR%%/templates/config/plugins
@dirrmtry %%DATADIR%%/templates/config/strongswan.d
@dirrmtry %%DATADIR%%/templates/config
%%SQL%%@dirrmtry %%DATADIR%%/templates/database/sql
%%SQL%%@dirrmtry %%DATADIR%%/templates/database
@dirrmtry %%DATADIR%%/templates
@dirrmtry %%DATADIR%%

Return to bug 195580

Lines 311-335 Link Here

(-)pkg-plist (-29 / +40 lines)
311	%%TESTVECTOR%%lib/ipsec/plugins/libstrongswan-test-vectors.so	311	%%TESTVECTOR%%lib/ipsec/plugins/libstrongswan-test-vectors.so
312	%%TESTVECTOR%%%%DATADIR%%/templates/config/plugins/test-vectors.conf	312	%%TESTVECTOR%%%%DATADIR%%/templates/config/plugins/test-vectors.conf
313	%%TESTVECTOR%%@sample %%ETCDIR%%.d/charon/test-vectors.conf.sample	313	%%TESTVECTOR%%@sample %%ETCDIR%%.d/charon/test-vectors.conf.sample
314	%%TOOLS%%bin/pki	314	%%PKI%%bin/pki
315	%%TOOLS%%libexec/ipsec/scepclient	315	%%PKI%%man/man1/pki---acert.1.gz
316	%%TOOLS%%man/man1/pki---acert.1.gz	316	%%PKI%%man/man1/pki---gen.1.gz
317	%%TOOLS%%man/man1/pki---gen.1.gz	317	%%PKI%%man/man1/pki---issue.1.gz
318	%%TOOLS%%man/man1/pki---issue.1.gz	318	%%PKI%%man/man1/pki---keyid.1.gz
319	%%TOOLS%%man/man1/pki---keyid.1.gz	319	%%PKI%%man/man1/pki---pkcs7.1.gz
320	%%TOOLS%%man/man1/pki---pkcs7.1.gz	320	%%PKI%%man/man1/pki---print.1.gz
321	%%TOOLS%%man/man1/pki---print.1.gz	321	%%PKI%%man/man1/pki---pub.1.gz
322	%%TOOLS%%man/man1/pki---pub.1.gz	322	%%PKI%%man/man1/pki---req.1.gz
323	%%TOOLS%%man/man1/pki---req.1.gz	323	%%PKI%%man/man1/pki---self.1.gz
324	%%TOOLS%%man/man1/pki---self.1.gz	324	%%PKI%%man/man1/pki---signcrl.1.gz
325	%%TOOLS%%man/man1/pki---signcrl.1.gz	325	%%PKI%%man/man1/pki---verify.1.gz
326	%%TOOLS%%man/man1/pki---verify.1.gz	326	%%PKI%%man/man1/pki.1.gz
327	%%TOOLS%%man/man1/pki.1.gz	327	%%PKI%%%%DATADIR%%/templates/config/strongswan.d/pki.conf
328	%%TOOLS%%man/man8/scepclient.8.gz	328	%%PKI%%@sample %%ETCDIR%%.d/pki.conf.sample
329	%%TOOLS%%%%DATADIR%%/templates/config/strongswan.d/pki.conf	329	%%SCEP%%libexec/ipsec/scepclient
330	%%TOOLS%%@sample %%ETCDIR%%.d/pki.conf.sample	330	%%SCEP%%man/man8/scepclient.8.gz
331	%%TOOLS%%%%DATADIR%%/templates/config/strongswan.d/scepclient.conf	331	%%SCEP%%%%DATADIR%%/templates/config/strongswan.d/scepclient.conf
332	%%TOOLS%%@sample %%ETCDIR%%.d/scepclient.conf.sample	332	%%SCEP%%@sample %%ETCDIR%%.d/scepclient.conf.sample
333	%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a	333	%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a
334	%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la	334	%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la
335	%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so	335	%%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so
Lines 393-405 Link Here
393	lib/ipsec/libhydra.so.0.0.0	393	lib/ipsec/libhydra.so.0.0.0
394	lib/ipsec/libstrongswan.so.0.0.0	394	lib/ipsec/libstrongswan.so.0.0.0
395	lib/ipsec/libtls.so.0.0.0	395	lib/ipsec/libtls.so.0.0.0
396	@dir %%DATADIR%%/templates/config/plugins	396	@dirrmtry etc/ipsec.d/aacerts
397	@dir lib/ipsec/plugins	397	@dirrmtry etc/ipsec.d/acerts
398	@dir etc/ipsec.d/reqs	398	@dirrmtry etc/ipsec.d/cacerts
399	@dir etc/ipsec.d/private	399	@dirrmtry etc/ipsec.d/certs
400	@dir etc/ipsec.d/ocspcerts	400	@dirrmtry etc/ipsec.d/crls
401	@dir etc/ipsec.d/crls	401	@dirrmtry etc/ipsec.d/ocspcerts
402	@dir etc/ipsec.d/certs	402	@dirrmtry etc/ipsec.d/private
403	@dir etc/ipsec.d/cacerts	403	@dirrmtry etc/ipsec.d/reqs
404	@dir etc/ipsec.d/acerts	404	@dirrmtry etc/ipsec.d
405	@dir etc/ipsec.d/aacerts	405	@dirrmtry %%ETCDIR%%.d/charon
		406	@dirrmtry %%ETCDIR%%.d
		407	@dirrmtry lib/ipsec/plugins
		408	@dirrmtry lib/ipsec
		409	@dirrmtry libexec/ipsec
		410	@dirrmtry %%DATADIR%%/templates/config/plugins
		411	@dirrmtry %%DATADIR%%/templates/config/strongswan.d
		412	@dirrmtry %%DATADIR%%/templates/config
		413	%%SQL%%@dirrmtry %%DATADIR%%/templates/database/sql
		414	%%SQL%%@dirrmtry %%DATADIR%%/templates/database
		415	@dirrmtry %%DATADIR%%/templates
		416	@dirrmtry %%DATADIR%%

Lines 2-9 Link Here

(-)Makefile (-6 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= strongswan	4	PORTNAME= strongswan
5	PORTVERSION= 5.2.0	5	PORTVERSION= 5.2.1
6	PORTREVISION= 1
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= http://download.strongswan.org/ \	7	MASTER_SITES= http://download.strongswan.org/ \
9	http://download2.strongswan.org/	8	http://download2.strongswan.org/
Lines 41-48 Link Here
41	--with-lib-prefix=${PREFIX}	40	--with-lib-prefix=${PREFIX}
42		41
43	OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE IKEv1 \	42	OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE IKEv1 \
44	IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL SQLITE \	43	IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SQLITE \
45	TESTVECTOR TOOLS UNBOUND XAUTH	44	TESTVECTOR UNBOUND XAUTH
46	OPTIONS_SUB= yes	45	OPTIONS_SUB= yes
47	CURL_DESC= Enable CURL to fetch CRL/OCSP	46	CURL_DESC= Enable CURL to fetch CRL/OCSP
48	EAPAKA3GPP2_DESC= Enable EAP AKA with 3gpp2 backend	47	EAPAKA3GPP2_DESC= Enable EAP AKA with 3gpp2 backend
Lines 54-60 Link Here
54	KERNELLIBIPSEC_DESC= Enable IPSec userland backend	53	KERNELLIBIPSEC_DESC= Enable IPSec userland backend
55	LOADTESTER_DESC= Enable load testing plugin	54	LOADTESTER_DESC= Enable load testing plugin
56	TESTVECTOR_DESC= Enable crypto test vectors	55	TESTVECTOR_DESC= Enable crypto test vectors
57	TOOLS_DESC= Enable PKI tools	56	PKI_DESC= Enable PKI tools
		57	SCEP_DESC= Enable Simple Certificate Enrollment Protocol
58	UNBOUND_DESC= Enable DNSSEC-enabled resolver	58	UNBOUND_DESC= Enable DNSSEC-enabled resolver
59	XAUTH_DESC= Enable XAuth password verification	59	XAUTH_DESC= Enable XAuth password verification
60		60
Lines 77-83 Link Here
77	SQLITE_CONFIGURE_ON= --enable-sqlite	77	SQLITE_CONFIGURE_ON= --enable-sqlite
78	SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3	78	SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
79	TESTVECTOR_CONFIGURE_ON=--enable-test-vectors	79	TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
80	TOOLS_CONFIGURE_OFF= --disable-tools	80	PKI_CONFIGURE_OFF= --disable-pki
		81	SCEP_CONFIGURE_OFF= --disable-scepclient
81	UNBOUND_CONFIGURE_ON= --enable-unbound	82	UNBOUND_CONFIGURE_ON= --enable-unbound
82	UNBOUND_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound	83	UNBOUND_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound
83	XAUTH_CONFIGURE_ON= --enable-xauth-eap --enable-xauth-generic	84	XAUTH_CONFIGURE_ON= --enable-xauth-eap --enable-xauth-generic

Lines 1-13 Link Here

(-)files/patch-src__libhydra__plugins__kernel_pfroute__kernel_pfroute_net.c (-13 lines)
1	--- ./src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c.orig 2014-06-26 09:10:00.000000000 +0200
2	+++ ./src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c 2014-08-19 09:48:46.000000000 +0200
3	@@ -1518,8 +1518,8 @@
4	{ /* timed out? */
5	break;
6	}
7	- if (this->reply->rtm_msglen < sizeof(*this->reply) \|\|
8	- msg.hdr.rtm_seq != this->reply->rtm_seq)
9	+ if ((this->reply == 0) \|\| (this->reply->rtm_msglen < sizeof(*this->reply) \|\|
10	+ msg.hdr.rtm_seq != this->reply->rtm_seq))
11	{
12	continue;
13	}