commit: 1232cba686204a6c6e966983a75571aaf98ac486 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Sun Jun 15 08:49:55 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Jun 17 16:06:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1232cba6
net-misc/bird: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/42602 Closes: https://github.com/gentoo/gentoo/pull/42602 Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> net-misc/bird/files/bird-2.0.12-musl-tests.patch | 43 ------------------------ net-misc/bird/files/bird-2.0.7-gcc10.patch | 12 ------- net-misc/bird/files/bird-2.0.9-musl-tests.patch | 30 ----------------- 3 files changed, 85 deletions(-) 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 deleted file mode 100644 index df6e00e04dfe..000000000000 --- a/net-misc/bird/files/bird-2.0.12-musl-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -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?= <[email protected]> -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.7-gcc10.patch b/net-misc/bird/files/bird-2.0.7-gcc10.patch deleted file mode 100644 index 5ba3fdaef343..000000000000 --- a/net-misc/bird/files/bird-2.0.7-gcc10.patch +++ /dev/null @@ -1,12 +0,0 @@ -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] : "???"; } 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 deleted file mode 100644 index 4da5788fa4d4..000000000000 --- a/net-misc/bird/files/bird-2.0.9-musl-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bird.network.cz/pipermail/bird-users/2023-March/016743.html -See-also: https://bugs.gentoo.org/836713 -Signed-off-by: Petr Vaněk <arkamar at atlas.cz> ---- - 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..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); - -+ const char * io_error_str = strerror(EIO); -+ const int io_error_len = strlen(io_error_str); -+ - 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", 5); - - BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg"); - --- -2.39.2
