fix compile

3 files changed, 56 insertions, 3 deletions

diff --git a/package/ipsec-tools/patches/patch-configure b/package/ipsec-tools/patches/patch-configure
index 87bfb96a4..71ea329fe 100644
--- a/package/ipsec-tools/patches/patch-configure
+++ b/package/ipsec-tools/patches/patch-configure
@@ -1,5 +1,5 @@
 --- ipsec-tools-0.8.0.orig/configure	2011-03-18 14:27:41.000000000 +0100
-+++ ipsec-tools-0.8.0/configure	2011-03-31 13:16:18.091819156 +0200
++++ ipsec-tools-0.8.0/configure	2013-07-17 14:30:31.000000000 +0200
 @@ -11535,7 +11535,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
  
  
@@ -9,6 +9,17 @@
  
  case $host in
  *netbsd*)
+@@ -11627,8 +11627,8 @@ else
+ fi
+ 
+ 
+-    as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/linux/pfkeyv2.h" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default"
++    as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default"
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+ else
 @@ -12286,7 +12286,7 @@ $as_echo "$as_me: WARNING: Using a gener
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if printf accepts %z" >&5
  $as_echo_n "checking if printf accepts %z... " >&6; }
@@ -36,3 +47,21 @@
  	saved_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
  	ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
+@@ -14253,7 +14253,7 @@ linux*)
+ # Linux kernel NAT-T check
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <linux/pfkeyv2.h>
++#include <uapi/linux/pfkeyv2.h>
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+@@ -14440,7 +14440,7 @@ linux*)
+ # Linux kernel Security Context check
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <linux/pfkeyv2.h>
++#include <uapi/linux/pfkeyv2.h>
+ #ifdef SADB_X_EXT_SEC_CTX
+ yes
+ #endif
diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in
new file mode 100644
index 000000000..f594f5d92
--- /dev/null
+++ b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in
@@ -0,0 +1,24 @@
+--- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in	2011-03-18 14:27:40.000000000 +0100
++++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in	2013-07-17 14:35:36.000000000 +0200
+@@ -183,7 +183,7 @@ EXTRA_DIST = \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .includes linux
++DISTCLEANFILES = linux
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -370,11 +370,7 @@ uninstall-am:
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ 
+-.includes: ${top_builddir}/config.status
+-	ln -sf $(KERNEL_INCLUDE)/linux
+-	touch .includes
+-
+-all: .includes
++all:
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c
index e8f678186..ec4cf4591 100644
--- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c
+++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c
@@ -1,5 +1,5 @@
 --- ipsec-tools-0.8.0.orig/src/racoon/privsep.c	2011-03-06 09:28:10.000000000 +0100
-+++ ipsec-tools-0.8.0/src/racoon/privsep.c	2011-03-31 13:24:07.981813178 +0200
++++ ipsec-tools-0.8.0/src/racoon/privsep.c	2013-07-17 14:18:50.000000000 +0200
 @@ -359,7 +359,7 @@ privsep_init(void)
  			    strerror(errno));
  			goto out;
@@ -18,7 +18,7 @@
  
  	
  			/*
-@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) 
+@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path)
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return NULL;
  	}