Date: Tuesday, August 26, 2014 @ 10:54:21 Author: seblu Revision: 220664
archrelease: copy trunk to extra-i686, extra-x86_64 Added: quagga/repos/extra-i686/PKGBUILD (from rev 220663, quagga/trunk/PKGBUILD) quagga/repos/extra-i686/babeld.service (from rev 220663, quagga/trunk/babeld.service) quagga/repos/extra-i686/bgpd.service (from rev 220663, quagga/trunk/bgpd.service) quagga/repos/extra-i686/isisd.service (from rev 220663, quagga/trunk/isisd.service) quagga/repos/extra-i686/ospf6d.service (from rev 220663, quagga/trunk/ospf6d.service) quagga/repos/extra-i686/ospfd.service (from rev 220663, quagga/trunk/ospfd.service) quagga/repos/extra-i686/quagga.install (from rev 220663, quagga/trunk/quagga.install) quagga/repos/extra-i686/ripd.service (from rev 220663, quagga/trunk/ripd.service) quagga/repos/extra-i686/ripngd.service (from rev 220663, quagga/trunk/ripngd.service) quagga/repos/extra-i686/zebra.service (from rev 220663, quagga/trunk/zebra.service) quagga/repos/extra-x86_64/PKGBUILD (from rev 220663, quagga/trunk/PKGBUILD) quagga/repos/extra-x86_64/babeld.service (from rev 220663, quagga/trunk/babeld.service) quagga/repos/extra-x86_64/bgpd.service (from rev 220663, quagga/trunk/bgpd.service) quagga/repos/extra-x86_64/isisd.service (from rev 220663, quagga/trunk/isisd.service) quagga/repos/extra-x86_64/ospf6d.service (from rev 220663, quagga/trunk/ospf6d.service) quagga/repos/extra-x86_64/ospfd.service (from rev 220663, quagga/trunk/ospfd.service) quagga/repos/extra-x86_64/quagga.install (from rev 220663, quagga/trunk/quagga.install) quagga/repos/extra-x86_64/ripd.service (from rev 220663, quagga/trunk/ripd.service) quagga/repos/extra-x86_64/ripngd.service (from rev 220663, quagga/trunk/ripngd.service) quagga/repos/extra-x86_64/zebra.service (from rev 220663, quagga/trunk/zebra.service) Deleted: quagga/repos/extra-i686/PKGBUILD quagga/repos/extra-i686/babeld.service quagga/repos/extra-i686/bgpd.service quagga/repos/extra-i686/isisd.service quagga/repos/extra-i686/ospf6d.service quagga/repos/extra-i686/ospfd.service quagga/repos/extra-i686/quagga.install quagga/repos/extra-i686/ripd.service quagga/repos/extra-i686/ripngd.service quagga/repos/extra-i686/zebra.service quagga/repos/extra-x86_64/PKGBUILD quagga/repos/extra-x86_64/babeld.service quagga/repos/extra-x86_64/bgpd.service quagga/repos/extra-x86_64/isisd.service quagga/repos/extra-x86_64/ospf6d.service quagga/repos/extra-x86_64/ospfd.service quagga/repos/extra-x86_64/quagga.install quagga/repos/extra-x86_64/ripd.service quagga/repos/extra-x86_64/ripngd.service quagga/repos/extra-x86_64/zebra.service -----------------------------+ /PKGBUILD | 172 ++++++++++++++++++++++++++++++++++++++++++ /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 +++++++ extra-i686/PKGBUILD | 86 --------------------- extra-i686/babeld.service | 16 --- extra-i686/bgpd.service | 16 --- extra-i686/isisd.service | 16 --- extra-i686/ospf6d.service | 16 --- extra-i686/ospfd.service | 16 --- extra-i686/quagga.install | 36 -------- extra-i686/ripd.service | 16 --- extra-i686/ripngd.service | 16 --- extra-i686/zebra.service | 16 --- extra-x86_64/PKGBUILD | 86 --------------------- extra-x86_64/babeld.service | 16 --- extra-x86_64/bgpd.service | 16 --- extra-x86_64/isisd.service | 16 --- extra-x86_64/ospf6d.service | 16 --- extra-x86_64/ospfd.service | 16 --- extra-x86_64/quagga.install | 36 -------- extra-x86_64/ripd.service | 16 --- extra-x86_64/ripngd.service | 16 --- extra-x86_64/zebra.service | 16 --- 30 files changed, 500 insertions(+), 500 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/PKGBUILD 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer - -pkgname=quagga -pkgver=0.99.23 -pkgrel=1 -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' 'perl') -options=('!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=('d17145e62b6ea14f0f13bb63f59e5166' - '20a8e36ad851d4e06467aeb56a84b245' - 'cc90c234aac9098c5132d653037d5269' - '67d0ada0f3000b9a86351798786c5256' - '6e2569ef339838aa41375e913a8e19ce' - '260f5fcf9b53ef201a8fb34e7ea90457' - 'b6e3549d780355914ae8edd43e15630a' - '72dd63c49fdaea41729a4318d0fbac79' - '577f1e7caeea31d910f2dc29c28ada7d') - -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 - # fix broken 0.99.22.4 tarball - autoreconf -fvi - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --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/extra-i686/PKGBUILD (from rev 220663, quagga/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-08-26 08:54:21 UTC (rev 220664) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Sébastien Luttringer + +pkgname=quagga +pkgver=0.99.23.1 +pkgrel=1 +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' 'perl') +options=('!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=('f9d9c63529c55d646a4cbe6513b37953' + '20a8e36ad851d4e06467aeb56a84b245' + 'cc90c234aac9098c5132d653037d5269' + '67d0ada0f3000b9a86351798786c5256' + '6e2569ef339838aa41375e913a8e19ce' + '260f5fcf9b53ef201a8fb34e7ea90457' + 'b6e3549d780355914ae8edd43e15630a' + '72dd63c49fdaea41729a4318d0fbac79' + '577f1e7caeea31d910f2dc29c28ada7d') + +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 + # fix broken 0.99.22.4 tarball + autoreconf -fvi + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --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: extra-i686/babeld.service =================================================================== --- extra-i686/babeld.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/babeld.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/babeld -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/babeld.service (from rev 220663, quagga/trunk/babeld.service) =================================================================== --- extra-i686/babeld.service (rev 0) +++ extra-i686/babeld.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/babeld -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/bgpd.service =================================================================== --- extra-i686/bgpd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/bgpd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/bgpd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/bgpd.service (from rev 220663, quagga/trunk/bgpd.service) =================================================================== --- extra-i686/bgpd.service (rev 0) +++ extra-i686/bgpd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/bgpd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/isisd.service =================================================================== --- extra-i686/isisd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/isisd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/isisd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/isisd.service (from rev 220663, quagga/trunk/isisd.service) =================================================================== --- extra-i686/isisd.service (rev 0) +++ extra-i686/isisd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/isisd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/ospf6d.service =================================================================== --- extra-i686/ospf6d.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/ospf6d.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ospf6d -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/ospf6d.service (from rev 220663, quagga/trunk/ospf6d.service) =================================================================== --- extra-i686/ospf6d.service (rev 0) +++ extra-i686/ospf6d.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ospf6d -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/ospfd.service =================================================================== --- extra-i686/ospfd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/ospfd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ospfd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/ospfd.service (from rev 220663, quagga/trunk/ospfd.service) =================================================================== --- extra-i686/ospfd.service (rev 0) +++ extra-i686/ospfd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ospfd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/quagga.install =================================================================== --- extra-i686/quagga.install 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/quagga.install 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/extra-i686/quagga.install (from rev 220663, quagga/trunk/quagga.install) =================================================================== --- extra-i686/quagga.install (rev 0) +++ extra-i686/quagga.install 2014-08-26 08:54:21 UTC (rev 220664) @@ -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: extra-i686/ripd.service =================================================================== --- extra-i686/ripd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/ripd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ripd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/ripd.service (from rev 220663, quagga/trunk/ripd.service) =================================================================== --- extra-i686/ripd.service (rev 0) +++ extra-i686/ripd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ripd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/ripngd.service =================================================================== --- extra-i686/ripngd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/ripngd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ripngd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/ripngd.service (from rev 220663, quagga/trunk/ripngd.service) =================================================================== --- extra-i686/ripngd.service (rev 0) +++ extra-i686/ripngd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ripngd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/zebra.service =================================================================== --- extra-i686/zebra.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-i686/zebra.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/zebra -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-i686/zebra.service (from rev 220663, quagga/trunk/zebra.service) =================================================================== --- extra-i686/zebra.service (rev 0) +++ extra-i686/zebra.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/zebra -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/PKGBUILD 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer - -pkgname=quagga -pkgver=0.99.23 -pkgrel=1 -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' 'perl') -options=('!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=('d17145e62b6ea14f0f13bb63f59e5166' - '20a8e36ad851d4e06467aeb56a84b245' - 'cc90c234aac9098c5132d653037d5269' - '67d0ada0f3000b9a86351798786c5256' - '6e2569ef339838aa41375e913a8e19ce' - '260f5fcf9b53ef201a8fb34e7ea90457' - 'b6e3549d780355914ae8edd43e15630a' - '72dd63c49fdaea41729a4318d0fbac79' - '577f1e7caeea31d910f2dc29c28ada7d') - -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 - # fix broken 0.99.22.4 tarball - autoreconf -fvi - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --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/extra-x86_64/PKGBUILD (from rev 220663, quagga/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-08-26 08:54:21 UTC (rev 220664) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Sébastien Luttringer + +pkgname=quagga +pkgver=0.99.23.1 +pkgrel=1 +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' 'perl') +options=('!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=('f9d9c63529c55d646a4cbe6513b37953' + '20a8e36ad851d4e06467aeb56a84b245' + 'cc90c234aac9098c5132d653037d5269' + '67d0ada0f3000b9a86351798786c5256' + '6e2569ef339838aa41375e913a8e19ce' + '260f5fcf9b53ef201a8fb34e7ea90457' + 'b6e3549d780355914ae8edd43e15630a' + '72dd63c49fdaea41729a4318d0fbac79' + '577f1e7caeea31d910f2dc29c28ada7d') + +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 + # fix broken 0.99.22.4 tarball + autoreconf -fvi + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --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: extra-x86_64/babeld.service =================================================================== --- extra-x86_64/babeld.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/babeld.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/babeld -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/babeld.service (from rev 220663, quagga/trunk/babeld.service) =================================================================== --- extra-x86_64/babeld.service (rev 0) +++ extra-x86_64/babeld.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/babeld -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/bgpd.service =================================================================== --- extra-x86_64/bgpd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/bgpd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/bgpd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/bgpd.service (from rev 220663, quagga/trunk/bgpd.service) =================================================================== --- extra-x86_64/bgpd.service (rev 0) +++ extra-x86_64/bgpd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/bgpd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/isisd.service =================================================================== --- extra-x86_64/isisd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/isisd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/isisd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/isisd.service (from rev 220663, quagga/trunk/isisd.service) =================================================================== --- extra-x86_64/isisd.service (rev 0) +++ extra-x86_64/isisd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/isisd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/ospf6d.service =================================================================== --- extra-x86_64/ospf6d.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/ospf6d.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ospf6d -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/ospf6d.service (from rev 220663, quagga/trunk/ospf6d.service) =================================================================== --- extra-x86_64/ospf6d.service (rev 0) +++ extra-x86_64/ospf6d.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ospf6d -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/ospfd.service =================================================================== --- extra-x86_64/ospfd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/ospfd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ospfd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/ospfd.service (from rev 220663, quagga/trunk/ospfd.service) =================================================================== --- extra-x86_64/ospfd.service (rev 0) +++ extra-x86_64/ospfd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ospfd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/quagga.install =================================================================== --- extra-x86_64/quagga.install 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/quagga.install 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/extra-x86_64/quagga.install (from rev 220663, quagga/trunk/quagga.install) =================================================================== --- extra-x86_64/quagga.install (rev 0) +++ extra-x86_64/quagga.install 2014-08-26 08:54:21 UTC (rev 220664) @@ -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: extra-x86_64/ripd.service =================================================================== --- extra-x86_64/ripd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/ripd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ripd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/ripd.service (from rev 220663, quagga/trunk/ripd.service) =================================================================== --- extra-x86_64/ripd.service (rev 0) +++ extra-x86_64/ripd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ripd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/ripngd.service =================================================================== --- extra-x86_64/ripngd.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/ripngd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/ripngd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/ripngd.service (from rev 220663, quagga/trunk/ripngd.service) =================================================================== --- extra-x86_64/ripngd.service (rev 0) +++ extra-x86_64/ripngd.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/ripngd -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/zebra.service =================================================================== --- extra-x86_64/zebra.service 2014-08-26 08:52:54 UTC (rev 220663) +++ extra-x86_64/zebra.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -1,16 +0,0 @@ -[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/bin/zebra -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target Copied: quagga/repos/extra-x86_64/zebra.service (from rev 220663, quagga/trunk/zebra.service) =================================================================== --- extra-x86_64/zebra.service (rev 0) +++ extra-x86_64/zebra.service 2014-08-26 08:54:21 UTC (rev 220664) @@ -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/bin/zebra -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target