* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/, net-misc/bird/files/
@ 2020-11-01 1:03 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2020-11-01 1:03 UTC (permalink / raw
To: gentoo-commits
commit: e32a7e93e5f494ad743e00972496b7261dcbc8c3
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 01:02:41 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 01:02:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32a7e93
net-misc/bird: Add build fix for gcc-10
Closes: https://bugs.gentoo.org/706704
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
net-misc/bird/bird-2.0.7.ebuild | 4 ++++
net-misc/bird/files/bird-2.0.7-gcc10.patch | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild
index edc17f5b33c..d2f563e2975 100644
--- a/net-misc/bird/bird-2.0.7.ebuild
+++ b/net-misc/bird/bird-2.0.7.ebuild
@@ -18,6 +18,10 @@ DEPEND="sys-devel/flex
sys-devel/bison
sys-devel/m4"
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10.patch"
+)
+
src_configure() {
econf \
--localstatedir="${EPREFIX}/var" \
diff --git a/net-misc/bird/files/bird-2.0.7-gcc10.patch b/net-misc/bird/files/bird-2.0.7-gcc10.patch
new file mode 100644
index 00000000000..5ba3fdaef34
--- /dev/null
+++ b/net-misc/bird/files/bird-2.0.7-gcc10.patch
@@ -0,0 +1,12 @@
+diff -ruN bird-2.0.7.orig/nest/route.h bird-2.0.7/nest/route.h
+--- bird-2.0.7.orig/nest/route.h 2019-10-16 13:45:52.000000000 +0300
++++ bird-2.0.7/nest/route.h 2020-11-01 02:59:41.199775491 +0200
+@@ -458,7 +458,7 @@
+ protocol-specific metric is availabe */
+
+
+-const char * rta_dest_names[RTD_MAX];
++extern const char * rta_dest_names[RTD_MAX];
+
+ static inline const char *rta_dest_name(uint n)
+ { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/, net-misc/bird/files/
@ 2021-04-09 22:02 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-04-09 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 13229763ef3e9b2ebfeed2fefda7c2c7c403bc02
Author: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
AuthorDate: Tue Mar 30 09:40:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 9 22:01:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13229763
net-misc/bird: New upstream version 2.0.8
Closes: https://bugs.gentoo.org/779328
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr>
Closes: https://github.com/gentoo/gentoo/pull/20196
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/bird/Manifest | 1 +
net-misc/bird/bird-2.0.8.ebuild | 61 ++++++++++++++++++++++++++++++++++++++++
net-misc/bird/files/confd-bird-2 | 9 ++++++
net-misc/bird/files/initd-bird-2 | 16 +++++++++--
net-misc/bird/metadata.xml | 4 +++
5 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 4954f5f12bc..65402b14904 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1 +1,2 @@
DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
+DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
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 00000000000..5b842e0b42e
--- /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 00000000000..a2dc3ed89db
--- /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
old mode 100644
new mode 100755
index 06030d4b301..3b759df883d
--- 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 3be54ec47f3..f5abf70908f 100644
--- a/net-misc/bird/metadata.xml
+++ b/net-misc/bird/metadata.xml
@@ -7,5 +7,9 @@
</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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/, net-misc/bird/files/
@ 2023-03-12 8:36 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-03-12 8:36 UTC (permalink / raw
To: gentoo-commits
commit: 3bff7b72a68e95bdf2755fd49433dc1294915c80
Author: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
AuthorDate: Sun Mar 12 00:37:14 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 08:36:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bff7b72
net-misc/bird: fixes for the initrd script
Fixes for the initrd script (can’t check conf with a restricted
socket anymore, and unix rights fixes while not running as root)
Bug: https://bugs.gentoo.org/900723
Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr>
Closes: https://github.com/gentoo/gentoo/pull/30065
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/bird/bird-2.0.12.ebuild | 2 +-
net-misc/bird/files/initd-bird-2 | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/net-misc/bird/bird-2.0.12.ebuild b/net-misc/bird/bird-2.0.12.ebuild
index 043f67e052c9..ced3b211938d 100644
--- a/net-misc/bird/bird-2.0.12.ebuild
+++ b/net-misc/bird/bird-2.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~x86 ~x64-macos"
IUSE="+client custom-cflags debug libssh"
RDEPEND="
diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
index 3b759df883d8..fc4908990c20 100644
--- a/net-misc/bird/files/initd-bird-2
+++ b/net-misc/bird/files/initd-bird-2
@@ -5,13 +5,12 @@
extra_started_commands="reload"
-pidfile="/run/${RC_SVCNAME}.pid"
+pidfile="/run/${RC_SVCNAME}/${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"
+SOCK="/run/${RC_SVCNAME}/${RC_SVCNAME}.ctl"
if [ ${BIRD_GROUP} ]; then
BIRD_OPTS="${BIRD_OPTS} -g ${BIRD_GROUP}"
@@ -22,10 +21,9 @@ fi
client_args="-s ${SOCK}"
command_args="${client_args} -c ${CONF_FILE} -P ${pidfile} ${BIRD_OPTS}"
-client_args="${client_args} -r"
depend() {
- need net
+ use net
use logger
}
@@ -52,8 +50,12 @@ reload() {
eend $?
}
+start_pre() {
+ checkpath -d -m 0755 -o bird:bird "/run/${RC_SVCNAME}"
+}
+
start_post() {
- checkpath -f -m 0655 -o bird:bird "${pidfile}"
+ ln -sf "${SOCK}" /run
}
stop_pre() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-12 8:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-12 8:36 [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/, net-misc/bird/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-04-09 22:02 Sam James
2020-11-01 1:03 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox