gentoo resync : 28.04.2021

5 files changed, 101 insertions, 4 deletions

diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 38e40d3e410b..50bcfcd49aee 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,5 +1,8 @@
 AUX bird-2.0.7-gcc10.patch 460 BLAKE2B fda9c1ce155d1d4842fec83ede52847fe895ea406cf3d6b715ea2bea01843604cfd6c2957f6d64847d8d73f21a9d952f8af07d78e7261c585643b7c33727f107 SHA512 84a187e4dc0c48efb9b8e0248dae90669c93abbc2d26b58a1f197420100a69806f80650ac90e064947984d7b1a2f9c5598ffd021a97bee10420b4c61d9cf75c0
-AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55
+AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4db37d1bbe66b4d196a11d5c85742d45cb800c895d9517c10b33217811b9499c191a4a03aa2359 SHA512 5531e581f1535d8e0db316c1f151282ca7dcab68cf49c91264105a9f1751e7bfbe5eef6c52c6a3a76c74cf5810e2ecd912cb2845f55b7dd960823b05f086def8
+AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
+DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
 EBUILD bird-2.0.7.ebuild 809 BLAKE2B e5fe5d1bc763c46d9249d87460112134f108fa92aa05b7b4c7e6715fe4695beaf0d00de044432e79534647ef9340b5a95326b5b837c2332b55cf4071bc0577e5 SHA512 31c7e720b065945f46a1d9ffd704bb31164d1f886e03d518abad23bc15deed66a923b5ceac1f3da21f9d7e806182783306b71dc27244bf4f0a2fa639948c05bc
-MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
+EBUILD bird-2.0.8.ebuild 1257 BLAKE2B 3b9fe5cd1fbdd48497fbd5df6660a8fd212e5e3f7ab2ed54b20a4b564a879e63c2eae6a52bfe59c1d6e710d49c801af7a5184b4dd64b316b8f54e52c4beb8def SHA512 2988f25efd01b765bb9b4c12527da4b6e8c182499cd5ccdd562c481d73e3ed280e3365eac1c73aae652e5f3908508585d8659ca8a099759d4b59657834ae0891
+MISC metadata.xml 687 BLAKE2B 5b457a6eaa7607e1d423dd10c07d117aace1a918b77b66612c4e9963e0675fc6edf85b0eedefd164af8a328344f3f2675818cc4d5b00675d3450217f171deb51 SHA512 f7b45bbbb8ad221ebf83d1c87f587ebaeca5127335069a6d36949eaa8789a2c1a7a1db550742617f47b5aed78223e37e1fb3db771f89f950f750029f908daff0
diff --git a/net-misc/bird/bird-2.0.8.ebuild b/net-misc/bird/bird-2.0.8.ebuild
new file mode 100644
index 000000000000..5b842e0b42ed
--- /dev/null
+++ b/net-misc/bird/bird-2.0.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="https://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug libssh"
+
+RDEPEND="
+	client? ( sys-libs/ncurses:= )
+	client? ( sys-libs/readline:= )
+	filecaps? (
+		acct-group/bird
+		acct-user/bird
+	)
+	libssh? ( net-libs/libssh:= )"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/m4
+"
+
+FILECAPS=(
+	CAP_NET_ADMIN			usr/sbin/bird
+	CAP_NET_BIND_SERVICE	usr/sbin/bird
+	CAP_NET_RAW				usr/sbin/bird
+)
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug) \
+		$(use_enable libssh)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" ${PN}
+	newconfd "${FILESDIR}/confd-${PN}-2" ${PN}
+	dodoc doc/bird.conf.example
+}
+
+pkg_postinst() {
+	use filecaps && \
+		einfo "If you want to run bird as non-root, edit"
+		einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with"
+		einfo "the wanted username."
+}
diff --git a/net-misc/bird/files/confd-bird-2 b/net-misc/bird/files/confd-bird-2
new file mode 100644
index 000000000000..a2dc3ed89db8
--- /dev/null
+++ b/net-misc/bird/files/confd-bird-2
@@ -0,0 +1,9 @@
+# /etc/init.d/bird
+
+# Options to pass to the bird process
+# See https://bird.network.cz/?get_doc&v=20&f=bird-1.html#ss1.3
+# BIRD_GROUP and BIRD_USER will be appended to BIRD_OPTS
+
+#BIRD_GROUP="bird"
+#BIRD_USER="bird"
+#BIRD_OPTS=""
diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
index 06030d4b3016..3b759df883d8 100644
--- a/net-misc/bird/files/initd-bird-2
+++ b/net-misc/bird/files/initd-bird-2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Copyright 2019 Alarig Le Lay <alarig@grifon.fr>
 # Distributed under the terms of the GNU General Public License v2
 
@@ -8,12 +8,20 @@ extra_started_commands="reload"
 pidfile="/run/${RC_SVCNAME}.pid"
 command="/usr/sbin/${RC_SVCNAME}"
 retry=15
+start_stop_daemon_args="--make-pidfile"
 
 CONF_FILE="/etc/${RC_SVCNAME}.conf"
 SOCK="/run/${RC_SVCNAME}.ctl"
 
+if [ ${BIRD_GROUP} ]; then
+	BIRD_OPTS="${BIRD_OPTS} -g ${BIRD_GROUP}"
+fi
+if [ ${BIRD_USER} ]; then
+	BIRD_OPTS="${BIRD_OPTS} -u ${BIRD_USER}"
+fi
+
 client_args="-s ${SOCK}"
-command_args="${client_args} -c ${CONF_FILE} -P ${pidfile}"
+command_args="${client_args} -c ${CONF_FILE} -P ${pidfile} ${BIRD_OPTS}"
 client_args="${client_args} -r"
 
 depend() {
@@ -44,6 +52,10 @@ reload() {
 	eend $?
 }
 
+start_post() {
+	checkpath -f -m 0655 -o bird:bird "${pidfile}"
+}
+
 stop_pre() {
 	if [ "${RC_CMD}" = "restart" ] ; then
 		check_run || return 1
diff --git a/net-misc/bird/metadata.xml b/net-misc/bird/metadata.xml
index 3be54ec47f3c..3d132613ac58 100644
--- a/net-misc/bird/metadata.xml
+++ b/net-misc/bird/metadata.xml
@@ -5,7 +5,19 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<name>Alarig Le Lay</name>
+		<email>alarig@swordarmor.fr</email>
+	</maintainer>
 	<use>
 		<flag name="client">Build the ncurses/readline full featured CLI</flag>
+		<flag name="libssh">
+			Enables <pkg>net-libs/libssh</pkg> binding, mendatory for RPKI
+			support
+		</flag>
 	</use>
 </pkgmetadata>