--- Makefile	(revision 437778)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	strongswan
-PORTVERSION=	5.5.1
-PORTREVISION=	1
+PORTVERSION=	5.5.2
 CATEGORIES=	security
 MASTER_SITES=	http://download.strongswan.org/ \
 		http://download2.strongswan.org/
@@ -41,10 +40,10 @@ 
 
 OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEv1 \
 		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SMP \
-		SQLITE SWANCTL TESTVECTOR UNBOUND UNITY VICI XAUTH
+		SQLITE SWANCTL TESTVECTOR TPM UNBOUND UNITY VICI XAUTH
 OPTIONS_DEFAULT=	IKEv1 BUILTIN PKI SWANCTL VICI
 OPTIONS_SINGLE=	PRINTF_HOOKS
-OPTIONS_SINGLE_PRINTF_HOOKS=	BUILTIN VSTR LIBC
+OPTIONS_SINGLE_PRINTF_HOOKS=	BUILTIN LIBC VSTR
 OPTIONS_SUB=	yes
 
 # Description of options
@@ -58,11 +57,12 @@ 
 IPSECKEY_DESC=	Enable authentication with IPSECKEY resource records with DNSSEC
 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
 SMP_DESC=	Enable XML-based management protocol (DEPRECATED)
 SWANCTL_DESC=	Install swanctl (requires VICI)
+TESTVECTOR_DESC=	Enable crypto test vectors
+TPM_DESC=	Enable TPM plugin
 UNBOUND_DESC=	Enable DNSSEC-enabled resolver
 UNITY_DESC=	Enable Cisco Unity extension plugin
 VICI_DESC=	Enable VICI management protocol
@@ -88,15 +88,16 @@ 
 LDAP_USE=		OPENLDAP=yes
 MYSQL_CONFIGURE_ON=	--enable-mysql
 MYSQL_USES=		mysql
+PKI_CONFIGURE_OFF=	--disable-pki
+SCEP_CONFIGURE_OFF=	--disable-scepclient
 SMP_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 SMP_CONFIGURE_ON=	--enable-smp
+SQLITE_CONFIGURE_ON=	--enable-sqlite
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 SWANCTL_CONFIGURE_ON=	--enable-swanctl
 SWANCTL_IMPLIES=	VICI
-SQLITE_CONFIGURE_ON=	--enable-sqlite
-SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
-PKI_CONFIGURE_OFF=	--disable-pki
-SCEP_CONFIGURE_OFF=	--disable-scepclient
+TPM_CONFIGURE_ON=	--enable-tpm
 UNBOUND_CONFIGURE_ON=	--enable-unbound
 UNBOUND_LIB_DEPENDS=	libunbound.so:dns/unbound \
 			libldns.so:dns/ldns
--- distinfo	(revision 437778)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1479401810
-SHA256 (strongswan-5.5.1.tar.bz2) = 720b301991f77bdedd8d551a956f52e2d11686a0ec18e832094f86cf2b842ab7
-SIZE (strongswan-5.5.1.tar.bz2) = 4636854
+TIMESTAMP = 1490717039
+SHA256 (strongswan-5.5.2.tar.bz2) = da976fca836f05fc7b7a38baab299745f960cb7640319969d239d8aa4ace9f6a
+SIZE (strongswan-5.5.2.tar.bz2) = 4759802
--- pkg-plist	(revision 437778)
+++ pkg-plist	(working copy)
@@ -2,6 +2,11 @@ 
 lib/ipsec/libcharon.la
 lib/ipsec/libcharon.so
 lib/ipsec/libcharon.so.0
+lib/ipsec/libtpmtss.a
+lib/ipsec/libtpmtss.la
+lib/ipsec/libtpmtss.so
+lib/ipsec/libtpmtss.so.0
+lib/ipsec/libtpmtss.so.0.0.0
 lib/ipsec/libstrongswan.a
 lib/ipsec/libstrongswan.la
 lib/ipsec/libstrongswan.so
@@ -28,6 +33,9 @@ 
 lib/ipsec/plugins/libstrongswan-constraints.a
 lib/ipsec/plugins/libstrongswan-constraints.la
 lib/ipsec/plugins/libstrongswan-constraints.so
+lib/ipsec/plugins/libstrongswan-curve25519.a
+lib/ipsec/plugins/libstrongswan-curve25519.la
+lib/ipsec/plugins/libstrongswan-curve25519.so
 lib/ipsec/plugins/libstrongswan-des.a
 lib/ipsec/plugins/libstrongswan-des.la
 lib/ipsec/plugins/libstrongswan-des.so
@@ -150,6 +158,7 @@ 
 %%DATADIR%%/templates/config/plugins/blowfish.conf
 %%DATADIR%%/templates/config/plugins/cmac.conf
 %%DATADIR%%/templates/config/plugins/constraints.conf
+%%DATADIR%%/templates/config/plugins/curve25519.conf
 %%DATADIR%%/templates/config/plugins/des.conf
 %%DATADIR%%/templates/config/plugins/dnskey.conf
 %%DATADIR%%/templates/config/plugins/eap-identity.conf
@@ -340,6 +349,11 @@ 
 %%SWANCTL%%man/man8/swanctl.8.gz
 %%SWANCTL%%@sample %%ETCDIR%%.d/swanctl.conf.sample
 %%SWANCTL%%@sample etc/swanctl/swanctl.conf.sample
+%%TPM%%@sample %%ETCDIR%%.d/charon/tpm.conf.sample
+%%TPM%%lib/ipsec/plugins/libstrongswan-tpm.a
+%%TPM%%lib/ipsec/plugins/libstrongswan-tpm.la
+%%TPM%%lib/ipsec/plugins/libstrongswan-tpm.so
+%%TPM%%%%DATADIR%%/templates/config/plugins/tpm.conf
 %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a
 %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la
 %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so
@@ -379,6 +393,7 @@ 
 @sample %%ETCDIR%%.d/charon/blowfish.conf.sample
 @sample %%ETCDIR%%.d/charon/cmac.conf.sample
 @sample %%ETCDIR%%.d/charon/constraints.conf.sample
+@sample %%ETCDIR%%.d/charon/curve25519.conf.sample
 @sample %%ETCDIR%%.d/charon/des.conf.sample
 @sample %%ETCDIR%%.d/charon/dnskey.conf.sample
 @sample %%ETCDIR%%.d/charon/eap-identity.conf.sample