diff options
Diffstat (limited to 'community/xl2tpd')
-rw-r--r-- | community/xl2tpd/PKGBUILD | 18 | ||||
-rw-r--r-- | community/xl2tpd/xl2tpd.rc | 39 | ||||
-rw-r--r-- | community/xl2tpd/xl2tpd.service | 4 |
3 files changed, 12 insertions, 49 deletions
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 9a11417c6..258f5d9de 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79633 2012-11-09 12:06:24Z spupykin $ +# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd pkgver=1.3.1 -pkgrel=1 +pkgrel=3 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -13,7 +13,6 @@ depends=('ppp') options=(emptydirs zipman docs) backup=(etc/ppp/options.l2tpd) source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz - xl2tpd.rc xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd @@ -21,11 +20,10 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p xl2tpd.tmpfiles ipparam.patch) md5sums=('38c2461d3562f98b08454ca403706886' - '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' - '5ba9ddaf66c9827fe4a2caef67cf61c2' + '219942dd098ce4fdba37d1db327baf57' '2e95e4fc03e1521ab20fd7e249efab5a' '4d258a58cc109d5c4d96af8f81d481cf') @@ -34,10 +32,14 @@ build() { patch -p1 <$srcdir/ipparam.patch - make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr - make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir install + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir SBINDIR=$pkgdir/usr/bin install - install -D -m0755 $srcdir/xl2tpd.rc $pkgdir/etc/rc.d/xl2tpd install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd diff --git a/community/xl2tpd/xl2tpd.rc b/community/xl2tpd/xl2tpd.rc deleted file mode 100644 index a06e0d41e..000000000 --- a/community/xl2tpd/xl2tpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - [ -d /var/run/xl2tpd ] || mkdir -p /var/run/xl2tpd - stat_busy "Starting xl2tpd" - /usr/sbin/xl2tpd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon xl2tpd - stat_done - fi - ;; - stop) - stat_busy "Stopping xl2tpd" - [ -f /var/run/xl2tpd.pid ] && kill `cat /var/run/xl2tpd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/xl2tpd.pid - rm_daemon xl2tpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service index b47cadf02..e55b9cb12 100644 --- a/community/xl2tpd/xl2tpd.service +++ b/community/xl2tpd/xl2tpd.service @@ -7,8 +7,8 @@ After=ipsec.service [Service] Type=simple -PIDFile=/var/run/xl2tpd/xl2tpd.pid -ExecStart=/usr/sbin/xl2tpd -D +PIDFile=/run/xl2tpd/xl2tpd.pid +ExecStart=/usr/bin/xl2tpd -D Restart=on-abort [Install] |