From 8fc89087f0c5f62547f3b0a6208f7e9f00a19c05 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Feb 2012 20:28:38 +0000
Subject: [PATCH] [packages_10.03.2] strongswan4: merge r28016, r28017, r28517

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30119 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/strongswan4/Makefile | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/net/strongswan4/Makefile b/net/strongswan4/Makefile
index 999c237..65f03ce 100644
--- a/net/strongswan4/Makefile
+++ b/net/strongswan4/Makefile
@@ -8,15 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
-PKG_VERSION:=4.5.2
+PKG_VERSION:=4.5.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/
-PKG_MD5SUM:=ac33b8f849a274127f84df0838cae953
+PKG_MD5SUM:=ee7c50a90c91307b111e8085f2479890
 
 PKG_MOD_AVAILABLE:= \
 	aes \
+	af-alg \
 	agent \
 	attr \
 	attr-sql \
@@ -111,11 +112,10 @@ $(call Package/strongswan4/Default)
 	+kmod-crypto-authenc \
 	+kmod-ipsec +kmod-ipsec4 \
 	+kmod-ipt-ipsec +iptables-mod-ipsec
-  MENU:=1
 endef
 
 define Package/strongswan4/config
-	source "$(SOURCE)/Config.in"
+  source "$(SOURCE)/Config.in"
 endef
 
 define Package/strongswan4/description
@@ -128,11 +128,12 @@ endef
 define Package/strongswan4-full
 $(call Package/strongswan4/Default)
   TITLE+= (full)
-  DEPENDS:= strongswan4 \
+  DEPENDS:= +strongswan4 \
 	+strongswan4-app-charon \
 	+strongswan4-app-pluto \
 	+strongswan4-libfast \
 	+strongswan4-mod-aes \
+	+strongswan4-mod-af-alg \
 	+strongswan4-mod-agent \
 	+strongswan4-mod-attr \
 	+strongswan4-mod-attr-sql \
@@ -182,7 +183,8 @@ $(call Package/strongswan4/Default)
 	+strongswan4-mod-x509 \
 	+strongswan4-mod-xauth \
 	+strongswan4-mod-xcbc \
-	+strongswan4-utils
+	+strongswan4-utils \
+	@DEVEL
 endef
 
 define Package/strongswan4-full/description
@@ -197,7 +199,7 @@ endef
 define Package/strongswan4-default
 $(call Package/strongswan4/Default)
   TITLE+= (default)
-  DEPENDS:= strongswan4 \
+  DEPENDS:= +strongswan4 \
 	+strongswan4-app-charon \
 	+strongswan4-app-pluto \
 	+strongswan4-mod-aes \
@@ -239,7 +241,7 @@ endef
 define Package/strongswan4-minimal
 $(call Package/strongswan4/Default)
   TITLE+= (minimal)
-  DEPENDS:= strongswan4 \
+  DEPENDS:= +strongswan4 \
 	+strongswan4-app-charon \
 	+strongswan4-mod-aes \
 	+strongswan4-mod-gmp \
@@ -265,7 +267,7 @@ endef
 define Package/strongswan4-app-charon
 $(call Package/strongswan4/Default)
   TITLE+= IKEv2 keying daemon
-  DEPENDS:= strongswan4
+  DEPENDS:= +strongswan4
 endef
 
 define Package/strongswan4-app-charon/description
@@ -278,7 +280,7 @@ endef
 define Package/strongswan4-app-pluto
 $(call Package/strongswan4/Default)
   TITLE+= IKEv1 keying daemon
-  DEPENDS:= strongswan4
+  DEPENDS:= +strongswan4
 endef
 
 define Package/strongswan4-app-pluto/description
@@ -291,7 +293,7 @@ endef
 define Package/strongswan4-libfast
 $(call Package/strongswan4/Default)
   TITLE+= libfast
-  DEPENDS:= strongswan4
+  DEPENDS:= +strongswan4
 endef
 
 define Package/strongswan4-libfast/description
@@ -305,7 +307,7 @@ endef
 define Package/strongswan4-utils
 $(call Package/strongswan4/Default)
   TITLE+= utilities
-  DEPENDS:= strongswan4
+  DEPENDS:= +strongswan4
 endef
 
 define Package/strongswan4-utils/description
@@ -322,7 +324,7 @@ define BuildPlugin
   define Package/strongswan4-mod-$(1)
     $$(call Package/strongswan4/Default)
     TITLE:= StrongSwan $(2) plugin
-    DEPENDS:= strongswan4 $(3)
+    DEPENDS:= +strongswan4 $(3)
   endef
 
   define Package/strongswan4-mod-$(1)/install
@@ -371,8 +373,8 @@ define Package/strongswan4/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) -R $(PKG_INSTALL_DIR)/etc/ipsec.d $(1)/etc/
 	$(CP) $(PKG_INSTALL_DIR)/etc/{ipsec.conf,strongswan.conf} $(1)/etc/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/ipsec
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/ipsec
@@ -397,8 +399,8 @@ endef
 
 
 define Package/strongswan4-app-charon/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharon.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/ipsec
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libcharon.so.* $(1)/usr/lib/ipsec/
 	$(INSTALL_DIR) $(1)/usr/lib/ipsec
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{charon,stroke} $(1)/usr/lib/ipsec/
 endef
@@ -411,8 +413,8 @@ endef
 
 
 define Package/strongswan4-libfast/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfast.so.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/ipsec
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libfast.so.* $(1)/usr/lib/ipsec/
 endef
 
 
@@ -444,6 +446,7 @@ $(eval $(call BuildPackage,strongswan4-utils))
 
 $(eval $(call BuildPlugin,aes,AES crypto,))
 $(eval $(call BuildPlugin,agent,SSH agent signing,))
+$(eval $(call BuildPlugin,af-alg,AF_ALG Linux crypto API,+kmod-crypto-user))
 $(eval $(call BuildPlugin,attr,File-based config attr,))
 $(eval $(call BuildPlugin,attr-sql,SQL-based config attrib,+strongswan4-mod-sql))
 $(eval $(call BuildPlugin,blowfish,Blowfish crypto,))
-- 
2.11.0