ipsec-tools: update to 0.8.1

[openwrt/svn-archive/archive.git] / net / ipsec-tools / Makefile

diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile
index 9267a742bd9828394ee51dbbbceff4153754557b..fdbf06d483481c969a9e360cf5668d85a61a7f4c 100644 (file)
--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2009 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,19 +9,25 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
-PKG_VERSION:=0.7.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.8.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
-PKG_MD5SUM:=72861f005746ee27984b2ee715ecc629
+PKG_MD5SUM:=d38b39f291ba2962387c3232e7335dd8
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipsec-tools
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@LINUX_2_6 +libopenssl
+  SUBMENU:=VPN
+  DEPENDS:=+libopenssl +kmod-ipsec
   TITLE:=IPsec management tools
   URL:=http://ipsec-tools.sourceforge.net/
 endef
@@ -38,7 +44,13 @@ CONFIGURE_ARGS += \
        --enable-hybrid \
        --enable-security-context=no \
        --enable-natt \
-       --enable-adminport
+       --enable-adminport \
+       --enable-frag \
+        $(call autoconf_bool,CONFIG_IPV6,ipv6)
+
+# override CFLAGS holding "-Werror" that break builds on compile warnings
+MAKE_FLAGS+=\
+       CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"
 
 define Build/Prepare
        $(call Build/Prepare/Default)
@@ -57,20 +69,14 @@ define Build/Configure
        echo "#undef HAVE_SHADOW_H" >> $(PKG_BUILD_DIR)/config.h
 endef
 
-# override CFLAGS holding "-Werror" that break builds on compile warnings
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               all install
-endef
-
 define Package/ipsec-tools/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/
        $(SED) 's|@sysconfdir_x@|/etc|g' $(1)/etc/racoon.conf
        $(INSTALL_DIR) $(1)/etc/racoon
        $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/psk.txt $(1)/etc/racoon/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/racoon.init $(1)/etc/init.d/racoon
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/