summaryrefslogtreecommitdiff
path: root/community/ipsec-tools
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-14 16:10:04 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-14 16:10:04 +0100
commit96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch)
treef107c3838373376ef130dcfcb5a980cf8ad30a5f /community/ipsec-tools
parent40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff)
parent3ff20dedff636571ad0faa4736af5b23e4623ffe (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/cantata/PKGBUILD community/gpsmanshp/PKGBUILD community/pigz/PKGBUILD extra/calligra/PKGBUILD extra/genius/PKGBUILD extra/gnumeric/PKGBUILD extra/goffice/PKGBUILD extra/graphicsmagick/PKGBUILD extra/libgphoto2/PKGBUILD extra/python-numpy/PKGBUILD
Diffstat (limited to 'community/ipsec-tools')
-rw-r--r--community/ipsec-tools/PKGBUILD20
-rw-r--r--community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch50
2 files changed, 63 insertions, 7 deletions
diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD
index bf47cf2b2..9e89943fe 100644
--- a/community/ipsec-tools/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 82168 2013-01-10 09:22:20Z spupykin $
+# $Id: PKGBUILD 86151 2013-03-12 12:49:56Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Allan Henriksen <allan.henriksen@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' 'mips64el')
url="http://ipsec-tools.sourceforge.net/"
@@ -16,16 +16,22 @@ source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgve
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
diff --git a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch
new file mode 100644
index 000000000..46b11ee51
--- /dev/null
+++ b/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch
@@ -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