Date: Saturday, April 6, 2013 @ 15:02:33 Author: seblu Revision: 87782
upgpkg: quagga 0.99.22-3 - fix compilation issue with makeinfo - fix FS#34514 Added: quagga/trunk/0001-doc-fix-makeinfo-errors-and-one-warning.patch Modified: quagga/trunk/PKGBUILD quagga/trunk/babeld.service quagga/trunk/bgpd.service quagga/trunk/isisd.service quagga/trunk/ospf6d.service quagga/trunk/ospfd.service quagga/trunk/ripd.service quagga/trunk/ripngd.service quagga/trunk/zebra.service ----------------------------------------------------+ 0001-doc-fix-makeinfo-errors-and-one-warning.patch | 57 +++++++++++++++++++ PKGBUILD | 29 +++++---- babeld.service | 6 +- bgpd.service | 6 +- isisd.service | 6 +- ospf6d.service | 6 +- ospfd.service | 6 +- ripd.service | 6 +- ripngd.service | 6 +- zebra.service | 8 ++ 10 files changed, 115 insertions(+), 21 deletions(-) Added: 0001-doc-fix-makeinfo-errors-and-one-warning.patch =================================================================== --- 0001-doc-fix-makeinfo-errors-and-one-warning.patch (rev 0) +++ 0001-doc-fix-makeinfo-errors-and-one-warning.patch 2013-04-06 13:02:33 UTC (rev 87782) @@ -0,0 +1,57 @@ +From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.te...@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 <infrastat...@yandex.ru> +Signed-off-by: Timo Teräs <timo.te...@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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-06 12:56:51 UTC (rev 87781) +++ PKGBUILD 2013-04-06 13:02:33 UTC (rev 87782) @@ -3,7 +3,7 @@ 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 @@ '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 @@ 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: Modified: babeld.service =================================================================== --- babeld.service 2013-04-06 12:56:51 UTC (rev 87781) +++ babeld.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: bgpd.service =================================================================== --- bgpd.service 2013-04-06 12:56:51 UTC (rev 87781) +++ bgpd.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: isisd.service =================================================================== --- isisd.service 2013-04-06 12:56:51 UTC (rev 87781) +++ isisd.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: ospf6d.service =================================================================== --- ospf6d.service 2013-04-06 12:56:51 UTC (rev 87781) +++ ospf6d.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: ospfd.service =================================================================== --- ospfd.service 2013-04-06 12:56:51 UTC (rev 87781) +++ ospfd.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: ripd.service =================================================================== --- ripd.service 2013-04-06 12:56:51 UTC (rev 87781) +++ ripd.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: ripngd.service =================================================================== --- ripngd.service 2013-04-06 12:56:51 UTC (rev 87781) +++ ripngd.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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] Modified: zebra.service =================================================================== --- zebra.service 2013-04-06 12:56:51 UTC (rev 87781) +++ zebra.service 2013-04-06 13:02:33 UTC (rev 87782) @@ -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]