[gentoo-commits] repo/gentoo:master commit in: net-misc/quagga/files/systemd/

2017-04-06 Thread Sergey Popov
commit: fc75a7dd6536216331e35fb0bc228ad45a5088b9
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Apr  6 09:14:47 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Apr  6 11:40:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc75a7dd

net-misc/quagga: fix systemd units, replace BindTo with BindsTo

Package-Manager: portage-2.3.3

 net-misc/quagga/files/systemd/bgpd.service   | 2 +-
 net-misc/quagga/files/systemd/isisd.service  | 2 +-
 net-misc/quagga/files/systemd/nhrpd.service  | 2 +-
 net-misc/quagga/files/systemd/ospf6d.service | 2 +-
 net-misc/quagga/files/systemd/ospfd.service  | 2 +-
 net-misc/quagga/files/systemd/pimd.service   | 2 +-
 net-misc/quagga/files/systemd/ripd.service   | 2 +-
 net-misc/quagga/files/systemd/ripngd.service | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-misc/quagga/files/systemd/bgpd.service 
b/net-misc/quagga/files/systemd/bgpd.service
index aae58be2c95..f5db0b2510e 100644
--- a/net-misc/quagga/files/systemd/bgpd.service
+++ b/net-misc/quagga/files/systemd/bgpd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=BGP routing daemon
 Documentation=man:bgpd(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/bgpd.conf
 

diff --git a/net-misc/quagga/files/systemd/isisd.service 
b/net-misc/quagga/files/systemd/isisd.service
index fa5a716e833..10eb0a8fe1d 100644
--- a/net-misc/quagga/files/systemd/isisd.service
+++ b/net-misc/quagga/files/systemd/isisd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=IS-IS routing daemon
 Documentation=man:isis(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/isisd.conf
 

diff --git a/net-misc/quagga/files/systemd/nhrpd.service 
b/net-misc/quagga/files/systemd/nhrpd.service
index d6b3e67db77..1a93bae61b1 100644
--- a/net-misc/quagga/files/systemd/nhrpd.service
+++ b/net-misc/quagga/files/systemd/nhrpd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=NHRP daemon
 Documentation=man:nhrpd(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/nhrpd.conf
 

diff --git a/net-misc/quagga/files/systemd/ospf6d.service 
b/net-misc/quagga/files/systemd/ospf6d.service
index eacb8915940..b6372d10d89 100644
--- a/net-misc/quagga/files/systemd/ospf6d.service
+++ b/net-misc/quagga/files/systemd/ospf6d.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=OSPF routing daemon for IPv6
 Documentation=man:ospfd(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ospf6d.conf
 

diff --git a/net-misc/quagga/files/systemd/ospfd.service 
b/net-misc/quagga/files/systemd/ospfd.service
index 57a946f8e0c..310d219c001 100644
--- a/net-misc/quagga/files/systemd/ospfd.service
+++ b/net-misc/quagga/files/systemd/ospfd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=OSPF routing daemon
 Documentation=man:ospfd(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ospfd.conf
 

diff --git a/net-misc/quagga/files/systemd/pimd.service 
b/net-misc/quagga/files/systemd/pimd.service
index 65ef1bf2dd4..d39f59696c5 100644
--- a/net-misc/quagga/files/systemd/pimd.service
+++ b/net-misc/quagga/files/systemd/pimd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=PIM-SSM routing daemon
 Documentation=man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/pimd.conf
 

diff --git a/net-misc/quagga/files/systemd/ripd.service 
b/net-misc/quagga/files/systemd/ripd.service
index bf7c5ac6fe2..b2a74df47fb 100644
--- a/net-misc/quagga/files/systemd/ripd.service
+++ b/net-misc/quagga/files/systemd/ripd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=RIP routing daemon
 Documentation=man:ripd(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ripd.conf
 

diff --git a/net-misc/quagga/files/systemd/ripngd.service 
b/net-misc/quagga/files/systemd/ripngd.service
index 465263ba33f..75c60d8395b 100644
--- a/net-misc/quagga/files/systemd/ripngd.service
+++ b/net-misc/quagga/files/systemd/ripngd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=RIP routing daemon for IPv6
 Documentation=man:ripngd(8) man:zebra(8)
-BindTo=zebra.service
+BindsTo=zebra.service
 After=network.target zebra.service
 ConditionPathExists=/etc/quagga/ripngd.conf
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/quagga/files/systemd/

2017-03-01 Thread Sergey Popov
commit: 8d270ac4d3fe64bd2fb9e208c494af67c7982a7f
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Mar  1 17:22:13 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Mar  1 17:33:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d270ac4

net-misc/quagga: drop non-used systemd service file

Package-Manager: portage-2.3.3

 net-misc/quagga/files/systemd/babeld.service | 16 
 1 file changed, 16 deletions(-)

diff --git a/net-misc/quagga/files/systemd/babeld.service 
b/net-misc/quagga/files/systemd/babeld.service
deleted file mode 100644
index aa107afcacc..000
--- a/net-misc/quagga/files/systemd/babeld.service
+++ /dev/null
@@ -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/sbin/babeld -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target



[gentoo-commits] repo/gentoo:master commit in: net-misc/quagga/files/systemd/, net-misc/quagga/

2017-03-01 Thread Sergey Popov
commit: fb323ee9e376dd87e33d19b53fe8ab6a0a6c607a
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Mar  1 17:32:15 2017 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Mar  1 17:33:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb323ee9

net-misc/quagga: version bump

Package-Manager: portage-2.3.3

 net-misc/quagga/Manifest|   1 +
 net-misc/quagga/files/systemd/nhrpd.service |  16 
 net-misc/quagga/metadata.xml|   3 +
 net-misc/quagga/quagga-1.2.0.ebuild | 134 
 4 files changed, 154 insertions(+)

diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 66cdb2380ed..d11715b3e4c 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,2 +1,3 @@
 DIST ht-20040304-classless-bgp.patch 1581 SHA256 
39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 
3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
 WHIRLPOOL 
cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
 DIST quagga-1.1.1.tar.gz 2871705 SHA256 
b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 
51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58
 WHIRLPOOL 
795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be
+DIST quagga-1.2.0.tar.gz 2948778 SHA256 
1043644d37975d9f920b76c593368cbe36ca43e27eb57cff316ee80ccb31dce3 SHA512 
0ad28b828c2e52ad486189bd68e21041fe7c4affada7e3f12ba83a95f3532e0b012ba6b4271f9d0de63d4f5b15e80c706977b3afa54b57a3a5ec02400227d5ae
 WHIRLPOOL 
b4c73c4f7c99c971d762fbde79d5c6776b11b36d8a9b58e9c7cb5d322818ef8b6d90ca5c3f4c55f9b3353ae65042a99b41d39049b0a2f254bbd8904e5136ecce

diff --git a/net-misc/quagga/files/systemd/nhrpd.service 
b/net-misc/quagga/files/systemd/nhrpd.service
new file mode 100644
index 000..d6b3e67db77
--- /dev/null
+++ b/net-misc/quagga/files/systemd/nhrpd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=NHRP daemon
+Documentation=man:nhrpd(8) man:zebra(8)
+BindTo=zebra.service
+After=network.target zebra.service
+ConditionPathExists=/etc/quagga/nhrpd.conf
+
+[Service]
+Type=forking
+PIDFile=/run/quagga/nhrpd.pid
+ExecStart=/usr/sbin/nhrpd -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index 0cbccc060b5..2d6b042da25 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -22,6 +22,9 @@
Apply unofficial patch to enable classless prefixes for 
BGP. Patch and information to be found
at http://hasso.linux.ee/doku.php/english:network:quagga

+   
+   Enable Forwarding Plane Manager support
+   

Enable multipath routes support for any number of routes


diff --git a/net-misc/quagga/quagga-1.2.0.ebuild 
b/net-misc/quagga/quagga-1.2.0.ebuild
new file mode 100644
index 000..89d2095ccc7
--- /dev/null
+++ b/net-misc/quagga/quagga-1.2.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd 
user
+
+DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and 
BGP"
+HOMEPAGE="http://quagga.net/;
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
+   bgpclassless? ( 
http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath ospfapi pam 
protobuf +readline snmp tcp-zebra"
+
+COMMON_DEPEND="
+   caps? ( sys-libs/libcap )
+   protobuf? ( dev-libs/protobuf-c:0= )
+   readline? (
+   sys-libs/readline:0=
+   pam? ( sys-libs/pam )
+   )
+   snmp? ( net-analyzer/net-snmp )
+   !elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+   sys-apps/gawk
+   sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+   sys-apps/iproute2"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in 
/usr/share/doc/${PF}/samples
+You have to create config files in /etc/quagga before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+   enewgroup quagga