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)
SVN-Revision: 8428
This commit is contained in:
parent
ce9fff401a
commit
bef466faf6
1 changed files with 22 additions and 12 deletions
|
@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=ipsec-tools
|
PKG_NAME:=ipsec-tools
|
||||||
PKG_VERSION:=0.6.6
|
PKG_VERSION:=0.6.7
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=@SF/ipsec-tools
|
PKG_SOURCE_URL:=@SF/ipsec-tools
|
||||||
PKG_MD5SUM:=e908f3cf367e31c7902df5ab16fbe5c3
|
PKG_MD5SUM:=4fb764f282dc21cf9a656c58e13dacbb
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -28,15 +28,16 @@ define Package/ipsec-tools
|
||||||
endef
|
endef
|
||||||
|
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
--with-kernel-headers="$(LINUX_DIR)/include" \
|
--with-kernel-headers="$(LINUX_DIR)/include" \
|
||||||
--without-readline \
|
--without-readline \
|
||||||
--with-openssl="$(STAGING_DIR)/usr" \
|
--with-openssl="$(STAGING_DIR)/usr" \
|
||||||
--without-libradius \
|
--without-libradius \
|
||||||
--without-libpam \
|
--without-libpam \
|
||||||
--enable-dpd \
|
--enable-dpd \
|
||||||
--enable-natt
|
--enable-hybrid \
|
||||||
|
--enable-natt
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
(cd $(PKG_BUILD_DIR); touch \
|
(cd $(PKG_BUILD_DIR); touch \
|
||||||
|
@ -47,6 +48,7 @@ define Build/Configure
|
||||||
configure \
|
configure \
|
||||||
);
|
);
|
||||||
$(call Build/Configure/Default)
|
$(call Build/Configure/Default)
|
||||||
|
echo "#undef HAVE_SHADOW_H" >> $(PKG_BUILD_DIR)/config.h
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# override CFLAGS holding "-Werror" that break builds on compile warnings
|
# override CFLAGS holding "-Werror" that break builds on compile warnings
|
||||||
|
@ -60,7 +62,10 @@ endef
|
||||||
define Package/ipsec-tools/install
|
define Package/ipsec-tools/install
|
||||||
$(INSTALL_DIR) $(1)/etc
|
$(INSTALL_DIR) $(1)/etc
|
||||||
$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(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/libipsec.so.* $(1)/usr/lib/
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/
|
||||||
$(INSTALL_DIR) $(1)/usr/sbin
|
$(INSTALL_DIR) $(1)/usr/sbin
|
||||||
|
@ -70,4 +75,9 @@ define Package/ipsec-tools/install
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/
|
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Package/ipsec-tools/conffiles
|
||||||
|
/etc/racoon.conf
|
||||||
|
/etc/racoon/psk.txt
|
||||||
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,ipsec-tools))
|
$(eval $(call BuildPackage,ipsec-tools))
|
||||||
|
|
Loading…
Reference in a new issue