diff options
Diffstat (limited to 'community/dante')
-rw-r--r-- | community/dante/PKGBUILD | 13 | ||||
-rw-r--r-- | community/dante/sockd.rc | 68 | ||||
-rw-r--r-- | community/dante/sockd.service | 4 |
3 files changed, 6 insertions, 79 deletions
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 0bc260b77..648c4df12 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79500 2012-11-06 11:18:47Z spupykin $ +# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=3 +pkgrel=5 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64 'mips64el') @@ -14,15 +14,14 @@ backup=('etc/socks.conf' 'etc/sockd.conf') options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz - sockd.rc sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - '5110dfd78a2b38fff27a886ee88b58a6' - 'ceb86b5bd97f7e3ceff28c6e6172a25b') + '9bb18a0165764092bd01da0ff6303fbf') build() { cd ${srcdir}/${pkgname}-${pkgver} [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-libwrap make } @@ -30,13 +29,9 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # Config files mkdir -p ${pkgdir}/etc/conf.d cp example/{socks,sockd}.conf ${pkgdir}/etc - # License install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - # rc-script - install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service } diff --git a/community/dante/sockd.rc b/community/dante/sockd.rc deleted file mode 100644 index 00ea5a7d4..000000000 --- a/community/dante/sockd.rc +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -daemon_name=sockd - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sockd.conf - -get_pid() { - cat /var/run/sockd.pid 2>/dev/null -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name $SOCKD_OPTS 1>/dev/null 2>/dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/dante/sockd.service b/community/dante/sockd.service index a2a964304..68201577a 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf -PIDFile=/var/run/sockd.pid -ExecStart=/usr/sbin/sockd $SOCKD_OPTS +PIDFile=/run/sockd.pid +ExecStart=/usr/bin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target |