diff options
| author | garga <garga@FreeBSD.org> | 2016-11-21 18:43:45 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2016-11-21 18:43:45 +0800 |
| commit | 666557f5fb36523a409de127dcce57b7e41d03cb (patch) | |
| tree | 2a2455c024a53647c7290e3feaa058437db07147 | |
| parent | 3830c788f17b9504f39f238a78f047f87b60bad5 (diff) | |
| download | freebsd-ports-gnome-666557f5fb36523a409de127dcce57b7e41d03cb.tar.gz freebsd-ports-gnome-666557f5fb36523a409de127dcce57b7e41d03cb.tar.zst freebsd-ports-gnome-666557f5fb36523a409de127dcce57b7e41d03cb.zip | |
Update security/strongswan to 5.5.1
PR: 213844
Approved by: strongswan@Nanoteq.com (maintainer)
Obtained from: pfSense
Sponsored by: Rubicon Communications (Netgate)
8 files changed, 16 insertions, 12 deletions
diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile index 80376d3197fa..a2e60ddeec39 100644 --- a/security/strongswan/Makefile +++ b/security/strongswan/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= strongswan -PORTVERSION= 5.5.0 +PORTVERSION= 5.5.1 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ diff --git a/security/strongswan/distinfo b/security/strongswan/distinfo index a2da3d2fec8b..e0ffb3e7f7e7 100644 --- a/security/strongswan/distinfo +++ b/security/strongswan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1468442394 -SHA256 (strongswan-5.5.0.tar.bz2) = 58463998ac6725eac3687e8a20c1f69803c3772657076d06c43386a24b4c8454 -SIZE (strongswan-5.5.0.tar.bz2) = 4542458 +TIMESTAMP = 1479401810 +SHA256 (strongswan-5.5.1.tar.bz2) = 720b301991f77bdedd8d551a956f52e2d11686a0ec18e832094f86cf2b842ab7 +SIZE (strongswan-5.5.1.tar.bz2) = 4636854 diff --git a/security/strongswan/files/patch-conf_Makefile.in b/security/strongswan/files/patch-conf_Makefile.in index 19c9cb0e1035..fbaf880d1857 100644 --- a/security/strongswan/files/patch-conf_Makefile.in +++ b/security/strongswan/files/patch-conf_Makefile.in @@ -1,6 +1,6 @@ ---- conf/Makefile.in.orig 2015-03-27 20:02:47 UTC +--- conf/Makefile.in.orig 2016-10-20 09:09:55 UTC +++ conf/Makefile.in -@@ -860,15 +860,15 @@ install-data-local: $(plugins_install_sr +@@ -883,15 +883,15 @@ install-data-local: $(plugins_install_sr test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true diff --git a/security/strongswan/files/patch-src_libcharon_plugins_smp_smp.c b/security/strongswan/files/patch-src_libcharon_plugins_smp_smp.c index 58d9ecd3e3af..ea803384a8f1 100644 --- a/security/strongswan/files/patch-src_libcharon_plugins_smp_smp.c +++ b/security/strongswan/files/patch-src_libcharon_plugins_smp_smp.c @@ -1,4 +1,4 @@ ---- src/libcharon/plugins/smp/smp.c.orig 2013-11-01 10:40:35 UTC +--- src/libcharon/plugins/smp/smp.c.orig 2016-04-22 20:01:35 UTC +++ src/libcharon/plugins/smp/smp.c @@ -737,7 +737,7 @@ METHOD(plugin_t, destroy, void, */ diff --git a/security/strongswan/files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c b/security/strongswan/files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c index 67c123e233c2..f2ed787f3f23 100644 --- a/security/strongswan/files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c +++ b/security/strongswan/files/patch-src_libstrongswan_plugins_openssl_openssl__plugin.c @@ -1,6 +1,6 @@ ---- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig 2016-06-30 14:20:10 UTC +--- src/libstrongswan/plugins/openssl/openssl_plugin.c.orig 2016-10-08 12:17:09 UTC +++ src/libstrongswan/plugins/openssl/openssl_plugin.c -@@ -573,7 +573,7 @@ plugin_t *openssl_plugin_create() +@@ -623,7 +623,7 @@ plugin_t *openssl_plugin_create() }, ); diff --git a/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h b/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h index 38906417dafb..c9329df01712 100644 --- a/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h +++ b/security/strongswan/files/patch-src_libstrongswan_utils_utils_byteorder.h @@ -1,4 +1,4 @@ ---- src/libstrongswan/utils/utils/byteorder.h.orig 2016-03-29 06:56:52 UTC +--- src/libstrongswan/utils/utils/byteorder.h.orig 2016-08-16 15:24:34 UTC +++ src/libstrongswan/utils/utils/byteorder.h @@ -22,6 +22,10 @@ #ifndef BYTEORDER_H_ diff --git a/security/strongswan/files/patch-src_starter_Makefile.in b/security/strongswan/files/patch-src_starter_Makefile.in index 4a3a3b9a3544..9ae6301785a0 100644 --- a/security/strongswan/files/patch-src_starter_Makefile.in +++ b/security/strongswan/files/patch-src_starter_Makefile.in @@ -1,11 +1,13 @@ ---- src/starter/Makefile.in.orig 2015-03-27 20:03:00 UTC +--- src/starter/Makefile.in.orig 2016-10-20 09:10:06 UTC +++ src/starter/Makefile.in -@@ -985,7 +985,7 @@ install-exec-local : +@@ -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. diff --git a/security/strongswan/pkg-plist b/security/strongswan/pkg-plist index f4ea665b0cb6..17bb21dc0c6b 100644 --- a/security/strongswan/pkg-plist +++ b/security/strongswan/pkg-plist @@ -369,6 +369,7 @@ man/man8/charon-cmd.8.gz %%XAUTHGEN%%%%DATADIR%%/templates/config/plugins/xauth-generic.conf %%XAUTHGEN%%@sample %%ETCDIR%%.d/charon/xauth-generic.conf.sample @sample etc/ipsec.conf.sample +@sample etc/ipsec.secrets.sample @sample %%ETCDIR%%.conf.sample @sample %%ETCDIR%%.d/charon-logging.conf.sample @sample %%ETCDIR%%.d/charon.conf.sample @@ -430,6 +431,7 @@ lib/ipsec/libtls.so.0.0.0 %%SWANCTL%%@dir etc/swanctl/ecdsa %%SWANCTL%%@dir etc/swanctl/pkcs12 %%SWANCTL%%@dir etc/swanctl/pkcs8 +%%SWANCTL%%@dir etc/swanctl/private %%SWANCTL%%@dir etc/swanctl/pubkey %%SWANCTL%%@dir etc/swanctl/rsa %%SWANCTL%%@dir etc/swanctl/x509 |