X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/643f013d152805f989115a71a8d19b02d01320a4..0ec8fc138340b72203c106de7f66d07c10c86cc5:/package/openswan/Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index ea23caf0e..6b6821dcf 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,60 +10,74 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.4.7
+PKG_VERSION:=2.4.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079
+PKG_MD5SUM:=2b36785342c74d524d8d86bde89a445f
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openswan/Default
   TITLE:=Openswan
-  DESCRIPTION:=\
-	Openswan is an IPsec implementation for Linux.
   URL:=http://www.openswan.org/
+  DEPENDS:=@BROKEN
+endef
+
+define Package/openswan/Default/description
+ Openswan is an IPsec implementation for Linux.
 endef
 
 define Package/openswan
-  $(call Package/openswan/Default)
+$(call Package/openswan/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-openswan +libgmp
+  DEPENDS+= +kmod-openswan +libgmp +ip
   TITLE+= (daemon)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the Openswan user-land daemon.
   URL:=http://www.openswan.org/
 endef
 
+define Package/openswan/description
+$(call Package/openswan/Default/description)
+ This package contains the Openswan user-land daemon.
+endef
+
 define KernelPackage/openswan
+$(call Package/openswan/Default)
   SUBMENU:=Network Support
-  $(call Package/openswan/Default)
   TITLE+= (kernel module)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the Openswan kernel module.
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
 endef
 
-PKG_MAKE_OPTS:= \
-		LINUX_RELEASE="$(LINUX_RELEASE)" \
-		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
-		IPSECDIR="/usr/lib/ipsec" \
-		INC_USRLOCAL="/usr" \
+define KernelPackage/openswan/description
+$(call Package/openswan/Default/description)
+ This package contains the Openswan kernel module.
+endef
+
+TARGET_CPPFLAGS = \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(LINUX_DIR)/include
+
+TARGET_LDFLAGS = \
+	-L$(STAGING_DIR)/usr/lib
+
+OPENSWAN_MAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+	$(TARGET_CONFIGURE_OPTS) \
+	LINUX_RELEASE="$(LINUX_RELEASE)" \
+	KERNELSRC="$(LINUX_DIR)" \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	USERCOMPILE="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+	IPSECDIR="/usr/lib/ipsec" \
+	INC_USRLOCAL="/usr" \
+	INC_RCDEFAULT="/etc/init.d" \
+	MODPROBE="/sbin/insmod" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	DESTDIR="$(PKG_INSTALL_DIR)"
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(PKG_MAKE_OPTS) \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
+	$(OPENSWAN_MAKE) \
 		programs module install
 endef