Sat May 18 02:12:59 PDT 2013

3 files changed, 6 insertions, 45 deletions

diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index 241d2d0bd..e0720cdaa 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $
+# $Id: PKGBUILD 185723 2013-05-17 17:27:12Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openslp
 pkgver=1.2.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Open-source implementation of Service Location Protocol"
 arch=('i686' 'x86_64')
 url="http://www.openslp.org"
@@ -11,16 +11,16 @@ license=('BSD')
 depends=('bash' 'openssl')
 backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
         openslp.service)
 md5sums=('ff9999d1b44017281dd00ed2c4d32330'
-         '4f6889a5944894b8be2c01404a9566d2'
-         '296dc3c8f75e7a1823fcb9dd97ea0971')
+         '90eea4426492287ebfc01b2056a3ef9d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
     --disable-static \
     --enable-slpv1 \
     --enable-slpv2-security # service would fail to start without this
@@ -31,6 +31,5 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install
   install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd
   install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service
 }
diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service
index e17eb3b1d..a3c306aa2 100644
--- a/extra/openslp/openslp.service
+++ b/extra/openslp/openslp.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
+ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/openslp/rc.slpd b/extra/openslp/rc.slpd
deleted file mode 100755
index 4330c3760..000000000
--- a/extra/openslp/rc.slpd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/slpd`
-case "$1" in
-  start)
-    stat_busy "Starting SLPD"
-    [ -z "$PID" ] && /usr/sbin/slpd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/slpd.pid
-      add_daemon slpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping SLPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/slpd.pid
-      rm_daemon slpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0