Sun Apr 7 00:54:38 PDT 2013

10 files changed, 116 insertions, 22 deletions

diff --git a/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch b/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch
new file mode 100644
index 000000000..3119e34ac
--- /dev/null
+++ b/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch
@@ -0,0 +1,57 @@
+From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@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@yandex.ru>
+Signed-off-by: Timo Teräs <timo.teras@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
+ 
+-+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
+-+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
++@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
++@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 -*-
++@c Set variables - sourced from defines.texi
++@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
+ 
+-@c Set variables - sourced from defines.texi
+-@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
+
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index feb494344..5167a45b6 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85920 2013-03-08 23:40:45Z foutrelis $
+# $Id: PKGBUILD 87783 2013-04-06 13:02:55Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=quagga
 pkgver=0.99.22
-pkgrel=2
+pkgrel=3
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64')
 url='http://www.quagga.net'
@@ -19,24 +19,30 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ospfd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service')
+        'zebra.service'
+        '0001-doc-fix-makeinfo-errors-and-one-warning.patch')
 md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
-         '45d8bf56a426b0e7ebe429547be8a27a'
-         'ab31ed8dafd7a92137f4f00ad0937b4f'
-         '4c05d0105cd0db23a2583bd75a1bde4d'
-         'd087dce5eeba78ac64541157c7e04dfd'
-         'c5f8a729685cebf8fc5b1a1552d37b6d'
-         'e721b334bb0b31983642b307033c63d0'
-         'effeb26ff78ffcafe7808596ddc5d3fc'
-         'f0c0b99346b2c373a74158e45f04cf91')
+         '87bf4ae8aca3b3cf70e3986bc669aa78'
+         '9b14110bed4982baa801808db6ac9135'
+         'b685b5c12637cb963e1fb78ecd926e14'
+         '1fee8cdf03f87b9bb129948058246c88'
+         '4d95a4af1ddb4ae21b867bebbedc77d5'
+         '7e33c2a2e1c12309ba28d75a34294ed0'
+         '6c682c0cd06c109bc10d29c1d9af3e38'
+         '18964536b7ed012aa5b22f2fa9fb3e87'
+         '214ed8ae0d58d080dcba9a176a94eb51')
 
-build() {
+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 \
@@ -74,7 +80,6 @@ package() {
   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:
diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service
index 5b2848042..aa107afca 100644
--- a/community/quagga/babeld.service
+++ b/community/quagga/babeld.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=Babel routing daemon
+Documentation=man:zebra(8)
 BindTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/babeld.conf
 
 [Service]
-ExecStart=/usr/sbin/babeld
+Type=forking
+PIDFile=/run/quagga/babeld.pid
+ExecStart=/usr/sbin/babeld -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service
index 21ac18c8a..aae58be2c 100644
--- a/community/quagga/bgpd.service
+++ b/community/quagga/bgpd.service
@@ -1,11 +1,15 @@
 [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]
-ExecStart=/usr/sbin/bgpd
+Type=forking
+PIDFile=/run/quagga/bgpd.pid
+ExecStart=/usr/sbin/bgpd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service
index 298946998..fa5a716e8 100644
--- a/community/quagga/isisd.service
+++ b/community/quagga/isisd.service
@@ -1,11 +1,15 @@
 [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]
-ExecStart=/usr/sbin/isisd
+Type=forking
+PIDFile=/run/quagga/isisd.pid
+ExecStart=/usr/sbin/isisd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service
index 31194fc6e..eacb89159 100644
--- a/community/quagga/ospf6d.service
+++ b/community/quagga/ospf6d.service
@@ -1,11 +1,15 @@
 [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]
-ExecStart=/usr/sbin/ospf6d
+Type=forking
+PIDFile=/run/quagga/ospf6d.pid
+ExecStart=/usr/sbin/ospf6d -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service
index f864aa258..57a946f8e 100644
--- a/community/quagga/ospfd.service
+++ b/community/quagga/ospfd.service
@@ -1,11 +1,15 @@
 [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]
-ExecStart=/usr/sbin/ospfd
+Type=forking
+PIDFile=/run/quagga/ospfd.pid
+ExecStart=/usr/sbin/ospfd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service
index 22716e2c9..bf7c5ac6f 100644
--- a/community/quagga/ripd.service
+++ b/community/quagga/ripd.service
@@ -1,11 +1,15 @@
 [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]
-ExecStart=/usr/sbin/ripd
+Type=forking
+PIDFile=/run/quagga/ripd.pid
+ExecStart=/usr/sbin/ripd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service
index 9ac51bd1c..465263ba3 100644
--- a/community/quagga/ripngd.service
+++ b/community/quagga/ripngd.service
@@ -1,11 +1,15 @@
 [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]
-ExecStart=/usr/sbin/ripngd
+Type=forking
+PIDFile=/run/quagga/ripngd.pid
+ExecStart=/usr/sbin/ripngd -d
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-abort
 
 [Install]
diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service
index 0bba03972..c8707083e 100644
--- a/community/quagga/zebra.service
+++ b/community/quagga/zebra.service
@@ -1,11 +1,15 @@
 [Unit]
 Description=GNU Zebra routing manager
+Documentation=man:zebra(8)
 After=network.target
 ConditionPathExists=/etc/quagga/zebra.conf
 
 [Service]
-ExecStartPre=/usr/sbin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra
+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]