[arch-commits] Commit in quagga/repos (42 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Sat Apr 6 13:02:55 UTC 2013
Date: Saturday, April 6, 2013 @ 15:02:55
Author: seblu
Revision: 87783
archrelease: copy trunk to community-i686, community-x86_64
Added:
quagga/repos/community-i686/0001-doc-fix-makeinfo-errors-and-one-warning.patch
(from rev 87782, quagga/trunk/0001-doc-fix-makeinfo-errors-and-one-warning.patch)
quagga/repos/community-i686/PKGBUILD
(from rev 87782, quagga/trunk/PKGBUILD)
quagga/repos/community-i686/babeld.service
(from rev 87782, quagga/trunk/babeld.service)
quagga/repos/community-i686/bgpd.service
(from rev 87782, quagga/trunk/bgpd.service)
quagga/repos/community-i686/isisd.service
(from rev 87782, quagga/trunk/isisd.service)
quagga/repos/community-i686/ospf6d.service
(from rev 87782, quagga/trunk/ospf6d.service)
quagga/repos/community-i686/ospfd.service
(from rev 87782, quagga/trunk/ospfd.service)
quagga/repos/community-i686/quagga.install
(from rev 87782, quagga/trunk/quagga.install)
quagga/repos/community-i686/ripd.service
(from rev 87782, quagga/trunk/ripd.service)
quagga/repos/community-i686/ripngd.service
(from rev 87782, quagga/trunk/ripngd.service)
quagga/repos/community-i686/zebra.service
(from rev 87782, quagga/trunk/zebra.service)
quagga/repos/community-x86_64/0001-doc-fix-makeinfo-errors-and-one-warning.patch
(from rev 87782, quagga/trunk/0001-doc-fix-makeinfo-errors-and-one-warning.patch)
quagga/repos/community-x86_64/PKGBUILD
(from rev 87782, quagga/trunk/PKGBUILD)
quagga/repos/community-x86_64/babeld.service
(from rev 87782, quagga/trunk/babeld.service)
quagga/repos/community-x86_64/bgpd.service
(from rev 87782, quagga/trunk/bgpd.service)
quagga/repos/community-x86_64/isisd.service
(from rev 87782, quagga/trunk/isisd.service)
quagga/repos/community-x86_64/ospf6d.service
(from rev 87782, quagga/trunk/ospf6d.service)
quagga/repos/community-x86_64/ospfd.service
(from rev 87782, quagga/trunk/ospfd.service)
quagga/repos/community-x86_64/quagga.install
(from rev 87782, quagga/trunk/quagga.install)
quagga/repos/community-x86_64/ripd.service
(from rev 87782, quagga/trunk/ripd.service)
quagga/repos/community-x86_64/ripngd.service
(from rev 87782, quagga/trunk/ripngd.service)
quagga/repos/community-x86_64/zebra.service
(from rev 87782, quagga/trunk/zebra.service)
Deleted:
quagga/repos/community-i686/PKGBUILD
quagga/repos/community-i686/babeld.service
quagga/repos/community-i686/bgpd.service
quagga/repos/community-i686/isisd.service
quagga/repos/community-i686/ospf6d.service
quagga/repos/community-i686/ospfd.service
quagga/repos/community-i686/quagga.install
quagga/repos/community-i686/ripd.service
quagga/repos/community-i686/ripngd.service
quagga/repos/community-i686/zebra.service
quagga/repos/community-x86_64/PKGBUILD
quagga/repos/community-x86_64/babeld.service
quagga/repos/community-x86_64/bgpd.service
quagga/repos/community-x86_64/isisd.service
quagga/repos/community-x86_64/ospf6d.service
quagga/repos/community-x86_64/ospfd.service
quagga/repos/community-x86_64/quagga.install
quagga/repos/community-x86_64/ripd.service
quagga/repos/community-x86_64/ripngd.service
quagga/repos/community-x86_64/zebra.service
---------------------------------------------------------------------+
/PKGBUILD | 170 ++++++++++
/babeld.service | 32 +
/bgpd.service | 32 +
/isisd.service | 32 +
/ospf6d.service | 32 +
/ospfd.service | 32 +
/quagga.install | 72 ++++
/ripd.service | 32 +
/ripngd.service | 32 +
/zebra.service | 32 +
community-i686/0001-doc-fix-makeinfo-errors-and-one-warning.patch | 57 +++
community-i686/PKGBUILD | 80 ----
community-i686/babeld.service | 12
community-i686/bgpd.service | 12
community-i686/isisd.service | 12
community-i686/ospf6d.service | 12
community-i686/ospfd.service | 12
community-i686/quagga.install | 36 --
community-i686/ripd.service | 12
community-i686/ripngd.service | 12
community-i686/zebra.service | 12
community-x86_64/0001-doc-fix-makeinfo-errors-and-one-warning.patch | 57 +++
community-x86_64/PKGBUILD | 80 ----
community-x86_64/babeld.service | 12
community-x86_64/bgpd.service | 12
community-x86_64/isisd.service | 12
community-x86_64/ospf6d.service | 12
community-x86_64/ospfd.service | 12
community-x86_64/quagga.install | 36 --
community-x86_64/ripd.service | 12
community-x86_64/ripngd.service | 12
community-x86_64/zebra.service | 12
32 files changed, 612 insertions(+), 424 deletions(-)
Copied: quagga/repos/community-i686/0001-doc-fix-makeinfo-errors-and-one-warning.patch (from rev 87782, quagga/trunk/0001-doc-fix-makeinfo-errors-and-one-warning.patch)
===================================================================
--- community-i686/0001-doc-fix-makeinfo-errors-and-one-warning.patch (rev 0)
+++ community-i686/0001-doc-fix-makeinfo-errors-and-one-warning.patch 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,57 @@
+From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras at iki.fi>
+Date: Fri, 22 Mar 2013 11:54:44 +0200
+Subject: [PATCH] doc: fix makeinfo errors and one warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 4afa50b added few lines that are syntactically incorrect
+with leading plus sign.
+
+Cc: Denis Ovsienko <infrastation at yandex.ru>
+Signed-off-by: Timo Teräs <timo.teras at iki.fi>
+---
+ doc/ipv6.texi | 4 ++--
+ doc/quagga.texi | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/ipv6.texi b/doc/ipv6.texi
+index b6cc437..2482c1c 100644
+--- a/doc/ipv6.texi
++++ b/doc/ipv6.texi
+@@ -136,8 +136,8 @@ for the lowest preference possible.
+ Default: 0
+ @end deffn
+
+-+ at deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
+-+ at deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
++ at deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
++ at deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
+ The value to be placed in Home Agent Option, when Home Agent config flag is set,
+ which indicates to hosts Home Agent Lifetime. The default value of 0 means to
+ place the current Router Lifetime value.
+diff --git a/doc/quagga.texi b/doc/quagga.texi
+index ff913aa..b4105ac 100644
+--- a/doc/quagga.texi
++++ b/doc/quagga.texi
+@@ -1,13 +1,13 @@
+ \input texinfo @c -*- texinfo -*-
++ at c Set variables - sourced from defines.texi
++ at include defines.texi
++
+ @c %**start of header
+ @setchapternewpage odd
+ @settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
+ @setfilename quagga.info
+ @c %**end of header
+
+- at c Set variables - sourced from defines.texi
+- at include defines.texi
+-
+ @c automake will automatically generate version.texi
+ @c and set EDITION, VERSION, UPDATED and UPDATED-MONTH
+ @include version.texi
+--
+1.8.2
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/PKGBUILD 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=quagga
-pkgver=0.99.22
-pkgrel=2
-pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
-arch=('i686' 'x86_64')
-url='http://www.quagga.net'
-license=('GPL2')
-depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
-options=('!libtool' '!buildflags')
-install=quagga.install
-source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
- 'babeld.service'
- 'bgpd.service'
- 'isisd.service'
- 'ospf6d.service'
- 'ospfd.service'
- 'ripd.service'
- 'ripngd.service'
- 'zebra.service')
-md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
- '45d8bf56a426b0e7ebe429547be8a27a'
- 'ab31ed8dafd7a92137f4f00ad0937b4f'
- '4c05d0105cd0db23a2583bd75a1bde4d'
- 'd087dce5eeba78ac64541157c7e04dfd'
- 'c5f8a729685cebf8fc5b1a1552d37b6d'
- 'e721b334bb0b31983642b307033c63d0'
- 'effeb26ff78ffcafe7808596ddc5d3fc'
- 'f0c0b99346b2c373a74158e45f04cf91')
-
-build() {
- cd $pkgname-$pkgver
- shopt -s nullglob
- for _p in "$srcdir"/*.patch; do
- msg2 "Applying ${_p##*/}"
- patch -p 1 -i "$_p"
- done
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc/quagga \
- --localstatedir=/run/quagga \
- --enable-exampledir=/usr/share/doc/quagga/examples \
- --enable-vtysh \
- --enable-isisd \
- --enable-isis-topology \
- --enable-netlink \
- --enable-snmp \
- --enable-tcp-zebra \
- --enable-irdp \
- --enable-pcreposix \
- --enable-multipath=64 \
- --enable-user=quagga \
- --enable-group=quagga \
- --enable-configfile-mask=0640 \
- --enable-logfile-mask=0640
- make
-}
-
-package() {
- # upstream install
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- # logrotate stuff
- install -D -m 644 redhat/$pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
- sed -ri 's,/var/run/quagga,/run/quagga,g' "$pkgdir/etc/logrotate.d/$pkgname"
-
- # systemd
- cd "$srcdir"
- for _d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do
- install -D -m 644 $_d.service "$pkgdir/usr/lib/systemd/system/$_d.service"
- done
- install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
- echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
-}
-
-# vim:set ts=2 sw=2 et:
Copied: quagga/repos/community-i686/PKGBUILD (from rev 87782, quagga/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=quagga
+pkgver=0.99.22
+pkgrel=3
+pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
+arch=('i686' 'x86_64')
+url='http://www.quagga.net'
+license=('GPL2')
+depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
+options=('!libtool' '!buildflags')
+install=quagga.install
+source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'babeld.service'
+ 'bgpd.service'
+ 'isisd.service'
+ 'ospf6d.service'
+ 'ospfd.service'
+ 'ripd.service'
+ 'ripngd.service'
+ 'zebra.service'
+ '0001-doc-fix-makeinfo-errors-and-one-warning.patch')
+md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
+ '87bf4ae8aca3b3cf70e3986bc669aa78'
+ '9b14110bed4982baa801808db6ac9135'
+ 'b685b5c12637cb963e1fb78ecd926e14'
+ '1fee8cdf03f87b9bb129948058246c88'
+ '4d95a4af1ddb4ae21b867bebbedc77d5'
+ '7e33c2a2e1c12309ba28d75a34294ed0'
+ '6c682c0cd06c109bc10d29c1d9af3e38'
+ '18964536b7ed012aa5b22f2fa9fb3e87'
+ '214ed8ae0d58d080dcba9a176a94eb51')
+
+prepare() {
+ cd $pkgname-$pkgver
+ shopt -s nullglob
+ for _p in "$srcdir"/*.patch; do
+ msg2 "Applying ${_p##*/}"
+ patch -p 1 -i "$_p"
+ done
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/quagga \
+ --localstatedir=/run/quagga \
+ --enable-exampledir=/usr/share/doc/quagga/examples \
+ --enable-vtysh \
+ --enable-isisd \
+ --enable-isis-topology \
+ --enable-netlink \
+ --enable-snmp \
+ --enable-tcp-zebra \
+ --enable-irdp \
+ --enable-pcreposix \
+ --enable-multipath=64 \
+ --enable-user=quagga \
+ --enable-group=quagga \
+ --enable-configfile-mask=0640 \
+ --enable-logfile-mask=0640
+ make
+}
+
+package() {
+ # upstream install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # logrotate stuff
+ install -D -m 644 redhat/$pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+ sed -ri 's,/var/run/quagga,/run/quagga,g' "$pkgdir/etc/logrotate.d/$pkgname"
+
+ # systemd
+ cd "$srcdir"
+ for _d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do
+ install -D -m 644 $_d.service "$pkgdir/usr/lib/systemd/system/$_d.service"
+ done
+ install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+ echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/babeld.service
===================================================================
--- community-i686/babeld.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/babeld.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Babel routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/babeld.conf
-
-[Service]
-ExecStart=/usr/sbin/babeld
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/babeld.service (from rev 87782, quagga/trunk/babeld.service)
===================================================================
--- community-i686/babeld.service (rev 0)
+++ community-i686/babeld.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Babel routing daemon
+Documentation=man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/babeld.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/babeld.pid
+ExecStart=/usr/sbin/babeld -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/bgpd.service
===================================================================
--- community-i686/bgpd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/bgpd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=BGP routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/bgpd.conf
-
-[Service]
-ExecStart=/usr/sbin/bgpd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/bgpd.service (from rev 87782, quagga/trunk/bgpd.service)
===================================================================
--- community-i686/bgpd.service (rev 0)
+++ community-i686/bgpd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=BGP routing daemon
+Documentation=man:bgpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/bgpd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/bgpd.pid
+ExecStart=/usr/sbin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/isisd.service
===================================================================
--- community-i686/isisd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/isisd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=IS-IS routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/isisd.conf
-
-[Service]
-ExecStart=/usr/sbin/isisd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/isisd.service (from rev 87782, quagga/trunk/isisd.service)
===================================================================
--- community-i686/isisd.service (rev 0)
+++ community-i686/isisd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=IS-IS routing daemon
+Documentation=man:isis(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/isisd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/isisd.pid
+ExecStart=/usr/sbin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/ospf6d.service
===================================================================
--- community-i686/ospf6d.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/ospf6d.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=OSPF routing daemon for IPv6
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospf6d.conf
-
-[Service]
-ExecStart=/usr/sbin/ospf6d
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/ospf6d.service (from rev 87782, quagga/trunk/ospf6d.service)
===================================================================
--- community-i686/ospf6d.service (rev 0)
+++ community-i686/ospf6d.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospf6d.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ospf6d.pid
+ExecStart=/usr/sbin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/ospfd.service
===================================================================
--- community-i686/ospfd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/ospfd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=OSPF routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospfd.conf
-
-[Service]
-ExecStart=/usr/sbin/ospfd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/ospfd.service (from rev 87782, quagga/trunk/ospfd.service)
===================================================================
--- community-i686/ospfd.service (rev 0)
+++ community-i686/ospfd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSPF routing daemon
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospfd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ospfd.pid
+ExecStart=/usr/sbin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/quagga.install
===================================================================
--- community-i686/quagga.install 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/quagga.install 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,36 +0,0 @@
-infodir=/usr/share/info
-filelist=(quagga.info quagga.info-1 quagga.info-2)
-
-post_install() {
- groupadd -r quagga
- useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null
- install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga
- post_upgrade
-}
-
-post_upgrade() {
- if [[ -x /usr/bin/install-info ]]; then
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
- fi
-}
-
-pre_remove() {
- for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do
- /etc/rc.d/$d stop &>/dev/null
- done
- if [[ -x /usr/bin/install-info ]]; then
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
- fi
-}
-
-post_remove() {
- userdel quagga &>/dev/null
- groupdel quagga &>/dev/null
- rmdir /{etc,var/log}/quagga
-}
-
-# vim: ft=sh ts=2 sw=2 et:
Copied: quagga/repos/community-i686/quagga.install (from rev 87782, quagga/trunk/quagga.install)
===================================================================
--- community-i686/quagga.install (rev 0)
+++ community-i686/quagga.install 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,36 @@
+infodir=/usr/share/info
+filelist=(quagga.info quagga.info-1 quagga.info-2)
+
+post_install() {
+ groupadd -r quagga
+ useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null
+ install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga
+ post_upgrade
+}
+
+post_upgrade() {
+ if [[ -x /usr/bin/install-info ]]; then
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+ fi
+}
+
+pre_remove() {
+ for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do
+ /etc/rc.d/$d stop &>/dev/null
+ done
+ if [[ -x /usr/bin/install-info ]]; then
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+ fi
+}
+
+post_remove() {
+ userdel quagga &>/dev/null
+ groupdel quagga &>/dev/null
+ rmdir /{etc,var/log}/quagga
+}
+
+# vim: ft=sh ts=2 sw=2 et:
Deleted: community-i686/ripd.service
===================================================================
--- community-i686/ripd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/ripd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=RIP routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripd.conf
-
-[Service]
-ExecStart=/usr/sbin/ripd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/ripd.service (from rev 87782, quagga/trunk/ripd.service)
===================================================================
--- community-i686/ripd.service (rev 0)
+++ community-i686/ripd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=RIP routing daemon
+Documentation=man:ripd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ripd.pid
+ExecStart=/usr/sbin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/ripngd.service
===================================================================
--- community-i686/ripngd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/ripngd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=RIP routing daemon for IPv6
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripngd.conf
-
-[Service]
-ExecStart=/usr/sbin/ripngd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/ripngd.service (from rev 87782, quagga/trunk/ripngd.service)
===================================================================
--- community-i686/ripngd.service (rev 0)
+++ community-i686/ripngd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=RIP routing daemon for IPv6
+Documentation=man:ripngd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripngd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ripngd.pid
+ExecStart=/usr/sbin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/zebra.service
===================================================================
--- community-i686/zebra.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-i686/zebra.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=GNU Zebra routing manager
-After=network.target
-ConditionPathExists=/etc/quagga/zebra.conf
-
-[Service]
-ExecStartPre=/usr/sbin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-i686/zebra.service (from rev 87782, quagga/trunk/zebra.service)
===================================================================
--- community-i686/zebra.service (rev 0)
+++ community-i686/zebra.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
+After=network.target
+ConditionPathExists=/etc/quagga/zebra.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/zebra.pid
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/0001-doc-fix-makeinfo-errors-and-one-warning.patch (from rev 87782, quagga/trunk/0001-doc-fix-makeinfo-errors-and-one-warning.patch)
===================================================================
--- community-x86_64/0001-doc-fix-makeinfo-errors-and-one-warning.patch (rev 0)
+++ community-x86_64/0001-doc-fix-makeinfo-errors-and-one-warning.patch 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,57 @@
+From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras at iki.fi>
+Date: Fri, 22 Mar 2013 11:54:44 +0200
+Subject: [PATCH] doc: fix makeinfo errors and one warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 4afa50b added few lines that are syntactically incorrect
+with leading plus sign.
+
+Cc: Denis Ovsienko <infrastation at yandex.ru>
+Signed-off-by: Timo Teräs <timo.teras at iki.fi>
+---
+ doc/ipv6.texi | 4 ++--
+ doc/quagga.texi | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/ipv6.texi b/doc/ipv6.texi
+index b6cc437..2482c1c 100644
+--- a/doc/ipv6.texi
++++ b/doc/ipv6.texi
+@@ -136,8 +136,8 @@ for the lowest preference possible.
+ Default: 0
+ @end deffn
+
+-+ at deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
+-+ at deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
++ at deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
++ at deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
+ The value to be placed in Home Agent Option, when Home Agent config flag is set,
+ which indicates to hosts Home Agent Lifetime. The default value of 0 means to
+ place the current Router Lifetime value.
+diff --git a/doc/quagga.texi b/doc/quagga.texi
+index ff913aa..b4105ac 100644
+--- a/doc/quagga.texi
++++ b/doc/quagga.texi
+@@ -1,13 +1,13 @@
+ \input texinfo @c -*- texinfo -*-
++ at c Set variables - sourced from defines.texi
++ at include defines.texi
++
+ @c %**start of header
+ @setchapternewpage odd
+ @settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
+ @setfilename quagga.info
+ @c %**end of header
+
+- at c Set variables - sourced from defines.texi
+- at include defines.texi
+-
+ @c automake will automatically generate version.texi
+ @c and set EDITION, VERSION, UPDATED and UPDATED-MONTH
+ @include version.texi
+--
+1.8.2
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/PKGBUILD 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=quagga
-pkgver=0.99.22
-pkgrel=2
-pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
-arch=('i686' 'x86_64')
-url='http://www.quagga.net'
-license=('GPL2')
-depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
-options=('!libtool' '!buildflags')
-install=quagga.install
-source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
- 'babeld.service'
- 'bgpd.service'
- 'isisd.service'
- 'ospf6d.service'
- 'ospfd.service'
- 'ripd.service'
- 'ripngd.service'
- 'zebra.service')
-md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
- '45d8bf56a426b0e7ebe429547be8a27a'
- 'ab31ed8dafd7a92137f4f00ad0937b4f'
- '4c05d0105cd0db23a2583bd75a1bde4d'
- 'd087dce5eeba78ac64541157c7e04dfd'
- 'c5f8a729685cebf8fc5b1a1552d37b6d'
- 'e721b334bb0b31983642b307033c63d0'
- 'effeb26ff78ffcafe7808596ddc5d3fc'
- 'f0c0b99346b2c373a74158e45f04cf91')
-
-build() {
- cd $pkgname-$pkgver
- shopt -s nullglob
- for _p in "$srcdir"/*.patch; do
- msg2 "Applying ${_p##*/}"
- patch -p 1 -i "$_p"
- done
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc/quagga \
- --localstatedir=/run/quagga \
- --enable-exampledir=/usr/share/doc/quagga/examples \
- --enable-vtysh \
- --enable-isisd \
- --enable-isis-topology \
- --enable-netlink \
- --enable-snmp \
- --enable-tcp-zebra \
- --enable-irdp \
- --enable-pcreposix \
- --enable-multipath=64 \
- --enable-user=quagga \
- --enable-group=quagga \
- --enable-configfile-mask=0640 \
- --enable-logfile-mask=0640
- make
-}
-
-package() {
- # upstream install
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- # logrotate stuff
- install -D -m 644 redhat/$pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
- sed -ri 's,/var/run/quagga,/run/quagga,g' "$pkgdir/etc/logrotate.d/$pkgname"
-
- # systemd
- cd "$srcdir"
- for _d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do
- install -D -m 644 $_d.service "$pkgdir/usr/lib/systemd/system/$_d.service"
- done
- install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
- echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-
-}
-
-# vim:set ts=2 sw=2 et:
Copied: quagga/repos/community-x86_64/PKGBUILD (from rev 87782, quagga/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=quagga
+pkgver=0.99.22
+pkgrel=3
+pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
+arch=('i686' 'x86_64')
+url='http://www.quagga.net'
+license=('GPL2')
+depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
+options=('!libtool' '!buildflags')
+install=quagga.install
+source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'babeld.service'
+ 'bgpd.service'
+ 'isisd.service'
+ 'ospf6d.service'
+ 'ospfd.service'
+ 'ripd.service'
+ 'ripngd.service'
+ 'zebra.service'
+ '0001-doc-fix-makeinfo-errors-and-one-warning.patch')
+md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
+ '87bf4ae8aca3b3cf70e3986bc669aa78'
+ '9b14110bed4982baa801808db6ac9135'
+ 'b685b5c12637cb963e1fb78ecd926e14'
+ '1fee8cdf03f87b9bb129948058246c88'
+ '4d95a4af1ddb4ae21b867bebbedc77d5'
+ '7e33c2a2e1c12309ba28d75a34294ed0'
+ '6c682c0cd06c109bc10d29c1d9af3e38'
+ '18964536b7ed012aa5b22f2fa9fb3e87'
+ '214ed8ae0d58d080dcba9a176a94eb51')
+
+prepare() {
+ cd $pkgname-$pkgver
+ shopt -s nullglob
+ for _p in "$srcdir"/*.patch; do
+ msg2 "Applying ${_p##*/}"
+ patch -p 1 -i "$_p"
+ done
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/quagga \
+ --localstatedir=/run/quagga \
+ --enable-exampledir=/usr/share/doc/quagga/examples \
+ --enable-vtysh \
+ --enable-isisd \
+ --enable-isis-topology \
+ --enable-netlink \
+ --enable-snmp \
+ --enable-tcp-zebra \
+ --enable-irdp \
+ --enable-pcreposix \
+ --enable-multipath=64 \
+ --enable-user=quagga \
+ --enable-group=quagga \
+ --enable-configfile-mask=0640 \
+ --enable-logfile-mask=0640
+ make
+}
+
+package() {
+ # upstream install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # logrotate stuff
+ install -D -m 644 redhat/$pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+ sed -ri 's,/var/run/quagga,/run/quagga,g' "$pkgdir/etc/logrotate.d/$pkgname"
+
+ # systemd
+ cd "$srcdir"
+ for _d in zebra ripd ripngd bgpd ospfd ospf6d isisd babeld; do
+ install -D -m 644 $_d.service "$pkgdir/usr/lib/systemd/system/$_d.service"
+ done
+ install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+ echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/babeld.service
===================================================================
--- community-x86_64/babeld.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/babeld.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Babel routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/babeld.conf
-
-[Service]
-ExecStart=/usr/sbin/babeld
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/babeld.service (from rev 87782, quagga/trunk/babeld.service)
===================================================================
--- community-x86_64/babeld.service (rev 0)
+++ community-x86_64/babeld.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=Babel routing daemon
+Documentation=man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/babeld.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/babeld.pid
+ExecStart=/usr/sbin/babeld -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/bgpd.service
===================================================================
--- community-x86_64/bgpd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/bgpd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=BGP routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/bgpd.conf
-
-[Service]
-ExecStart=/usr/sbin/bgpd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/bgpd.service (from rev 87782, quagga/trunk/bgpd.service)
===================================================================
--- community-x86_64/bgpd.service (rev 0)
+++ community-x86_64/bgpd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=BGP routing daemon
+Documentation=man:bgpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/bgpd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/bgpd.pid
+ExecStart=/usr/sbin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/isisd.service
===================================================================
--- community-x86_64/isisd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/isisd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=IS-IS routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/isisd.conf
-
-[Service]
-ExecStart=/usr/sbin/isisd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/isisd.service (from rev 87782, quagga/trunk/isisd.service)
===================================================================
--- community-x86_64/isisd.service (rev 0)
+++ community-x86_64/isisd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=IS-IS routing daemon
+Documentation=man:isis(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/isisd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/isisd.pid
+ExecStart=/usr/sbin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/ospf6d.service
===================================================================
--- community-x86_64/ospf6d.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/ospf6d.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=OSPF routing daemon for IPv6
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospf6d.conf
-
-[Service]
-ExecStart=/usr/sbin/ospf6d
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/ospf6d.service (from rev 87782, quagga/trunk/ospf6d.service)
===================================================================
--- community-x86_64/ospf6d.service (rev 0)
+++ community-x86_64/ospf6d.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospf6d.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ospf6d.pid
+ExecStart=/usr/sbin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/ospfd.service
===================================================================
--- community-x86_64/ospfd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/ospfd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=OSPF routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospfd.conf
-
-[Service]
-ExecStart=/usr/sbin/ospfd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/ospfd.service (from rev 87782, quagga/trunk/ospfd.service)
===================================================================
--- community-x86_64/ospfd.service (rev 0)
+++ community-x86_64/ospfd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=OSPF routing daemon
+Documentation=man:ospfd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ospfd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ospfd.pid
+ExecStart=/usr/sbin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/quagga.install
===================================================================
--- community-x86_64/quagga.install 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/quagga.install 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,36 +0,0 @@
-infodir=/usr/share/info
-filelist=(quagga.info quagga.info-1 quagga.info-2)
-
-post_install() {
- groupadd -r quagga
- useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null
- install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga
- post_upgrade
-}
-
-post_upgrade() {
- if [[ -x /usr/bin/install-info ]]; then
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
- fi
-}
-
-pre_remove() {
- for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do
- /etc/rc.d/$d stop &>/dev/null
- done
- if [[ -x /usr/bin/install-info ]]; then
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
- fi
-}
-
-post_remove() {
- userdel quagga &>/dev/null
- groupdel quagga &>/dev/null
- rmdir /{etc,var/log}/quagga
-}
-
-# vim: ft=sh ts=2 sw=2 et:
Copied: quagga/repos/community-x86_64/quagga.install (from rev 87782, quagga/trunk/quagga.install)
===================================================================
--- community-x86_64/quagga.install (rev 0)
+++ community-x86_64/quagga.install 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,36 @@
+infodir=/usr/share/info
+filelist=(quagga.info quagga.info-1 quagga.info-2)
+
+post_install() {
+ groupadd -r quagga
+ useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null
+ install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga
+ post_upgrade
+}
+
+post_upgrade() {
+ if [[ -x /usr/bin/install-info ]]; then
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+ fi
+}
+
+pre_remove() {
+ for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do
+ /etc/rc.d/$d stop &>/dev/null
+ done
+ if [[ -x /usr/bin/install-info ]]; then
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+ fi
+}
+
+post_remove() {
+ userdel quagga &>/dev/null
+ groupdel quagga &>/dev/null
+ rmdir /{etc,var/log}/quagga
+}
+
+# vim: ft=sh ts=2 sw=2 et:
Deleted: community-x86_64/ripd.service
===================================================================
--- community-x86_64/ripd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/ripd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=RIP routing daemon
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripd.conf
-
-[Service]
-ExecStart=/usr/sbin/ripd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/ripd.service (from rev 87782, quagga/trunk/ripd.service)
===================================================================
--- community-x86_64/ripd.service (rev 0)
+++ community-x86_64/ripd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=RIP routing daemon
+Documentation=man:ripd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ripd.pid
+ExecStart=/usr/sbin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/ripngd.service
===================================================================
--- community-x86_64/ripngd.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/ripngd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=RIP routing daemon for IPv6
-BindTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripngd.conf
-
-[Service]
-ExecStart=/usr/sbin/ripngd
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/ripngd.service (from rev 87782, quagga/trunk/ripngd.service)
===================================================================
--- community-x86_64/ripngd.service (rev 0)
+++ community-x86_64/ripngd.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=RIP routing daemon for IPv6
+Documentation=man:ripngd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/ripngd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/ripngd.pid
+ExecStart=/usr/sbin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/zebra.service
===================================================================
--- community-x86_64/zebra.service 2013-04-06 13:02:33 UTC (rev 87782)
+++ community-x86_64/zebra.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -1,12 +0,0 @@
-[Unit]
-Description=GNU Zebra routing manager
-After=network.target
-ConditionPathExists=/etc/quagga/zebra.conf
-
-[Service]
-ExecStartPre=/usr/sbin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
Copied: quagga/repos/community-x86_64/zebra.service (from rev 87782, quagga/trunk/zebra.service)
===================================================================
--- community-x86_64/zebra.service (rev 0)
+++ community-x86_64/zebra.service 2013-04-06 13:02:55 UTC (rev 87783)
@@ -0,0 +1,16 @@
+[Unit]
+Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
+After=network.target
+ConditionPathExists=/etc/quagga/zebra.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/zebra.pid
+ExecStartPre=/sbin/ip route flush proto zebra
+ExecStart=/usr/sbin/zebra -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list