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

[Sébastien Luttringer]

    Date: Monday, August 25, 2014 @ 15:57:44
  Author: seblu
Revision: 117872

upgpkg: ndisc6 1.0.2-8

- fix FS#39813

Added:
  ndisc6/trunk/rdnssd at .service
    (from rev 117867, ndisc6/trunk/rdnssd.service)
  ndisc6/trunk/resolvconf-hook
Modified:
  ndisc6/trunk/PKGBUILD
  ndisc6/trunk/ndisc6.install
Deleted:
  ndisc6/trunk/rdnssd.service

-----------------+
 PKGBUILD        |   24 +++++++++++++++++-------
 ndisc6.install  |   13 ++++++++++++-
 rdnssd.service  |   12 ------------
 rdnssd at .service |   10 ++++++++++
 resolvconf-hook |    5 +++++
 5 files changed, 44 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-25 13:09:30 UTC (rev 117871)
+++ PKGBUILD	2014-08-25 13:57:44 UTC (rev 117872)
@@ -5,19 +5,21 @@
 
 pkgname=ndisc6
 pkgver=1.0.2
-pkgrel=7
+pkgrel=8
 pkgdesc='Collection of IPv6 networking utilities'
 arch=('i686' 'x86_64')
 url='http://www.remlab.net/ndisc6/'
 license=('GPL')
 depends=('glibc' 'perl')
-makedepends=('glibc' 'gcc')
-options=(!emptydirs)
+makedepends=('glibc' 'gcc' 'systemd')
+options=('!emptydirs')
 install=$pkgname.install
 source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2"
-	      'rdnssd.service')
+	      'rdnssd at .service'
+        'resolvconf-hook')
 md5sums=('50cb4c19606cf6ff2b7388e71832f579'
-         '88a290cbcf51ac5e10ed5f995a8ba4b9')
+         '58b44cbe6d38082fb299eb136754bf31'
+         '48d0a77ed9536cd0d4642e1f1ca0b255')
 
 prepare() {
   # patch invalid path
@@ -36,11 +38,19 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  pushd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir/rdnssd.service" "$pkgdir/usr/lib/systemd/system/rdnssd.service"
+  popd
+
+  # service
+  install -Dm644 "$srcdir/rdnssd at .service" "$pkgdir/usr/lib/systemd/system/rdnssd at .service"
+
+  # tmpfiles
   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"
+
+  # resolvconf merge hook
+  install -Dm755 "$srcdir/resolvconf-hook" "$pkgdir/etc/rdnssd/resolvconf-hook"
 }
 
 # vim:set ts=2 sw=2 et:

Modified: ndisc6.install
===================================================================
--- ndisc6.install	2014-08-25 13:09:30 UTC (rev 117871)
+++ ndisc6.install	2014-08-25 13:57:44 UTC (rev 117872)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # arg 1:  the new package version
 post_install() {
@@ -5,4 +5,15 @@
   systemd-tmpfiles --create ndisc6.conf
 }
 
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( "$(vercmp $2 1.0.2-7)" <= 0 )); then
+    cat << EOF
+===> rdnssd.service has been replaced by rdnssd at .service. Update your setup.
+===> hint: systemctl enable rdnssd at merge-hook.service
+EOF
+  fi
+}
+
 # vim:set ts=2 sw=2 ft=sh et:

Deleted: rdnssd.service
===================================================================
--- rdnssd.service	2014-08-25 13:09:30 UTC (rev 117871)
+++ rdnssd.service	2014-08-25 13:57:44 UTC (rev 117872)
@@ -1,12 +0,0 @@
-[Unit]
-Description=RDNSS daemon for Linux
-Before=network.target
-Requires=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/rdnssd.pid
-ExecStart=/usr/bin/rdnssd -H /etc/rdnssd/merge-hook
-
-[Install]
-WantedBy=multi-user.target

Copied: ndisc6/trunk/rdnssd at .service (from rev 117867, ndisc6/trunk/rdnssd.service)
===================================================================
--- rdnssd at .service	                        (rev 0)
+++ rdnssd at .service	2014-08-25 13:57:44 UTC (rev 117872)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RDNSS daemon for Linux
+Before=network.target
+Requires=network.target
+
+[Service]
+ExecStart=/usr/bin/rdnssd -f -H /etc/rdnssd/%i
+
+[Install]
+WantedBy=multi-user.target

Added: resolvconf-hook
===================================================================
--- resolvconf-hook	                        (rev 0)
+++ resolvconf-hook	2014-08-25 13:57:44 UTC (rev 117872)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [[ -f /run/rdnssd/resolv.conf ]]; then
+	/usr/bin/resolvconf -a rdnssd < /run/rdnssd/resolv.conf
+fi