gentoo auto-resync : 07:03:2023 - 17:57:54

6 files changed, 97 insertions, 45 deletions

diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 21e01bcd5a7a..ac06134ee7ce 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,13 +1,14 @@
+AUX bird-2.0.12-musl-tests.patch 1451 BLAKE2B a2ce47b4931e922237a51e72db693d99065a6651c4685d2bdd9d231a8c38839e5f671be3809df9593747843e46514822ab680796448bc859e76c0265335a6979 SHA512 7c6bd469190afaace6f6776ce2f589f33ec82bda2a88677159d1813b042f2bfa79be3672720ea9439e60a0b6b81e511a7448f04f791c10f71ae3a013da19f245
 AUX bird-2.0.7-gcc10.patch 460 BLAKE2B fda9c1ce155d1d4842fec83ede52847fe895ea406cf3d6b715ea2bea01843604cfd6c2957f6d64847d8d73f21a9d952f8af07d78e7261c585643b7c33727f107 SHA512 84a187e4dc0c48efb9b8e0248dae90669c93abbc2d26b58a1f197420100a69806f80650ac90e064947984d7b1a2f9c5598ffd021a97bee10420b4c61d9cf75c0
-AUX bird-2.0.9-musl-tests.patch 1451 BLAKE2B a2ce47b4931e922237a51e72db693d99065a6651c4685d2bdd9d231a8c38839e5f671be3809df9593747843e46514822ab680796448bc859e76c0265335a6979 SHA512 7c6bd469190afaace6f6776ce2f589f33ec82bda2a88677159d1813b042f2bfa79be3672720ea9439e60a0b6b81e511a7448f04f791c10f71ae3a013da19f245
+AUX bird-2.0.9-musl-tests.patch 893 BLAKE2B 8f96a4bb10f646503193744fc70bfbb4246a5ae1f66dd65732a528b7477d3cd7363743b2e6075a015fedd10f4a047aeab0155113baabd4176479c55315ca0f1e SHA512 c45bdc10c9bc2537610479af3c438b9d0c99879d253bd82574af272dfc8d72a4309838546eedbc56b8ae12e655f64b306a9b0a0903a6531036b1174a4137483c
 AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4db37d1bbe66b4d196a11d5c85742d45cb800c895d9517c10b33217811b9499c191a4a03aa2359 SHA512 5531e581f1535d8e0db316c1f151282ca7dcab68cf49c91264105a9f1751e7bfbe5eef6c52c6a3a76c74cf5810e2ecd912cb2845f55b7dd960823b05f086def8
 AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68
 DIST bird-2.0.10.tar.gz 1276546 BLAKE2B 21e1dde7d38d836c761eb13067b6aacdfc66211ca75f4ae72948f2c3a9519ac45af410f764c638e9a7314c51873675621feabc730e0604a42c00f054b0db1017 SHA512 607f9c96bbf55b7622a8c49126ad568ce9a220520801a13e89be63eee65a76c575a8095485e5bbd867d1306fed87c8394a82fe88d76307eaa40ee5902842d158
+DIST bird-2.0.11.tar.gz 1301502 BLAKE2B 0761bd50b3b0338ecf2a6325f61f90db9f92324ed814de2ec6b360c6f5a7e12d6ae4ae9b73a11ddede0e6c8fd1d15bea1b62076c38c937ae281f10a8bc2d1cbf SHA512 aaab11b4faf7d0c0afc3c4e3480f24ab6e0037b209aee969192eea57bef698073da5fa9155ef43d999ed91cbe3cd87acb95aa08fa03f2525c5c7653a0589dcf6
+DIST bird-2.0.12.tar.gz 1307984 BLAKE2B ca00574bb8e508255afb90e0d65f4e1763880699cff9877731d072efc48944b9f9ac77b35bb7ffd7b780e8e8b1c2eacdc38ee273353817c53723e7972fb5f0d6 SHA512 b5e1235210e500511955c009456710dd12d6ea747825806a6d35a9de5f2f984d9a45fa541d45dd5e353f87f4d61bf1d4612cb6058769e905e4ef6b414ab4212f
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
-DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
-DIST bird-2.0.9.tar.gz 1282045 BLAKE2B a9f60ac7a768793e985ff8edc4c42af4b5e0eb9028af575d12e2fbe9ea67092cdc908289be848ef71403e6fafdcf46a8b78e90a5880951f9cb09854a3a3f0c73 SHA512 14c1f5c792de58e1b89ce16ea942244ad998833cf159a3cde78fd0c7d81238b1ad18fd76f6a0e7e11210447c73a6c74cfef4c6a70989891fa78ba5df0ae71d90
-EBUILD bird-2.0.10.ebuild 1360 BLAKE2B b84cfa7708e24f0d1d2d2b383714df5093aae20cf23aeb4a0524a49be34f2883ec1f47013aded7968a39e419faffe6286fb85dde37a441323f0f75e0047f5d93 SHA512 722738cd2bca7f54ca449516bb0a8d5950fd9ed55ad2d2b2b37ce7fa0307826c4a5bca670fd91e14eb1322067ab71f78cdd7af726b384e1b56dc05ce930cc402
+EBUILD bird-2.0.10.ebuild 1359 BLAKE2B 9d037a74c870d0c9daaee21c598f4031fe74c8323377185e41812d7c739263a3a17af8d68c683966d233dd010282bba51457b0992f65ba1b8616d7d92a0bbe0f SHA512 d5ab491a00bb8d34ffc7b0516578d39d726be86027d9e9653acdfde8af3612fa8139813ed9aa91fa00b56e5fdd3a455f5fc481e583de3d6e6f232c328fb29a53
+EBUILD bird-2.0.11.ebuild 1360 BLAKE2B b84cfa7708e24f0d1d2d2b383714df5093aae20cf23aeb4a0524a49be34f2883ec1f47013aded7968a39e419faffe6286fb85dde37a441323f0f75e0047f5d93 SHA512 722738cd2bca7f54ca449516bb0a8d5950fd9ed55ad2d2b2b37ce7fa0307826c4a5bca670fd91e14eb1322067ab71f78cdd7af726b384e1b56dc05ce930cc402
+EBUILD bird-2.0.12.ebuild 1456 BLAKE2B fb144acd28d025d29b3e23504fbce461b3cfb7d5376076d081ebccff1bf9e066b8e245489e98ef24fca42315e870134a78b7278554a6eebd8128033ed107e21d SHA512 a9adb072a999ef3d52a9426ca27590ef842a5165a260f8fd6aaac16759ba8ba42a2bbf859ea344c37a7b00b22dd350656d0a59a6d28bf1f232d29b3314133320
 EBUILD bird-2.0.7.ebuild 808 BLAKE2B 7ce2db0fee210a80a196f111b8690e0b347cf9224255b41479b2a831058cc0fb931b7c1ef13f7e347f654b5222d73faafec8d0126c4b02a396866406d0752751 SHA512 f9b5fc2788d6b53ac9f317bf6ae91a864dbea79e42338d87c1c8bde4558109ab948f3ef9e37d92d663e3740db3e39b96102b418f63bd32fdbfd2569127f8780f
-EBUILD bird-2.0.8.ebuild 1257 BLAKE2B 3b9fe5cd1fbdd48497fbd5df6660a8fd212e5e3f7ab2ed54b20a4b564a879e63c2eae6a52bfe59c1d6e710d49c801af7a5184b4dd64b316b8f54e52c4beb8def SHA512 2988f25efd01b765bb9b4c12527da4b6e8c182499cd5ccdd562c481d73e3ed280e3365eac1c73aae652e5f3908508585d8659ca8a099759d4b59657834ae0891
-EBUILD bird-2.0.9.ebuild 1371 BLAKE2B f9e82020e20bdb3de6ccb32749acad40209d2c1d464f4d95db9a7e1144f080c1c541b7b3db65beef1e3e77d9db661f7f0d146de2e26970de3f25edde87d757b4 SHA512 c098794e3491f2dca7295ac83f543f33adabb8cefda9071654ed5a9d8808f1c4c8c2a5cd3e8e6daed7db8e596a9dc7f49396becc664f65fa5686d4ca898f394f
 MISC metadata.xml 582 BLAKE2B f2fca917d013e377c042ad09e99a53bda1bd27673e27dc17ed683aec7b691e40e405fef758a3243f6d53804f23ab495ccc7692712d9d941d2517d141b33c0a50 SHA512 0d03e6149698726621a62436740e83b6fcd6c6951d201eead7453ea0b565dcd72d6d54f961e40b1598a1d0b499a5166d84c4208de5c0a6b4134e3d32f84d9eae
diff --git a/net-misc/bird/bird-2.0.10.ebuild b/net-misc/bird/bird-2.0.10.ebuild
index 05e00dc95fd6..9e1415507309 100644
--- a/net-misc/bird/bird-2.0.10.ebuild
+++ b/net-misc/bird/bird-2.0.10.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 debug libssh"
 
 RDEPEND="
diff --git a/net-misc/bird/bird-2.0.9.ebuild b/net-misc/bird/bird-2.0.11.ebuild
index 31d6bb48520a..05e00dc95fd6 100644
--- a/net-misc/bird/bird-2.0.9.ebuild
+++ b/net-misc/bird/bird-2.0.11.ebuild
@@ -24,7 +24,6 @@ RDEPEND="
 		acct-user/bird
 	)
 	libssh? ( net-libs/libssh:= )"
-DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
@@ -38,12 +37,11 @@ FILECAPS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${P}-musl-tests.patch"
+	"${FILESDIR}/${PN}-2.0.9-musl-tests.patch"
 )
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -59,10 +57,13 @@ 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
 }
 
diff --git a/net-misc/bird/bird-2.0.8.ebuild b/net-misc/bird/bird-2.0.12.ebuild
index 5b842e0b42ed..11b8c7484e39 100644
--- a/net-misc/bird/bird-2.0.8.ebuild
+++ b/net-misc/bird/bird-2.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit fcaps
+inherit autotools fcaps
 
 DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
 HOMEPAGE="https://bird.network.cz"
@@ -15,8 +15,10 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
 IUSE="+client debug libssh"
 
 RDEPEND="
-	client? ( sys-libs/ncurses:= )
-	client? ( sys-libs/readline:= )
+	client? (
+		sys-libs/ncurses:=
+		sys-libs/readline:=
+	)
 	filecaps? (
 		acct-group/bird
 		acct-user/bird
@@ -34,22 +36,40 @@ FILECAPS=(
 	CAP_NET_RAW				usr/sbin/bird
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-musl-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug) \
+	# This export makes compilation and test phases verbose
+	export VERBOSE=1
+
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_enable client)
+		$(use_enable debug)
 		$(use_enable libssh)
+	)
+
+	econf "${myargs[@]}"
 }
 
 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
 }
 
diff --git a/net-misc/bird/files/bird-2.0.12-musl-tests.patch b/net-misc/bird/files/bird-2.0.12-musl-tests.patch
new file mode 100644
index 000000000000..df6e00e04dfe
--- /dev/null
+++ b/net-misc/bird/files/bird-2.0.12-musl-tests.patch
@@ -0,0 +1,43 @@
+https://bird.network.cz/pipermail/bird-users/2023-March/016743.html
+https://gitlab.nic.cz/labs/bird/-/commit/0f679438f36d8c2a31dfe490007e983b085caef6
+
+From 0f679438f36d8c2a31dfe490007e983b085caef6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Mon, 6 Mar 2023 11:19:30 +0100
+Subject: [PATCH] Printf test suite fails on systems with musl libc because
+ tests for "%m" and "%M" formats expect "Input/output error" message but musl
+ returns "I/O error". Proposed change compares the printf output with string
+ returned from strerror function for EIO constant.
+
+See-also: https://bugs.gentoo.org/836713
+
+Minor change from committer.
+---
+ lib/printf_test.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lib/printf_test.c b/lib/printf_test.c
+index 47ea905d..88ecf05e 100644
+--- a/lib/printf_test.c
++++ b/lib/printf_test.c
+@@ -32,11 +32,14 @@ t_simple(void)
+   BSPRINTF(1, "@", buf, "@", 64);
+   BSPRINTF(1, "\xff", buf, "%c", 0xff);
+ 
+-  errno = 5;
+-  BSPRINTF(18, "Input/output error", buf, "%m");
++  const char *io_error_str = lp_strdup(tmp_linpool, strerror(EIO));
++  const int io_error_len = strlen(io_error_str);
++
++  errno = EIO;
++  BSPRINTF(io_error_len, io_error_str, buf, "%m");
+   errno = 0;
+ 
+-  BSPRINTF(18, "Input/output error", buf, "%M", 5);
++  BSPRINTF(io_error_len, io_error_str, buf, "%M", EIO);
+ 
+   BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg");
+ 
+-- 
+GitLab
+
diff --git a/net-misc/bird/files/bird-2.0.9-musl-tests.patch b/net-misc/bird/files/bird-2.0.9-musl-tests.patch
index df6e00e04dfe..4da5788fa4d4 100644
--- a/net-misc/bird/files/bird-2.0.9-musl-tests.patch
+++ b/net-misc/bird/files/bird-2.0.9-musl-tests.patch
@@ -1,43 +1,30 @@
 https://bird.network.cz/pipermail/bird-users/2023-March/016743.html
-https://gitlab.nic.cz/labs/bird/-/commit/0f679438f36d8c2a31dfe490007e983b085caef6
-
-From 0f679438f36d8c2a31dfe490007e983b085caef6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
-Date: Mon, 6 Mar 2023 11:19:30 +0100
-Subject: [PATCH] Printf test suite fails on systems with musl libc because
- tests for "%m" and "%M" formats expect "Input/output error" message but musl
- returns "I/O error". Proposed change compares the printf output with string
- returned from strerror function for EIO constant.
-
 See-also: https://bugs.gentoo.org/836713
-
-Minor change from committer.
+Signed-off-by: Petr Vaněk <arkamar at atlas.cz>
 ---
- lib/printf_test.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ lib/printf_test.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/lib/printf_test.c b/lib/printf_test.c
-index 47ea905d..88ecf05e 100644
+index 47ea905d..ca278975 100644
 --- a/lib/printf_test.c
 +++ b/lib/printf_test.c
 @@ -32,11 +32,14 @@ t_simple(void)
    BSPRINTF(1, "@", buf, "@", 64);
    BSPRINTF(1, "\xff", buf, "%c", 0xff);
- 
--  errno = 5;
--  BSPRINTF(18, "Input/output error", buf, "%m");
-+  const char *io_error_str = lp_strdup(tmp_linpool, strerror(EIO));
+
++  const char * io_error_str = strerror(EIO);
 +  const int io_error_len = strlen(io_error_str);
 +
-+  errno = EIO;
+   errno = 5;
+-  BSPRINTF(18, "Input/output error", buf, "%m");
 +  BSPRINTF(io_error_len, io_error_str, buf, "%m");
    errno = 0;
- 
+
 -  BSPRINTF(18, "Input/output error", buf, "%M", 5);
-+  BSPRINTF(io_error_len, io_error_str, buf, "%M", EIO);
- 
++  BSPRINTF(io_error_len, io_error_str, buf, "%M", 5);
+
    BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg");
- 
--- 
-GitLab
 
+--
+2.39.2