[arch-commits] Commit in ipsec-tools/repos (22 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Tue Mar 12 12:49:57 UTC 2013
Date: Tuesday, March 12, 2013 @ 13:49:56
Author: spupykin
Revision: 86151
archrelease: copy trunk to community-i686, community-x86_64
Added:
ipsec-tools/repos/community-i686/PKGBUILD
(from rev 86150, ipsec-tools/trunk/PKGBUILD)
ipsec-tools/repos/community-i686/ipsec-tools-linux-3.7-compat.patch
(from rev 86150, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
ipsec-tools/repos/community-i686/ipsec.rc
(from rev 86150, ipsec-tools/trunk/ipsec.rc)
ipsec-tools/repos/community-i686/ipsec.service
(from rev 86150, ipsec-tools/trunk/ipsec.service)
ipsec-tools/repos/community-i686/racoon.rc
(from rev 86150, ipsec-tools/trunk/racoon.rc)
ipsec-tools/repos/community-i686/racoon.service
(from rev 86150, ipsec-tools/trunk/racoon.service)
ipsec-tools/repos/community-x86_64/PKGBUILD
(from rev 86150, ipsec-tools/trunk/PKGBUILD)
ipsec-tools/repos/community-x86_64/ipsec-tools-linux-3.7-compat.patch
(from rev 86150, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
ipsec-tools/repos/community-x86_64/ipsec.rc
(from rev 86150, ipsec-tools/trunk/ipsec.rc)
ipsec-tools/repos/community-x86_64/ipsec.service
(from rev 86150, ipsec-tools/trunk/ipsec.service)
ipsec-tools/repos/community-x86_64/racoon.rc
(from rev 86150, ipsec-tools/trunk/racoon.rc)
ipsec-tools/repos/community-x86_64/racoon.service
(from rev 86150, ipsec-tools/trunk/racoon.service)
Deleted:
ipsec-tools/repos/community-i686/PKGBUILD
ipsec-tools/repos/community-i686/ipsec.rc
ipsec-tools/repos/community-i686/ipsec.service
ipsec-tools/repos/community-i686/racoon.rc
ipsec-tools/repos/community-i686/racoon.service
ipsec-tools/repos/community-x86_64/PKGBUILD
ipsec-tools/repos/community-x86_64/ipsec.rc
ipsec-tools/repos/community-x86_64/ipsec.service
ipsec-tools/repos/community-x86_64/racoon.rc
ipsec-tools/repos/community-x86_64/racoon.service
-----------------------------------------------------+
community-i686/PKGBUILD | 90 +++++++++---------
community-i686/ipsec-tools-linux-3.7-compat.patch | 50 ++++++++++
community-i686/ipsec.rc | 70 +++++++-------
community-i686/ipsec.service | 24 ++--
community-i686/racoon.rc | 70 +++++++-------
community-i686/racoon.service | 20 ++--
community-x86_64/PKGBUILD | 90 +++++++++---------
community-x86_64/ipsec-tools-linux-3.7-compat.patch | 50 ++++++++++
community-x86_64/ipsec.rc | 70 +++++++-------
community-x86_64/ipsec.service | 24 ++--
community-x86_64/racoon.rc | 70 +++++++-------
community-x86_64/racoon.service | 20 ++--
12 files changed, 380 insertions(+), 268 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-i686/PKGBUILD 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Allan Henriksen <allan.henriksen at gmail.com>
-
-pkgname=ipsec-tools
-pkgver=0.8.0
-pkgrel=6
-pkgdesc="KAME IPSec tools ported to Linux"
-arch=('i686' 'x86_64')
-url="http://ipsec-tools.sourceforge.net/"
-depends=('readline' 'openssl' 'krb5')
-makedepends=('linux-headers')
-license=('GPL')
-options=('!makeflags' '!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
- racoon.rc
- ipsec.rc
- racoon.service
- ipsec.service)
-md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619'
- '416b8e362d86987b8c55f7153cdafbeb'
- '90d0810267cbd847383ae3101699b192'
- '1632fce55ba5592dea1f8bf661106e7d'
- '5bf7478590c751b465617681a31619fe')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- sed -i 's#-Werror##' configure
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
- --enable-adminport --enable-gssapi
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon
- install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec
- 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-i686/PKGBUILD (from rev 86150, ipsec-tools/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Allan Henriksen <allan.henriksen at gmail.com>
+
+pkgname=ipsec-tools
+pkgver=0.8.1
+pkgrel=1
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('i686' 'x86_64')
+url="http://ipsec-tools.sourceforge.net/"
+depends=('readline' 'openssl' 'krb5')
+makedepends=('linux-headers')
+license=('GPL')
+options=('!makeflags' '!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
+ racoon.rc
+ ipsec.rc
+ racoon.service
+ ipsec.service
+ ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d38b39f291ba2962387c3232e7335dd8'
+ '416b8e362d86987b8c55f7153cdafbeb'
+ '90d0810267cbd847383ae3101699b192'
+ '1632fce55ba5592dea1f8bf661106e7d'
+ '5bf7478590c751b465617681a31619fe'
+ 'ae1dd20c83dcfce3dedb46ee73e83613')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ 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
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon
+ install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec
+ 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-i686/ipsec-tools-linux-3.7-compat.patch (from rev 86150, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
===================================================================
--- community-i686/ipsec-tools-linux-3.7-compat.patch (rev 0)
+++ community-i686/ipsec-tools-linux-3.7-compat.patch 2013-03-12 12:49:56 UTC (rev 86151)
@@ -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
Deleted: community-i686/ipsec.rc
===================================================================
--- community-i686/ipsec.rc 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-i686/ipsec.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Loading IPSec Security Policy Database..."
- /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ipsec
- stat_done
- fi
- ;;
- stop)
- stat_busy "Unloading IPSec Security Policy Database..."
- /usr/sbin/setkey -F -P
- /usr/sbin/setkey -F
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ipsec
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: ipsec-tools/repos/community-i686/ipsec.rc (from rev 86150, ipsec-tools/trunk/ipsec.rc)
===================================================================
--- community-i686/ipsec.rc (rev 0)
+++ community-i686/ipsec.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Loading IPSec Security Policy Database..."
+ /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon ipsec
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Unloading IPSec Security Policy Database..."
+ /usr/sbin/setkey -F -P
+ /usr/sbin/setkey -F
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon ipsec
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: community-i686/ipsec.service
===================================================================
--- community-i686/ipsec.service 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-i686/ipsec.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Load IPSec Security Policy Database
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf
-ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
-
-[Install]
-WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-i686/ipsec.service (from rev 86150, ipsec-tools/trunk/ipsec.service)
===================================================================
--- community-i686/ipsec.service (rev 0)
+++ community-i686/ipsec.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/racoon.rc
===================================================================
--- community-i686/racoon.rc 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-i686/racoon.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/racoon`
-case "$1" in
- start)
- stat_busy "Starting Racoon IPSec daemon"
- [ -z "$PID" ] && /usr/sbin/racoon
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon racoon
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Racoon IPSec daemon"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon racoon
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: ipsec-tools/repos/community-i686/racoon.rc (from rev 86150, ipsec-tools/trunk/racoon.rc)
===================================================================
--- community-i686/racoon.rc (rev 0)
+++ community-i686/racoon.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/racoon`
+case "$1" in
+ start)
+ stat_busy "Starting Racoon IPSec daemon"
+ [ -z "$PID" ] && /usr/sbin/racoon
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon racoon
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Racoon IPSec daemon"
+ [ ! -z "$PID" ] && kill $PID &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon racoon
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: community-i686/racoon.service
===================================================================
--- community-i686/racoon.service 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-i686/racoon.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Racoon IKEv1 key management daemon for IPSEC
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/racoon
-
-[Install]
-WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-i686/racoon.service (from rev 86150, ipsec-tools/trunk/racoon.service)
===================================================================
--- community-i686/racoon.service (rev 0)
+++ community-i686/racoon.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-x86_64/PKGBUILD 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Allan Henriksen <allan.henriksen at gmail.com>
-
-pkgname=ipsec-tools
-pkgver=0.8.0
-pkgrel=6
-pkgdesc="KAME IPSec tools ported to Linux"
-arch=('i686' 'x86_64')
-url="http://ipsec-tools.sourceforge.net/"
-depends=('readline' 'openssl' 'krb5')
-makedepends=('linux-headers')
-license=('GPL')
-options=('!makeflags' '!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
- racoon.rc
- ipsec.rc
- racoon.service
- ipsec.service)
-md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619'
- '416b8e362d86987b8c55f7153cdafbeb'
- '90d0810267cbd847383ae3101699b192'
- '1632fce55ba5592dea1f8bf661106e7d'
- '5bf7478590c751b465617681a31619fe')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- sed -i 's#-Werror##' configure
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
- --enable-adminport --enable-gssapi
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon
- install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec
- 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-x86_64/PKGBUILD (from rev 86150, ipsec-tools/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Allan Henriksen <allan.henriksen at gmail.com>
+
+pkgname=ipsec-tools
+pkgver=0.8.1
+pkgrel=1
+pkgdesc="KAME IPSec tools ported to Linux"
+arch=('i686' 'x86_64')
+url="http://ipsec-tools.sourceforge.net/"
+depends=('readline' 'openssl' 'krb5')
+makedepends=('linux-headers')
+license=('GPL')
+options=('!makeflags' '!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2
+ racoon.rc
+ ipsec.rc
+ racoon.service
+ ipsec.service
+ ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d38b39f291ba2962387c3232e7335dd8'
+ '416b8e362d86987b8c55f7153cdafbeb'
+ '90d0810267cbd847383ae3101699b192'
+ '1632fce55ba5592dea1f8bf661106e7d'
+ '5bf7478590c751b465617681a31619fe'
+ 'ae1dd20c83dcfce3dedb46ee73e83613')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ 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
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+ install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon
+ install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec
+ 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-x86_64/ipsec-tools-linux-3.7-compat.patch (from rev 86150, ipsec-tools/trunk/ipsec-tools-linux-3.7-compat.patch)
===================================================================
--- community-x86_64/ipsec-tools-linux-3.7-compat.patch (rev 0)
+++ community-x86_64/ipsec-tools-linux-3.7-compat.patch 2013-03-12 12:49:56 UTC (rev 86151)
@@ -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
Deleted: community-x86_64/ipsec.rc
===================================================================
--- community-x86_64/ipsec.rc 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-x86_64/ipsec.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Loading IPSec Security Policy Database..."
- /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ipsec
- stat_done
- fi
- ;;
- stop)
- stat_busy "Unloading IPSec Security Policy Database..."
- /usr/sbin/setkey -F -P
- /usr/sbin/setkey -F
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ipsec
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: ipsec-tools/repos/community-x86_64/ipsec.rc (from rev 86150, ipsec-tools/trunk/ipsec.rc)
===================================================================
--- community-x86_64/ipsec.rc (rev 0)
+++ community-x86_64/ipsec.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Loading IPSec Security Policy Database..."
+ /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon ipsec
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Unloading IPSec Security Policy Database..."
+ /usr/sbin/setkey -F -P
+ /usr/sbin/setkey -F
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon ipsec
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: community-x86_64/ipsec.service
===================================================================
--- community-x86_64/ipsec.service 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-x86_64/ipsec.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Load IPSec Security Policy Database
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf
-ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
-
-[Install]
-WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-x86_64/ipsec.service (from rev 86150, ipsec-tools/trunk/ipsec.service)
===================================================================
--- community-x86_64/ipsec.service (rev 0)
+++ community-x86_64/ipsec.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/racoon.rc
===================================================================
--- community-x86_64/racoon.rc 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-x86_64/racoon.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/racoon`
-case "$1" in
- start)
- stat_busy "Starting Racoon IPSec daemon"
- [ -z "$PID" ] && /usr/sbin/racoon
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon racoon
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Racoon IPSec daemon"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon racoon
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: ipsec-tools/repos/community-x86_64/racoon.rc (from rev 86150, ipsec-tools/trunk/racoon.rc)
===================================================================
--- community-x86_64/racoon.rc (rev 0)
+++ community-x86_64/racoon.rc 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/racoon`
+case "$1" in
+ start)
+ stat_busy "Starting Racoon IPSec daemon"
+ [ -z "$PID" ] && /usr/sbin/racoon
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon racoon
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Racoon IPSec daemon"
+ [ ! -z "$PID" ] && kill $PID &>/dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon racoon
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: community-x86_64/racoon.service
===================================================================
--- community-x86_64/racoon.service 2013-03-12 12:49:23 UTC (rev 86150)
+++ community-x86_64/racoon.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Racoon IKEv1 key management daemon for IPSEC
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/racoon
-
-[Install]
-WantedBy=multi-user.target
Copied: ipsec-tools/repos/community-x86_64/racoon.service (from rev 86150, ipsec-tools/trunk/racoon.service)
===================================================================
--- community-x86_64/racoon.service (rev 0)
+++ community-x86_64/racoon.service 2013-03-12 12:49:56 UTC (rev 86151)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list