5 files changed, 10 insertions, 85 deletions
diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD
index 9e89943fe..e953aaebc 100644
--- a/community/ipsec-tools/PKGBUILD
+++ b/community/ipsec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86151 2013-03-12 12:49:56Z spupykin $
+# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
 
 pkgname=ipsec-tools
 pkgver=0.8.1
-pkgrel=1
+pkgrel=4
 pkgdesc="KAME IPSec tools ported to Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ipsec-tools.sourceforge.net/"
@@ -13,16 +13,12 @@ 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'
+         '3a64a9e3b498c6da90450ffb0b758aea'
+         '387a0b0c4f10e42b2bb62282885cdc9c'
          'ae1dd20c83dcfce3dedb46ee73e83613')
 
 build() {
@@ -32,17 +28,16 @@ build() {
   sed -i 's#-Werror##' configure.ac
 
   ./bootstrap
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
 	--enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \
-	--enable-adminport --enable-gssapi
+	--enable-adminport --enable-gssapi \
+	--with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include
   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
 }
diff --git a/community/ipsec-tools/ipsec.rc b/community/ipsec-tools/ipsec.rc
deleted file mode 100644
index cff472c59..000000000
--- a/community/ipsec-tools/ipsec.rc
+++ /dev/null
@@ -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
diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service
index 3a6dea38b..483a5b58d 100644
--- a/community/ipsec-tools/ipsec.service
+++ b/community/ipsec-tools/ipsec.service
@@ -5,8 +5,8 @@ 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
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ipsec-tools/racoon.rc b/community/ipsec-tools/racoon.rc
deleted file mode 100644
index 1a67dcac5..000000000
--- a/community/ipsec-tools/racoon.rc
+++ /dev/null
@@ -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
diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service
index 792cfd395..95324bd5d 100644
--- a/community/ipsec-tools/racoon.service
+++ b/community/ipsec-tools/racoon.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/racoon
+ExecStart=/usr/bin/racoon
 
 [Install]
 WantedBy=multi-user.target