pcr/olsrd: updated to 0.9.6.2

4 files changed, 43 insertions, 82 deletions

diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD
index a65adf9ac..c0ac8170e 100644
--- a/pcr/olsrd/PKGBUILD
+++ b/pcr/olsrd/PKGBUILD
@@ -1,31 +1,37 @@
-# Contributor (Arch): William Rea <sillywilly@gmail.com>
-# Maintainer (Arch): Claudio Pisa <clauz@ninux.org>
-pkgname=olsrd
-pkgver=0.6.1
-pkgrel=2
-pkgdesc="OLSR routing daemon (RFC 3626)"
-arch=(i686 x86_64)
-url="http://www.olsr.org"
-license=('BSD')
-depends=('glibc')
-makedepends=('bison')
-backup=(etc/olsrd.conf)
-install=olsrd.install
-source=(http://www.olsr.org/releases/0.6/${pkgname}-${pkgver}.tar.bz2 rc.d.olsrd)
-md5sums=('a75fc9b6252df5b5f49f13418fafeff1' 'bc3e393e0179ffff0a6d6c9d6a5c4b60')
+# Maintainer (AUR): Nimrod Maclomair <nimrod4garoa at gmail dot com>
+
+# parabola changes and rationale:
+#  - renamed tarball to avoid collisions
+#  - corrected license
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
+pkgname=olsrd
+pkgrel=1
+pkgver=0.9.6.2
+pkgdesc='The olsr.org implementation of the Optimized Link State Routing Protocol.'
+arch=('i686' 'x86_64' 'armv7h')
+url='http://www.olsr.org/mediawiki/index.php/Olsrd'
+license=('BSD3')
+depends=()
+optdepends=('gpsd')
+makedepends=('bison' 'flex' 'gpsd')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OLSR/olsrd/archive/v0.9.6.2.tar.gz"
+		'olsrd.service')
+sha256sums=('e1e2c1eb4f05fa737bc96fe49c9596984d4059f5209a7149f0a23ac54b99934e'
+            '321f2e0d30af597a38442eb8f039757767efc5da88205b85cf96819384c94ac7')
 
-  CFLAGS+=" -fPIC " \
-  make OS=linux build_all
+build(){
+	cd $pkgname-$pkgver
+	make prefix=/usr libdir=/usr/lib/olsrd sbindir=/usr/bin DESTDIR=${pkgdir} build_all
 }
 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install_all
+package(){
+	
+	cd $pkgname-$pkgver
+	make prefix=/usr libdir=/usr/lib/olsrd sbindir=/usr/bin DESTDIR=${pkgdir} install_all
 
-  install -D -m755 $srcdir/rc.d.olsrd $pkgdir/etc/rc.d/olsrd
-  install -D -m644 license.txt $pkgdir/usr/share/licenses/olsrd/LICENSE
+	mkdir --parents $pkgdir/usr/share/licenses/${pkgname}
+	mkdir --parents $pkgdir/usr/lib/systemd/system
+	
+	cp license.txt $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+	cp ../olsrd.service $pkgdir/usr/lib/systemd/system/.
 }
-
diff --git a/pcr/olsrd/olsrd.install b/pcr/olsrd/olsrd.install
deleted file mode 100755
index f49372538..000000000
--- a/pcr/olsrd/olsrd.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-echo "--------------------------------------------------------------------"
-echo " Remember to edit /etc/olsrd.conf to match your network settings."
-echo "--------------------------------------------------------------------"
-/bin/true
-}
-
-post_upgrade() {
-/bin/true
-}
-
-pre_remove() {
-/etc/rc.d/olsrd stop
-/bin/true
-}
-
-op=$1
-shift
-
-$op "$@"
-
diff --git a/pcr/olsrd/olsrd.service b/pcr/olsrd/olsrd.service
new file mode 100644
index 000000000..ee053e3e4
--- /dev/null
+++ b/pcr/olsrd/olsrd.service
@@ -0,0 +1,12 @@
+# service file for olsrd.
+[Unit]
+Description=Optimized Link State Routing Daemon 
+Requires=network.target
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/olsrd -f /etc/olsrd/olsrd.conf 
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/olsrd/rc.d.olsrd b/pcr/olsrd/rc.d.olsrd
deleted file mode 100755
index d257e22ef..000000000
--- a/pcr/olsrd/rc.d.olsrd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/olsrd`
-case "$1" in
-  start)
-    stat_busy "Starting OLSR Daemon"
-    [ -z "$PID" ] && /usr/sbin/olsrd -d 0 &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon olsrd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OLSR Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon olsrd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-