Date: Tuesday, August 26, 2014 @ 10:53:41
Author: seblu
Revision: 117890
db-move: moved ndisc6 from [community-testing] to [community] (i686, x86_64)
Added:
ndisc6/repos/community-i686/PKGBUILD
(from rev 117889, ndisc6/repos/community-testing-i686/PKGBUILD)
ndisc6/repos/community-i686/ndisc6.install
(from rev 117889, ndisc6/repos/community-testing-i686/ndisc6.install)
ndisc6/repos/community-i686/rdnssd@.service
(from rev 117889, ndisc6/repos/community-testing-i686/rdnssd@.service)
ndisc6/repos/community-i686/resolvconf-hook
(from rev 117889, ndisc6/repos/community-testing-i686/resolvconf-hook)
ndisc6/repos/community-x86_64/PKGBUILD
(from rev 117889, ndisc6/repos/community-testing-x86_64/PKGBUILD)
ndisc6/repos/community-x86_64/ndisc6.install
(from rev 117889, ndisc6/repos/community-testing-x86_64/ndisc6.install)
ndisc6/repos/community-x86_64/rdnssd@.service
(from rev 117889, ndisc6/repos/community-testing-x86_64/rdnssd@.service)
ndisc6/repos/community-x86_64/resolvconf-hook
(from rev 117889, ndisc6/repos/community-testing-x86_64/resolvconf-hook)
Deleted:
ndisc6/repos/community-i686/PKGBUILD
ndisc6/repos/community-i686/ndisc6.install
ndisc6/repos/community-i686/rdnssd.service
ndisc6/repos/community-testing-i686/
ndisc6/repos/community-testing-x86_64/
ndisc6/repos/community-x86_64/PKGBUILD
ndisc6/repos/community-x86_64/ndisc6.install
ndisc6/repos/community-x86_64/rdnssd.service
----------------------------------+
/PKGBUILD | 112 +++++++++++++++++++++++++++++++++++++
/ndisc6.install | 38 ++++++++++++
community-i686/PKGBUILD | 46 ---------------
community-i686/ndisc6.install | 8 --
community-i686/rdnssd.service | 12 ---
community-i686/rdnssd@.service | 10 +++
community-i686/resolvconf-hook | 5 +
community-x86_64/PKGBUILD | 46 ---------------
community-x86_64/ndisc6.install | 8 --
community-x86_64/rdnssd.service | 12 ---
community-x86_64/rdnssd@.service | 10 +++
community-x86_64/resolvconf-hook | 5 +
12 files changed, 180 insertions(+), 132 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-26 08:50:51 UTC (rev 117889)
+++ community-i686/PKGBUILD 2014-08-26 08:53:41 UTC (rev 117890)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Chris Brannon <ch...@the-brannons.com>
-# Contributor: Mark Smith <markzzzsm...@yahoo.com.au>
-
-pkgname=ndisc6
-pkgver=1.0.2
-pkgrel=7
-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)
-install=$pkgname.install
-source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2";
- 'rdnssd.service')
-md5sums=('50cb4c19606cf6ff2b7388e71832f579'
- '88a290cbcf51ac5e10ed5f995a8ba4b9')
-
-prepare() {
- # patch invalid path
- sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \
- $pkgname-$pkgver/rdnssd/merge-hook.in
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- 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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ndisc6/repos/community-i686/PKGBUILD (from rev 117889,
ndisc6/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-26 08:53:41 UTC (rev 117890)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Chris Brannon <ch...@the-brannons.com>
+# Contributor: Mark Smith <markzzzsm...@yahoo.com.au>
+
+pkgname=ndisc6
+pkgver=1.0.2
+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' 'systemd')
+options=('!emptydirs')
+install=$pkgname.install
+source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2";
+ 'rdnssd@.service'
+ 'resolvconf-hook')
+md5sums=('50cb4c19606cf6ff2b7388e71832f579'
+ '58b44cbe6d38082fb299eb136754bf31'
+ '48d0a77ed9536cd0d4642e1f1ca0b255')
+
+prepare() {
+ # patch invalid path
+ sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \
+ $pkgname-$pkgver/rdnssd/merge-hook.in
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --sysconfdir=/etc
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ popd
+
+ # service
+ install -Dm644 "$srcdir/rdnssd@.service"
"$pkgdir/usr/lib/systemd/system/rdnssd@.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:
Deleted: community-i686/ndisc6.install
===================================================================
--- community-i686/ndisc6.install 2014-08-26 08:50:51 UTC (rev 117889)
+++ community-i686/ndisc6.install 2014-08-26 08:53:41 UTC (rev 117890)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# arg 1: the new package version
-post_install() {
- systemd-tmpfiles --create ndisc6.conf
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: ndisc6/repos/community-i686/ndisc6.install (from rev 117889,
ndisc6/repos/community-testing-i686/ndisc6.install)
===================================================================
--- community-i686/ndisc6.install (rev 0)
+++ community-i686/ndisc6.install 2014-08-26 08:53:41 UTC (rev 117890)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# arg 1: the new package version
+post_install() {
+ 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@.service. Update your setup.
+===> hint: systemctl enable rdnssd@merge-hook.service
+EOF
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-i686/rdnssd.service
===================================================================
--- community-i686/rdnssd.service 2014-08-26 08:50:51 UTC (rev 117889)
+++ community-i686/rdnssd.service 2014-08-26 08:53:41 UTC (rev 117890)
@@ -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/repos/community-i686/rdnssd@.service (from rev 117889,
ndisc6/repos/community-testing-i686/rdnssd@.service)
===================================================================
--- community-i686/rdnssd@.service (rev 0)
+++ community-i686/rdnssd@.service 2014-08-26 08:53:41 UTC (rev 117890)
@@ -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
Copied: ndisc6/repos/community-i686/resolvconf-hook (from rev 117889,
ndisc6/repos/community-testing-i686/resolvconf-hook)
===================================================================
--- community-i686/resolvconf-hook (rev 0)
+++ community-i686/resolvconf-hook 2014-08-26 08:53:41 UTC (rev 117890)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [[ -f /run/rdnssd/resolv.conf ]]; then
+ /usr/bin/resolvconf -a rdnssd < /run/rdnssd/resolv.conf
+fi
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-26 08:50:51 UTC (rev 117889)
+++ community-x86_64/PKGBUILD 2014-08-26 08:53:41 UTC (rev 117890)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-# Contributor: Chris Brannon <ch...@the-brannons.com>
-# Contributor: Mark Smith <markzzzsm...@yahoo.com.au>
-
-pkgname=ndisc6
-pkgver=1.0.2
-pkgrel=7
-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)
-install=$pkgname.install
-source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2";
- 'rdnssd.service')
-md5sums=('50cb4c19606cf6ff2b7388e71832f579'
- '88a290cbcf51ac5e10ed5f995a8ba4b9')
-
-prepare() {
- # patch invalid path
- sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \
- $pkgname-$pkgver/rdnssd/merge-hook.in
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --sysconfdir=/etc
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- 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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ndisc6/repos/community-x86_64/PKGBUILD (from rev 117889,
ndisc6/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-26 08:53:41 UTC (rev 117890)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Chris Brannon <ch...@the-brannons.com>
+# Contributor: Mark Smith <markzzzsm...@yahoo.com.au>
+
+pkgname=ndisc6
+pkgver=1.0.2
+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' 'systemd')
+options=('!emptydirs')
+install=$pkgname.install
+source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2";
+ 'rdnssd@.service'
+ 'resolvconf-hook')
+md5sums=('50cb4c19606cf6ff2b7388e71832f579'
+ '58b44cbe6d38082fb299eb136754bf31'
+ '48d0a77ed9536cd0d4642e1f1ca0b255')
+
+prepare() {
+ # patch invalid path
+ sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \
+ $pkgname-$pkgver/rdnssd/merge-hook.in
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --sysconfdir=/etc
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ popd
+
+ # service
+ install -Dm644 "$srcdir/rdnssd@.service"
"$pkgdir/usr/lib/systemd/system/rdnssd@.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:
Deleted: community-x86_64/ndisc6.install
===================================================================
--- community-x86_64/ndisc6.install 2014-08-26 08:50:51 UTC (rev 117889)
+++ community-x86_64/ndisc6.install 2014-08-26 08:53:41 UTC (rev 117890)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# arg 1: the new package version
-post_install() {
- systemd-tmpfiles --create ndisc6.conf
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: ndisc6/repos/community-x86_64/ndisc6.install (from rev 117889,
ndisc6/repos/community-testing-x86_64/ndisc6.install)
===================================================================
--- community-x86_64/ndisc6.install (rev 0)
+++ community-x86_64/ndisc6.install 2014-08-26 08:53:41 UTC (rev 117890)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# arg 1: the new package version
+post_install() {
+ 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@.service. Update your setup.
+===> hint: systemctl enable rdnssd@merge-hook.service
+EOF
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-x86_64/rdnssd.service
===================================================================
--- community-x86_64/rdnssd.service 2014-08-26 08:50:51 UTC (rev 117889)
+++ community-x86_64/rdnssd.service 2014-08-26 08:53:41 UTC (rev 117890)
@@ -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/repos/community-x86_64/rdnssd@.service (from rev 117889,
ndisc6/repos/community-testing-x86_64/rdnssd@.service)
===================================================================
--- community-x86_64/rdnssd@.service (rev 0)
+++ community-x86_64/rdnssd@.service 2014-08-26 08:53:41 UTC (rev 117890)
@@ -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
Copied: ndisc6/repos/community-x86_64/resolvconf-hook (from rev 117889,
ndisc6/repos/community-testing-x86_64/resolvconf-hook)
===================================================================
--- community-x86_64/resolvconf-hook (rev 0)
+++ community-x86_64/resolvconf-hook 2014-08-26 08:53:41 UTC (rev 117890)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [[ -f /run/rdnssd/resolv.conf ]]; then
+ /usr/bin/resolvconf -a rdnssd < /run/rdnssd/resolv.conf
+fi
