X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fopenswan%2FMakefile;h=a644b20db0f38d56db305327aa21eb52928f3a9e;hb=a4a6443af12b7758b12020f561fa7fe2e0a3e87f;hp=178ae3bc7ccfbbfe271161299c39d7943d7991b3;hpb=f409bc934361999652fed081a62c1b1686e9a856;p=openwrt.git

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 178ae3bc7c..a644b20db0 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,57 +1,92 @@
+# 
+# Copyright (C) 2006 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:=openswan
-PKG_VERSION:=2.4.2
+PKG_VERSION:=2.4.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=38c7ad91312bdd67fa57fe987b21183e
 
-PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.openswan.org/download
+PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
 PKG_CAT:=zcat
 
-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-$(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+include $(INCLUDE_DIR)/package.mk
 
-FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
+define Package/openswan/Default
+  TITLE:=Openswan
+  DESCRIPTION:=\
+	Openswan is an IPsec implementation for Linux.
+  URL:=http://www.openswan.org/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
+define Package/openswan
+  $(call Package/openswan/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-openswan +libgmp
+  TITLE+= (daemon)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Openswan user-land daemon.
+  URL:=http://www.openswan.org/
+endef
 
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
+define Package/kmod-openswan
+  $(call Package/openswan/Default)
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers
+  TITLE+= (kernel module)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Openswan kernel module.
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
+
+PKG_MAKE_OPTS:= \
+		LINUX_RELEASE="$(LINUX_RELEASE)" \
 		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		EXTRA_INCLUDE="-I$(STAGING_DIR)/usr/include" \
-		EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib" \
+		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" \
-		programs
-	touch $@
 
-$(IPKG_OPENSWAN):
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(IDIR_OPENSWAN)" \
-		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		IPSECDIR="/usr/lib/ipsec" \
-		INC_USRLOCAL="/usr" \
-		install
-	-$(STRIP) $(IDIR_OPENSWAN)/usr/lib/ipsec/*
-	-$(STRIP) $(IDIR_OPENSWAN)/usr/libexec/ipsec/*
-	rm -rf $(IDIR_OPENSWAN)/usr/share
-	rm -rf $(IDIR_OPENSWAN)/usr/man
-	rm -rf $(IDIR_OPENSWAN)/var
-	rm -rf $(IDIR_OPENSWAN)/etc/rc.d/rc*.d
-	mkdir -p $(IDIR_OPENSWAN)/etc/init.d
-	ln -sf ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
-	find $(PKG_BUILD_DIR) -name \*.old | xargs rm -rf
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(IDIR_OPENSWAN) $(PACKAGE_DIR)
+		$(PKG_MAKE_OPTS) \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		programs module install
+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
+	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
+endef
+
+define Package/kmod-openswan/install
+	mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
+	$(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) \
+		$(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+$(eval $(call BuildPackage,openswan))
+$(eval $(call BuildPackage,kmod-openswan))