openslp: recompile for bin changes

refs #961

3 files changed, 24 insertions, 45 deletions

diff --git a/abs/extra/openslp/PKGBUILD b/abs/extra/openslp/PKGBUILD
index 70e0833..d1008b8 100644
--- a/abs/extra/openslp/PKGBUILD
+++ b/abs/extra/openslp/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 150461 2012-02-18 00:02:24Z allan $
+# $Id: PKGBUILD 198356 2013-10-30 14:22:17Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openslp
 pkgver=1.2.1
-pkgrel=4
+pkgrel=7
 pkgdesc="Open-source implementation of Service Location Protocol"
 arch=('i686' 'x86_64')
 url="http://www.openslp.org"
 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)
-md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
+        openslp.service)
+md5sums=('ff9999d1b44017281dd00ed2c4d32330'
+         '90eea4426492287ebfc01b2056a3ef9d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --disable-static \
+    --enable-slpv1 \
+    --enable-slpv2-security # service would fail to start without this
   make
 }
 
@@ -24,5 +30,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/abs/extra/openslp/openslp.service b/abs/extra/openslp/openslp.service
new file mode 100644
index 0000000..a3c306a
--- /dev/null
+++ b/abs/extra/openslp/openslp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Service Location Protocol
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/abs/extra/openslp/rc.slpd b/abs/extra/openslp/rc.slpd
deleted file mode 100755
index 4330c37..0000000
--- a/abs/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