Gentoo Archives: gentoo-commits

From: Sergey Popov <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/quagga/files/systemd/, net-misc/quagga/
Date: Wed, 01 Mar 2017 17:33:19
Message-Id: 1488389590.fb323ee9e376dd87e33d19b53fe8ab6a0a6c607a.pinkbyte@gentoo
1 commit: fb323ee9e376dd87e33d19b53fe8ab6a0a6c607a
2 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 1 17:32:15 2017 +0000
4 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 1 17:33:10 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb323ee9
7
8 net-misc/quagga: version bump
9
10 Package-Manager: portage-2.3.3
11
12 net-misc/quagga/Manifest | 1 +
13 net-misc/quagga/files/systemd/nhrpd.service | 16 ++++
14 net-misc/quagga/metadata.xml | 3 +
15 net-misc/quagga/quagga-1.2.0.ebuild | 134 ++++++++++++++++++++++++++++
16 4 files changed, 154 insertions(+)
17
18 diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
19 index 66cdb2380ed..d11715b3e4c 100644
20 --- a/net-misc/quagga/Manifest
21 +++ b/net-misc/quagga/Manifest
22 @@ -1,2 +1,3 @@
23 DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
24 DIST quagga-1.1.1.tar.gz 2871705 SHA256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f SHA512 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58 WHIRLPOOL 795aa54b7930c441cbbc40a67db75865ccecada523164c906dd4a1b385b51820bff061ca58265fc67d1a814c8162d8b6e6758a4aab47ba54dab58cf846cb28be
25 +DIST quagga-1.2.0.tar.gz 2948778 SHA256 1043644d37975d9f920b76c593368cbe36ca43e27eb57cff316ee80ccb31dce3 SHA512 0ad28b828c2e52ad486189bd68e21041fe7c4affada7e3f12ba83a95f3532e0b012ba6b4271f9d0de63d4f5b15e80c706977b3afa54b57a3a5ec02400227d5ae WHIRLPOOL b4c73c4f7c99c971d762fbde79d5c6776b11b36d8a9b58e9c7cb5d322818ef8b6d90ca5c3f4c55f9b3353ae65042a99b41d39049b0a2f254bbd8904e5136ecce
26
27 diff --git a/net-misc/quagga/files/systemd/nhrpd.service b/net-misc/quagga/files/systemd/nhrpd.service
28 new file mode 100644
29 index 00000000000..d6b3e67db77
30 --- /dev/null
31 +++ b/net-misc/quagga/files/systemd/nhrpd.service
32 @@ -0,0 +1,16 @@
33 +[Unit]
34 +Description=NHRP daemon
35 +Documentation=man:nhrpd(8) man:zebra(8)
36 +BindTo=zebra.service
37 +After=network.target zebra.service
38 +ConditionPathExists=/etc/quagga/nhrpd.conf
39 +
40 +[Service]
41 +Type=forking
42 +PIDFile=/run/quagga/nhrpd.pid
43 +ExecStart=/usr/sbin/nhrpd -d
44 +ExecReload=/bin/kill -HUP $MAINPID
45 +Restart=on-abort
46 +
47 +[Install]
48 +WantedBy=multi-user.target
49
50 diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
51 index 0cbccc060b5..2d6b042da25 100644
52 --- a/net-misc/quagga/metadata.xml
53 +++ b/net-misc/quagga/metadata.xml
54 @@ -22,6 +22,9 @@
55 Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
56 at http://hasso.linux.ee/doku.php/english:network:quagga
57 </flag>
58 + <flag name="fpm">
59 + Enable Forwarding Plane Manager support
60 + </flag>
61 <flag name="multipath">
62 Enable multipath routes support for any number of routes
63 </flag>
64
65 diff --git a/net-misc/quagga/quagga-1.2.0.ebuild b/net-misc/quagga/quagga-1.2.0.ebuild
66 new file mode 100644
67 index 00000000000..89d2095ccc7
68 --- /dev/null
69 +++ b/net-misc/quagga/quagga-1.2.0.ebuild
70 @@ -0,0 +1,134 @@
71 +# Copyright 1999-2017 Gentoo Foundation
72 +# Distributed under the terms of the GNU General Public License v2
73 +
74 +EAPI=6
75 +
76 +CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
77 +
78 +inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
79 +
80 +DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
81 +HOMEPAGE="http://quagga.net/"
82 +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
83 + bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
84 +
85 +LICENSE="GPL-2"
86 +SLOT="0"
87 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
88 +
89 +IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
90 +
91 +COMMON_DEPEND="
92 + caps? ( sys-libs/libcap )
93 + protobuf? ( dev-libs/protobuf-c:0= )
94 + readline? (
95 + sys-libs/readline:0=
96 + pam? ( sys-libs/pam )
97 + )
98 + snmp? ( net-analyzer/net-snmp )
99 + !elibc_glibc? ( dev-libs/libpcre )"
100 +DEPEND="${COMMON_DEPEND}
101 + sys-apps/gawk
102 + sys-devel/libtool:2"
103 +RDEPEND="${COMMON_DEPEND}
104 + sys-apps/iproute2"
105 +
106 +PATCHES=(
107 + "${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
108 +)
109 +
110 +DISABLE_AUTOFORMATTING=1
111 +DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
112 +You have to create config files in /etc/quagga before
113 +starting one of the daemons.
114 +
115 +You can pass additional options to the daemon by setting the EXTRA_OPTS
116 +variable in their respective file in /etc/conf.d"
117 +
118 +pkg_setup() {
119 + enewgroup quagga
120 + enewuser quagga -1 -1 /var/empty quagga
121 +}
122 +
123 +src_prepare() {
124 + # Classless prefixes for BGP
125 + # http://hasso.linux.ee/doku.php/english:network:quagga
126 + use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
127 +
128 + eapply "${PATCHES[@]}"
129 + eapply_user
130 + eautoreconf
131 +}
132 +
133 +src_configure() {
134 + append-flags -fno-strict-aliasing
135 +
136 + # do not build PDF docs
137 + export ac_cv_prog_PDFLATEX=no
138 + export ac_cv_prog_LATEXMK=no
139 +
140 + econf \
141 + --enable-exampledir=/usr/share/doc/${PF}/samples \
142 + --enable-irdp \
143 + --enable-isisd \
144 + --enable-isis-topology \
145 + --enable-pimd \
146 + --enable-user=quagga \
147 + --enable-group=quagga \
148 + --enable-vty-group=quagga \
149 + --with-cflags="${CFLAGS}" \
150 + --with-pkg-extra-version="-gentoo" \
151 + --sysconfdir=/etc/quagga \
152 + --localstatedir=/run/quagga \
153 + --disable-static \
154 + $(use_enable caps capabilities) \
155 + $(usex snmp '--enable-snmp' '' '' '') \
156 + $(use_enable !elibc_glibc pcreposix) \
157 + $(use_enable fpm) \
158 + $(use_enable tcp-zebra) \
159 + $(use_enable doc) \
160 + $(usex multipath $(use_enable multipath) '' '=0' '') \
161 + $(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
162 + $(use_enable readline vtysh) \
163 + $(use_with pam libpam) \
164 + $(use_enable protobuf) \
165 + $(use_enable ipv6 ripngd) \
166 + $(use_enable ipv6 ospf6d) \
167 + $(use_enable ipv6 rtadv)
168 +}
169 +
170 +src_install() {
171 + default
172 + prune_libtool_files
173 + readme.gentoo_create_doc
174 +
175 + keepdir /etc/quagga
176 + fowners root:quagga /etc/quagga
177 + fperms 0770 /etc/quagga
178 +
179 + # Path for PIDs before first reboot should be created here, bug #558194
180 + dodir /run/quagga
181 + fowners quagga:quagga /run/quagga
182 + fperms 0770 /run/quagga
183 +
184 + # Install systemd-related stuff, bug #553136
185 + systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
186 + systemd_dounit "${FILESDIR}/systemd/zebra.service"
187 +
188 + # install zebra as a file, symlink the rest
189 + newinitd "${FILESDIR}"/quagga-services.init.3 zebra
190 +
191 + for service in bgpd isisd nhrpd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd); do
192 + dosym zebra /etc/init.d/${service}
193 + systemd_dounit "${FILESDIR}/systemd/${service}.service"
194 + done
195 +
196 + use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
197 +
198 + insinto /etc/logrotate.d
199 + newins redhat/quagga.logrotate quagga
200 +}
201 +
202 +pkg_postinst() {
203 + readme.gentoo_print_elog
204 +}