X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fopenswan%2FMakefile;h=05ae1f8bb45d6fdcf1acb7f49b1f2eb3ebcb7bc9;hb=HEAD;hp=45beb33c62274e802a6cfab02a982e0f2ffe6dd9;hpb=08ba2ab5a8b3a72f448e5b0d493b84ae4a9f3bec;p=packages.git

diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index 45beb33c6..05ae1f8bb 100644
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.6.29
+PKG_VERSION:=2.6.41
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=cd6c127585ec6db63780e9a40d5387fb
+PKG_MD5SUM:=da2e8b02ecc30a408cc5766767fef84f
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -24,7 +24,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openswan/Default
   TITLE:=Openswan
   URL:=http://www.openswan.org/
-  DEPENDS:=@!LINUX_2_4
 endef
 
 define Package/openswan/Default/description
@@ -37,7 +36,7 @@ $(call Package/openswan/Default)
   SECTION:=net
   CATEGORY:=Network
   TITLE+= (daemon)
-  DEPENDS+= +kmod-openswan +libgmp +ip
+  DEPENDS+= +libgmp +ip
 endef
 
 define Package/openswan/description
@@ -49,6 +48,7 @@ define KernelPackage/openswan
 $(call Package/openswan/Default)
   SUBMENU:=Network Support
   TITLE+= (kernel module)
+  DEPENDS+=+IPV6:kmod-ipv6
   FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -57,7 +57,8 @@ $(call Package/openswan/Default/description)
  This package contains the Openswan kernel module.
 endef
 
-TARGET_CPPFLAGS += -I$(LINUX_DIR)/include -D__EXPORTED_HEADERS__
+TARGET_CPPFLAGS += -I$(LINUX_DIR)/$(LINUX_UAPI_DIR)include -D__EXPORTED_HEADERS__
+TARGET_CFLAGS += $(FPIC)
 
 OPENSWAN_MAKEFLAGS:= \
 	-C $(PKG_BUILD_DIR) \
@@ -71,27 +72,38 @@ OPENSWAN_MAKEFLAGS:= \
 	INC_USRLOCAL="/usr" \
 	INC_RCDEFAULT="/etc/init.d" \
 	MODPROBE="/sbin/insmod" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
 	DESTDIR="$(PKG_INSTALL_DIR)"
 
 define Build/Compile
-	$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
-	$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
+	+$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) programs
+	+$(MAKE) $(PKG_JOBS) $(OPENSWAN_MAKEFLAGS) module
 endef
 
 define Build/Install
 	$(MAKE) $(OPENSWAN_MAKEFLAGS) install
 endef
 
+define Package/openswan/conffiles
+/etc/ipsec.conf
+/etc/ipsec.secrets
+/etc/config/ipsec
+endef
+
 define Package/openswan/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(CP) ./files/ipsec.init $(1)/etc/init.d/ipsec
+	$(CP) ./files/ipsec.conf $(1)/etc/ipsec.conf
+	$(CP) ./files/ipsec.secrets $(1)/etc/ipsec.secrets
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/ipsec.config $(1)/etc/config/ipsec
 	rm -rf $(1)/usr/share
 	rm -rf $(1)/usr/man
 	rm -rf $(1)/var
 	rm -rf $(1)/etc/rc.d
 	find $(1) -name \*.old | xargs rm -rf
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DATA) files/ipsec.upgrade $(1)/lib/upgrade/keep.d/ipsec
 endef
 
 $(eval $(call BuildPackage,openswan))