summaryrefslogtreecommitdiff
path: root/package/ipsec-tools/patches/patch-configure
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-07-18 14:28:21 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-07-18 14:28:21 +0200
commit2d410f5d6775bf58eb86d2bd9af22cb6d23777a9 (patch)
treec2bf9d417feb6dd8d602bbe45a4cf8f1d16acf57 /package/ipsec-tools/patches/patch-configure
parentcc3b5823e3827a280ec757e7a775c1bac944259d (diff)
parent646fff13466f38f6f99b15dc5e146b864e6448eb (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ipsec-tools/patches/patch-configure')
-rw-r--r--package/ipsec-tools/patches/patch-configure31
1 files changed, 30 insertions, 1 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