[arch-commits] Commit in ndisc6/trunk (4 files)

[seblu at nymeria.archlinux.org]

    Date: Thursday, January 24, 2013 @ 14:12:34
  Author: seblu
Revision: 82790

Clean package / remove rc scripts

Modified:
  ndisc6/trunk/PKGBUILD
  ndisc6/trunk/ndisc6.install
Deleted:
  ndisc6/trunk/rdnssd.confd
  ndisc6/trunk/rdnssd.rc.d

----------------+
 PKGBUILD       |   36 +++++++++++++++---------------------
 ndisc6.install |    5 +++++
 rdnssd.confd   |    8 --------
 rdnssd.rc.d    |   51 ---------------------------------------------------
 4 files changed, 20 insertions(+), 80 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-24 13:11:32 UTC (rev 82789)
+++ PKGBUILD	2013-01-24 13:12:34 UTC (rev 82790)
@@ -1,42 +1,36 @@
 # $Id$
-# Maintainer: Chris Brannon <chris at the-brannons.com>
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Chris Brannon <chris at the-brannons.com>
 # Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
+
 pkgname=ndisc6
 pkgver=1.0.2
 pkgrel=4
-pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6"
+pkgdesc='Collection of IPv6 networking utilities'
 arch=('i686' 'x86_64')
-url="http://www.remlab.net/ndisc6/"
-license=("GPL")
+url='http://www.remlab.net/ndisc6/'
+license=('GPL')
 depends=('glibc' 'perl')
 makedepends=('glibc' 'gcc')
 options=(!emptydirs)
 install=ndisc6.install
-source=(http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2
-        rdnssd.rc.d
-	rdnssd.confd
-	rdnssd.service)
+source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2"
+	      'rdnssd.service')
 md5sums=('50cb4c19606cf6ff2b7388e71832f579'
-         '3421fd731c4da4f9e07fc6b6ff4e5084'
-         'f1910902932e2622fc166960819db6c4'
          'beeb4f033e9eb951e2de962f609c7c2a')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/rdnssd.rc.d" "$pkgdir/etc/rc.d/rdnssd"
-  install -Dm644 "$srcdir/rdnssd.confd" "$pkgdir/etc/conf.d/rdnssd"
-  install -Dm644 "$srcdir/rdnssd.service" \
-    "$pkgdir/usr/lib/systemd/system/rdnssd.service"
+  install -Dm644 "$srcdir/rdnssd.service" "$pkgdir/usr/lib/systemd/system/rdnssd.service"
+  install -Dm644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  echo 'd /run/rdnssd 0755 nobody root' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
 
-  install -d "$pkgdir/usr/lib/tmpfiles.d"
-  echo "d /run/rdnssd 0755 nobody root" > "$pkgdir/usr/lib/tmpfiles.d/ndisc6.conf"
-}
+# vim:set ts=2 sw=2 et:

Modified: ndisc6.install
===================================================================
--- ndisc6.install	2013-01-24 13:11:32 UTC (rev 82789)
+++ ndisc6.install	2013-01-24 13:12:34 UTC (rev 82790)
@@ -1,3 +1,8 @@
+#!/bin/sh
+
+# arg 1:  the new package version
 post_install() {
   systemd-tmpfiles --create usr/lib/tmpfiles.d/ndisc6.conf
 }
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: rdnssd.confd
===================================================================
--- rdnssd.confd	2013-01-24 13:11:32 UTC (rev 82789)
+++ rdnssd.confd	2013-01-24 13:12:34 UTC (rev 82790)
@@ -1,8 +0,0 @@
-
-# This default merge hook adds IPv6 DNS resolvers
-# before the existing IPv4 ones in /etc/resolv.conf.
-MERGEHOOK="/etc/rdnssd/merge-hook"
-
-# User who runs rdnssd.
-RUN_AS="nobody"
-

Deleted: rdnssd.rc.d
===================================================================
--- rdnssd.rc.d	2013-01-24 13:11:32 UTC (rev 82789)
+++ rdnssd.rc.d	2013-01-24 13:12:34 UTC (rev 82790)
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rdnssd
-
-PIDFILE="/var/run/rdnssd.pid"
-PID=`cat "$PIDFILE" 2>/dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting RDNSS Daemon"
-    if [ ! -z "$PID" -a -e "/proc/$PID" ]; then
-      stat_append "-- Already running"
-      stat_die
-    else
-      /usr/sbin/rdnssd -p "$PIDFILE"    \
-        ${MERGEHOOK/*/-H}  "$MERGEHOOK" \
-        ${RUN_AS/*/-u}     "$RUN_AS"
-
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon rdnssd
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RDNSS Daemon"
-    if [ -z "$PID" ]; then
-      stat_append "-- Not running"
-      stat_die
-    else
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon sshd
-        stat_done
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0