From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 17 Feb 2013 12:24:28 +0000 (+0000)
Subject: ipsec-tools: update to 0.8.1
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=357501e7990195d480f9c89e9b6abc98d5de428a;p=packages.git

ipsec-tools: update to 0.8.1

This patch updates ipsec-tools to version 0.8.1 and refreshes its
patches. It was released on Sourceforge on 2013-01-08.
Compile and run tested, no problems found.

Patch-by: Anton van Bohemen <avbohemen@ziggo.nl>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@35640 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/ipsec-tools/Makefile b/net/ipsec-tools/Makefile
index 1dcd9f9a8..fdbf06d48 100644
--- a/net/ipsec-tools/Makefile
+++ b/net/ipsec-tools/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
-PKG_VERSION:=0.8.0
-PKG_RELEASE:=2
+PKG_VERSION:=0.8.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
-PKG_MD5SUM:=b79aae3055a51f8de5c0f1b8ca6cf619
+PKG_MD5SUM:=d38b39f291ba2962387c3232e7335dd8
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
diff --git a/net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch b/net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
index 7f46569f2..db5b3064d 100644
--- a/net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
+++ b/net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch
@@ -1,6 +1,6 @@
 --- a/src/racoon/oakley.c
 +++ b/src/racoon/oakley.c
-@@ -2419,8 +2419,21 @@ oakley_skeyid(iph1)
+@@ -2424,8 +2424,21 @@ oakley_skeyid(iph1)
  				plog(LLV_ERROR, LOCATION, iph1->remote,
  					"couldn't find the pskey for %s.\n",
  					saddrwop2str(iph1->remote));
diff --git a/net/ipsec-tools/patches/006-linux-3.7-compat.patch b/net/ipsec-tools/patches/006-linux-3.7-compat.patch
index e11a6c736..46b11ee51 100644
--- a/net/ipsec-tools/patches/006-linux-3.7-compat.patch
+++ b/net/ipsec-tools/patches/006-linux-3.7-compat.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -75,9 +75,10 @@ case "$host_os" in
+@@ -74,9 +74,10 @@ case "$host_os" in
  	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
  
      AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
@@ -14,7 +14,7 @@
      AC_SUBST(KERNEL_INCLUDE)
      # We need the configure script to run with correct kernel headers.
      # However we don't want to point to kernel source tree in compile time,
-@@ -644,7 +645,14 @@ AC_EGREP_CPP(yes,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
  #ifdef SADB_X_EXT_NAT_T_TYPE
  yes
  #endif
@@ -35,7 +35,7 @@
 @@ -1,14 +1,7 @@
 -
 -.includes: ${top_builddir}/config.status
--	ln -sf $(KERNEL_INCLUDE)/linux
+-	ln -snf $(KERNEL_INCLUDE)/linux
 -	touch .includes
 -
 -all: .includes