diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-08-19 06:32:34 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-08-19 06:32:34 +0000 |
| commit | 1f8d3713bcaeae198bba1f137b3457e99f2a1e9c (patch) | |
| tree | 8f8899190736fa3219acfd55e0d66b7e0febcf27 /package/ipsec-tools | |
| parent | 06864710ac4e610ab6659d2fe5430af17931e8f8 (diff) | |
ipsec-tools update and fixes:
* update to 0.6.7 (fixes DoS: CVE-2007-1841)
* enable hybrid auth and disable shadow support (closes: #2220)
* fix config file (closes: #2219)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8428 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ipsec-tools')
| -rw-r--r-- | package/ipsec-tools/Makefile | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index a1afe6283..92ea63b3d 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipsec-tools -PKG_VERSION:=0.6.6 +PKG_VERSION:=0.6.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/ipsec-tools -PKG_MD5SUM:=e908f3cf367e31c7902df5ab16fbe5c3 +PKG_MD5SUM:=4fb764f282dc21cf9a656c58e13dacbb include $(INCLUDE_DIR)/package.mk @@ -28,15 +28,16 @@ define Package/ipsec-tools endef CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --with-kernel-headers="$(LINUX_DIR)/include" \ - --without-readline \ - --with-openssl="$(STAGING_DIR)/usr" \ - --without-libradius \ - --without-libpam \ - --enable-dpd \ - --enable-natt + --enable-shared \ + --enable-static \ + --with-kernel-headers="$(LINUX_DIR)/include" \ + --without-readline \ + --with-openssl="$(STAGING_DIR)/usr" \ + --without-libradius \ + --without-libpam \ + --enable-dpd \ + --enable-hybrid \ + --enable-natt define Build/Configure (cd $(PKG_BUILD_DIR); touch \ @@ -47,6 +48,7 @@ define Build/Configure configure \ ); $(call Build/Configure/Default) + echo "#undef HAVE_SHADOW_H" >> $(PKG_BUILD_DIR)/config.h endef # override CFLAGS holding "-Werror" that break builds on compile warnings @@ -60,7 +62,10 @@ endef define Package/ipsec-tools/install $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/lib/ + $(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)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin @@ -70,4 +75,9 @@ define Package/ipsec-tools/install $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/ endef +define Package/ipsec-tools/conffiles +/etc/racoon.conf +/etc/racoon/psk.txt +endef + $(eval $(call BuildPackage,ipsec-tools)) |