X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fipsec-tools%2FMakefile;h=c66a5a37699c7bd033b22005ee44d4aa5445ed6c;hb=eb989accd7ea04db53cc84f2e46e5ad565bb2a4e;hp=363692b3120cac89d7a5e32c5bf8ccbd79c13fd3;hpb=9df003f56d0892f50adb66349f2a51a1cc2a7be1;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile
index 363692b312..c66a5a3769 100644
--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@@ -1,28 +1,30 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
-PKG_VERSION:=0.7
-PKG_RELEASE:=1
+PKG_VERSION:=0.7.3
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
-PKG_MD5SUM:=c0a586924edde35264ecfe94ad1c261f
+PKG_MD5SUM:=821bd84e8d4ad5a93bf594b8b3d66e1e
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipsec-tools
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@LINUX_2_6 +libopenssl
+  DEPENDS:=@!LINUX_2_4 +libopenssl +kmod-ipsec
   TITLE:=IPsec management tools
   URL:=http://ipsec-tools.sourceforge.net/
 endef
@@ -39,8 +41,11 @@ CONFIGURE_ARGS += \
 	--enable-hybrid \
 	--enable-security-context=no \
 	--enable-natt \
-	--enable-adminport \
-	--enable-ipv6
+	--enable-adminport
+
+# 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)
@@ -59,14 +64,6 @@ 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/