Date: Monday, March 20, 2017 @ 12:36:03
Author: jgc
Revision: 217554
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
ipsec-tools/repos/community-staging-i686/
ipsec-tools/repos/community-staging-i686/PKGBUILD
(from rev 217553, ipsec-tools/trunk/PKGBUILD)
ipsec-tools/repos/community-staging-i686/ipsec-tools-linux-3.7-compat.patch
(from rev 217553, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
ipsec-tools/repos/community-staging-i686/ipsec.service
(from rev 217553, ipsec-tools/trunk/ipsec.service)
ipsec-tools/repos/community-staging-i686/racoon.service
(from rev 217553, ipsec-tools/trunk/racoon.service)
ipsec-tools/repos/community-staging-x86_64/
ipsec-tools/repos/community-staging-x86_64/PKGBUILD
(from rev 217553, ipsec-tools/trunk/PKGBUILD)
ipsec-tools/repos/community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch
(from rev 217553, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
ipsec-tools/repos/community-staging-x86_64/ipsec.service
(from rev 217553, ipsec-tools/trunk/ipsec.service)
ipsec-tools/repos/community-staging-x86_64/racoon.service
(from rev 217553, ipsec-tools/trunk/racoon.service)
-------------------------------------------------------------+
community-staging-i686/PKGBUILD | 46 +++++++++
community-staging-i686/ipsec-tools-linux-3.7-compat.patch | 50 ++++++++++
community-staging-i686/ipsec.service | 12 ++
community-staging-i686/racoon.service | 10 ++
community-staging-x86_64/PKGBUILD | 46 +++++++++
community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch | 50 ++++++++++
community-staging-x86_64/ipsec.service | 12 ++
community-staging-x86_64/racoon.service | 10 ++
8 files changed, 236 insertions(+)
Copied: ipsec-tools/repos/community-staging-i686/PKGBUILD (from rev 217553,
ipsec-tools/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-03-20 12:36:03 UTC (rev 217554)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Contributor: Allan Henriksen <[email protected]>
+
+pkgname=ipsec-tools
+pkgver=0.8.2
+pkgrel=4
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('i686' 'x86_64')
+url="http://ipsec-tools.sourceforge.net/";
+depends=('readline' 'openssl-1.0' 'krb5' 'flex')
+makedepends=('linux-headers')
+license=('GPL')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
+ racoon.service
+ ipsec.service
+ ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d53ec14a0a3ece64e09e5e34b3350b41'
+ '3a64a9e3b498c6da90450ffb0b758aea'
+ '387a0b0c4f10e42b2bb62282885cdc9c'
+ 'ae1dd20c83dcfce3dedb46ee73e83613')
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ patch -p1 <"$srcdir"/ipsec-tools-linux-3.7-compat.patch
+ sed -i 's#-Werror##' configure.ac
+
+ ./bootstrap
+ CFLAGS+=" -I/usr/include/openssl-1.0" \
+ CPPFLAGS+=" -I/usr/include/openssl-1.0" \
+ LDFLAGS+=" -L/usr/lib/openssl-1.0" \
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--sbindir=/usr/bin \
+ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt
\
+ --enable-adminport --enable-gssapi \
+ --with-kernel-headers=/usr/include
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm0644 "$srcdir"/racoon.service
"$pkgdir"/usr/lib/systemd/system/racoon.service
+ install -Dm0644 "$srcdir"/ipsec.service
"$pkgdir"/usr/lib/systemd/system/ipsec.service
+}
Copied:
ipsec-tools/repos/community-staging-i686/ipsec-tools-linux-3.7-compat.patch
(from rev 217553, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
===================================================================
--- community-staging-i686/ipsec-tools-linux-3.7-compat.patch
(rev 0)
+++ community-staging-i686/ipsec-tools-linux-3.7-compat.patch 2017-03-20
12:36:03 UTC (rev 217554)
@@ -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
Copied: ipsec-tools/repos/community-staging-i686/ipsec.service (from rev
217553, ipsec-tools/trunk/ipsec.service)
===================================================================
--- community-staging-i686/ipsec.service (rev 0)
+++ community-staging-i686/ipsec.service 2017-03-20 12:36:03 UTC (rev
217554)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
+
+[Install]
+WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-staging-i686/racoon.service (from rev
217553, ipsec-tools/trunk/racoon.service)
===================================================================
--- community-staging-i686/racoon.service (rev 0)
+++ community-staging-i686/racoon.service 2017-03-20 12:36:03 UTC (rev
217554)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/racoon
+
+[Install]
+WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-staging-x86_64/PKGBUILD (from rev 217553,
ipsec-tools/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-03-20 12:36:03 UTC (rev 217554)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Contributor: Allan Henriksen <[email protected]>
+
+pkgname=ipsec-tools
+pkgver=0.8.2
+pkgrel=4
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('i686' 'x86_64')
+url="http://ipsec-tools.sourceforge.net/";
+depends=('readline' 'openssl-1.0' 'krb5' 'flex')
+makedepends=('linux-headers')
+license=('GPL')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
+ racoon.service
+ ipsec.service
+ ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d53ec14a0a3ece64e09e5e34b3350b41'
+ '3a64a9e3b498c6da90450ffb0b758aea'
+ '387a0b0c4f10e42b2bb62282885cdc9c'
+ 'ae1dd20c83dcfce3dedb46ee73e83613')
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ patch -p1 <"$srcdir"/ipsec-tools-linux-3.7-compat.patch
+ sed -i 's#-Werror##' configure.ac
+
+ ./bootstrap
+ CFLAGS+=" -I/usr/include/openssl-1.0" \
+ CPPFLAGS+=" -I/usr/include/openssl-1.0" \
+ LDFLAGS+=" -L/usr/lib/openssl-1.0" \
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
--sbindir=/usr/bin \
+ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt
\
+ --enable-adminport --enable-gssapi \
+ --with-kernel-headers=/usr/include
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm0644 "$srcdir"/racoon.service
"$pkgdir"/usr/lib/systemd/system/racoon.service
+ install -Dm0644 "$srcdir"/ipsec.service
"$pkgdir"/usr/lib/systemd/system/ipsec.service
+}
Copied:
ipsec-tools/repos/community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch
(from rev 217553, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
===================================================================
--- community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch
(rev 0)
+++ community-staging-x86_64/ipsec-tools-linux-3.7-compat.patch 2017-03-20
12:36:03 UTC (rev 217554)
@@ -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
Copied: ipsec-tools/repos/community-staging-x86_64/ipsec.service (from rev
217553, ipsec-tools/trunk/ipsec.service)
===================================================================
--- community-staging-x86_64/ipsec.service (rev 0)
+++ community-staging-x86_64/ipsec.service 2017-03-20 12:36:03 UTC (rev
217554)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
+
+[Install]
+WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-staging-x86_64/racoon.service (from rev
217553, ipsec-tools/trunk/racoon.service)
===================================================================
--- community-staging-x86_64/racoon.service (rev 0)
+++ community-staging-x86_64/racoon.service 2017-03-20 12:36:03 UTC (rev
217554)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/racoon
+
+[Install]
+WantedBy=multi-user.target
