Attachment #177120 for bug #213844

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= strongswan	4	PORTNAME= strongswan
5	PORTVERSION= 5.5.0	5	PORTVERSION= 5.5.1
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= http://download.strongswan.org/ \	7	MASTER_SITES= http://download.strongswan.org/ \
8	http://download2.strongswan.org/	8	http://download2.strongswan.org/

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468442394	1	TIMESTAMP = 1479401810
2	SHA256 (strongswan-5.5.0.tar.bz2) = 58463998ac6725eac3687e8a20c1f69803c3772657076d06c43386a24b4c8454	2	SHA256 (strongswan-5.5.1.tar.bz2) = 720b301991f77bdedd8d551a956f52e2d11686a0ec18e832094f86cf2b842ab7
3	SIZE (strongswan-5.5.0.tar.bz2) = 4542458	3	SIZE (strongswan-5.5.1.tar.bz2) = 4636854

Lines 1-6 Link Here

(-)files/patch-conf_Makefile.in (-2 / +2 lines)
1	--- conf/Makefile.in.orig 2015-03-27 20:02:47 UTC	1	--- conf/Makefile.in.orig 2016-10-20 09:09:55 UTC
2	+++ conf/Makefile.in	2	+++ conf/Makefile.in
3	@@ -860,15 +860,15 @@ install-data-local: $(plugins_install_sr	3	@@ -883,15 +883,15 @@ install-data-local: $(plugins_install_sr
4	test -e "$(DESTDIR)${strongswanconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" \|\| true	4	test -e "$(DESTDIR)${strongswanconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" \|\| true
5	test -e "$(DESTDIR)${strongswanddir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" \|\| true	5	test -e "$(DESTDIR)${strongswanddir}" \|\| $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" \|\| true
6	test -e "$(DESTDIR)${charonconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" \|\| true	6	test -e "$(DESTDIR)${charonconfdir}" \|\| $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" \|\| true

Lines 1-4 Link Here

(-)files/patch-src_libcharon_plugins_smp_smp.c (-1 / +1 lines)
1	--- src/libcharon/plugins/smp/smp.c.orig 2013-11-01 10:40:35 UTC	1	--- src/libcharon/plugins/smp/smp.c.orig 2016-04-22 20:01:35 UTC
2	+++ src/libcharon/plugins/smp/smp.c	2	+++ src/libcharon/plugins/smp/smp.c
3	@@ -737,7 +737,7 @@ METHOD(plugin_t, destroy, void,	3	@@ -737,7 +737,7 @@ METHOD(plugin_t, destroy, void,
4	*/	4	*/

Lines 1-6 Link Here

(-)files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c (-2 / +2 lines)
1	--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig 2016-06-30 14:20:10 UTC	1	--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig 2016-10-08 12:17:09 UTC
2	+++ src/libstrongswan/plugins/openssl/openssl_plugin.c	2	+++ src/libstrongswan/plugins/openssl/openssl_plugin.c
3	@@ -573,7 +573,7 @@ plugin_t *openssl_plugin_create()	3	@@ -623,7 +623,7 @@ plugin_t *openssl_plugin_create()
4	},	4	},
5	);	5	);
6		6

Lines 1-4 Link Here

(-)files/patch-src_libstrongswan_utils_utils_byteorder.h (-1 / +1 lines)
1	--- src/libstrongswan/utils/utils/byteorder.h.orig 2016-03-29 06:56:52 UTC	1	--- src/libstrongswan/utils/utils/byteorder.h.orig 2016-08-16 15:24:34 UTC
2	+++ src/libstrongswan/utils/utils/byteorder.h	2	+++ src/libstrongswan/utils/utils/byteorder.h
3	@@ -22,6 +22,10 @@	3	@@ -22,6 +22,10 @@
4	#ifndef BYTEORDER_H_	4	#ifndef BYTEORDER_H_




--- src/starter/Makefile.in.orig	2016-10-20 09:10:06 UTC
+++ src/starter/Makefile.in
@@ -1003,8 +1003,8 @@ install-exec-local :
 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/crls" || true
 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" || true
 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" || $(INSTALL) -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" || true
-		test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf || true
-		test -e "$(DESTDIR)$(sysconfdir)/ipsec.secrets" || $(INSTALL) -m 600 $(srcdir)/ipsec.secrets $(DESTDIR)$(sysconfdir)/ipsec.secrets || true
+		test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" || $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf.sample || true
+		test -e "$(DESTDIR)$(sysconfdir)/ipsec.secrets" || $(INSTALL) -m 600 $(srcdir)/ipsec.secrets $(DESTDIR)$(sysconfdir)/ipsec.secrets.sample || true
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Return to bug 213844

Lines 1-11 Link Here

(-)files/patch-src_starter_Makefile.in (-2 / +4 lines)
1	--- src/starter/Makefile.in.orig 2015-03-27 20:03:00 UTC	1	--- src/starter/Makefile.in.orig 2016-10-20 09:10:06 UTC
2	+++ src/starter/Makefile.in	2	+++ src/starter/Makefile.in
3	@@ -985,7 +985,7 @@ install-exec-local :	3	@@ -1003,8 +1003,8 @@ install-exec-local :
4	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" \|\| $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/crls" \|\| true	4	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/crls" \|\| $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/crls" \|\| true
5	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" \|\| $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" \|\| true	5	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/reqs" \|\| $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/ipsec.d/reqs" \|\| true
6	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" \|\| $(INSTALL) -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" \|\| true	6	test -e "$(DESTDIR)${sysconfdir}/ipsec.d/private" \|\| $(INSTALL) -d -m 750 "$(DESTDIR)$(sysconfdir)/ipsec.d/private" \|\| true
7	- test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" \|\| $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf \|\| true	7	- test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" \|\| $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf \|\| true
		8	- test -e "$(DESTDIR)$(sysconfdir)/ipsec.secrets" \|\| $(INSTALL) -m 600 $(srcdir)/ipsec.secrets $(DESTDIR)$(sysconfdir)/ipsec.secrets \|\| true
8	+ test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" \|\| $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf.sample \|\| true	9	+ test -e "$(DESTDIR)$(sysconfdir)/ipsec.conf" \|\| $(INSTALL) -m 644 $(srcdir)/ipsec.conf $(DESTDIR)$(sysconfdir)/ipsec.conf.sample \|\| true
		10	+ test -e "$(DESTDIR)$(sysconfdir)/ipsec.secrets" \|\| $(INSTALL) -m 600 $(srcdir)/ipsec.secrets $(DESTDIR)$(sysconfdir)/ipsec.secrets.sample \|\| true
9		11
10	# Tell versions [3.59,3.63) of GNU make to not export all variables.	12	# Tell versions [3.59,3.63) of GNU make to not export all variables.
11	# Otherwise a system limit (for SysV at least) may be exceeded.	13	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 369-374 Link Here

(-)pkg-plist (+2 lines)
369	%%XAUTHGEN%%%%DATADIR%%/templates/config/plugins/xauth-generic.conf	369	%%XAUTHGEN%%%%DATADIR%%/templates/config/plugins/xauth-generic.conf
370	%%XAUTHGEN%%@sample %%ETCDIR%%.d/charon/xauth-generic.conf.sample	370	%%XAUTHGEN%%@sample %%ETCDIR%%.d/charon/xauth-generic.conf.sample
371	@sample etc/ipsec.conf.sample	371	@sample etc/ipsec.conf.sample
		372	@sample etc/ipsec.secrets.sample
372	@sample %%ETCDIR%%.conf.sample	373	@sample %%ETCDIR%%.conf.sample
373	@sample %%ETCDIR%%.d/charon-logging.conf.sample	374	@sample %%ETCDIR%%.d/charon-logging.conf.sample
374	@sample %%ETCDIR%%.d/charon.conf.sample	375	@sample %%ETCDIR%%.d/charon.conf.sample
Lines 430-435 Link Here
430	%%SWANCTL%%@dir etc/swanctl/ecdsa	431	%%SWANCTL%%@dir etc/swanctl/ecdsa
431	%%SWANCTL%%@dir etc/swanctl/pkcs12	432	%%SWANCTL%%@dir etc/swanctl/pkcs12
432	%%SWANCTL%%@dir etc/swanctl/pkcs8	433	%%SWANCTL%%@dir etc/swanctl/pkcs8
		434	%%SWANCTL%%@dir etc/swanctl/private
433	%%SWANCTL%%@dir etc/swanctl/pubkey	435	%%SWANCTL%%@dir etc/swanctl/pubkey
434	%%SWANCTL%%@dir etc/swanctl/rsa	436	%%SWANCTL%%@dir etc/swanctl/rsa
435	%%SWANCTL%%@dir etc/swanctl/x509	437	%%SWANCTL%%@dir etc/swanctl/x509