forgot to bump up the release version from the patches the other day

[openwrt.git] / package / openswan / Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index ea23caf..9e78615 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -10,51 +10,58 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan

-PKG_VERSION:=2.4.7
+PKG_VERSION:=2.4.8

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download

-PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079
+PKG_MD5SUM:=918cc56ccf8e5d14cd2047e47450b34a

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openswan/Default
   TITLE:=Openswan
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openswan/Default
   TITLE:=Openswan

-  DESCRIPTION:=\
-       Openswan is an IPsec implementation for Linux.

   URL:=http://www.openswan.org/
 endef
 
   URL:=http://www.openswan.org/
 endef
 

+define Package/openswan/Default/description
+ Openswan is an IPsec implementation for Linux.
+endef
+

 define Package/openswan
 define Package/openswan

-  $(call Package/openswan/Default)
+$(call Package/openswan/Default)

   SECTION:=net
   CATEGORY:=Network
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=+kmod-openswan +libgmp
+  DEPENDS:=@LINUX_2_4 +kmod-openswan +libgmp +ip

   TITLE+= (daemon)
   TITLE+= (daemon)

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the Openswan user-land daemon.

   URL:=http://www.openswan.org/
 endef
 
   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
 define KernelPackage/openswan

+$(call Package/openswan/Default)

   SUBMENU:=Network Support
   SUBMENU:=Network Support

-  $(call Package/openswan/Default)
+  DEPENDS:=@LINUX_2_4 

   TITLE+= (kernel module)
   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
 
   FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
 endef
 

+define KernelPackage/openswan/description
+$(call Package/openswan/Default/description)
+ This package contains the Openswan kernel module.
+endef
+
+

 PKG_MAKE_OPTS:= \
                LINUX_RELEASE="$(LINUX_RELEASE)" \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
 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" \
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \

                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 


@@ -62,7 +69,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \

-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef
                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef