[arch-commits] Commit in ipsec-tools/trunk (2 files)

[Sergej Pupykin]

    Date: Tuesday, March 12, 2013 @ 13:49:23
  Author: spupykin
Revision: 86150

upgpkg: ipsec-tools 0.8.1-1

upd

Added:
  ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch
Modified:
  ipsec-tools/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   18 ++++++++----
 ipsec-tools-linux-3.7-compat.patch |   50 +++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-12 09:55:52 UTC (rev 86149)
+++ PKGBUILD	2013-03-12 12:49:23 UTC (rev 86150)
@@ -3,8 +3,8 @@
 # Contributor: Allan Henriksen <allan.henriksen at gmail.com>
 
 pkgname=ipsec-tools
-pkgver=0.8.0
-pkgrel=6
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="KAME IPSec tools ported to Linux"
 arch=('i686' 'x86_64')
 url="http://ipsec-tools.sourceforge.net/"
@@ -16,16 +16,22 @@
 	racoon.rc
 	ipsec.rc
 	racoon.service
-	ipsec.service)
-md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619'
+	ipsec.service
+	ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d38b39f291ba2962387c3232e7335dd8'
          '416b8e362d86987b8c55f7153cdafbeb'
          '90d0810267cbd847383ae3101699b192'
          '1632fce55ba5592dea1f8bf661106e7d'
-         '5bf7478590c751b465617681a31619fe')
+         '5bf7478590c751b465617681a31619fe'
+         'ae1dd20c83dcfce3dedb46ee73e83613')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  sed -i 's#-Werror##' configure
+
+  patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch
+  sed -i 's#-Werror##' configure.ac
+
+  ./bootstrap
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
 	--enable-adminport --enable-gssapi

Added: ipsec-tools-linux-3.7-compat.patch
===================================================================
--- ipsec-tools-linux-3.7-compat.patch	                        (rev 0)
+++ ipsec-tools-linux-3.7-compat.patch	2013-03-12 12:49:23 UTC (rev 86150)
@@ -0,0 +1,50 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,9 +74,10 @@ case "$host_os" in
+ 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+ 
+     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+-	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+-	  KERNEL_INCLUDE=/usr/src/linux/include ,
+-	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
++	[ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
++	  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
++	    KERNEL_INCLUDE=/usr/src/linux/include ,
++	    [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] )
+     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,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+-], [kernel_natt="yes"])
++], [kernel_natt="yes"], [
++  AC_EGREP_CPP(yes,
++  [#include <uapi/linux/pfkeyv2.h>
++  #ifdef SADB_X_EXT_NAT_T_TYPE
++  yes
++  #endif
++  ], [kernel_natt="yes"])
++])
+ 	;;
+ freebsd*|netbsd*)
+ # NetBSD case
+--- a/src/include-glibc/Makefile.am
++++ b/src/include-glibc/Makefile.am
+@@ -1,14 +1,7 @@
+-
+-.includes: ${top_builddir}/config.status
+-	ln -snf $(KERNEL_INCLUDE)/linux
+-	touch .includes
+-
+-all: .includes
+-
+ EXTRA_DIST = \
+   glibc-bugs.h \
+   net/pfkeyv2.h \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .includes linux
++DISTCLEANFILES = linux