From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3401215802F for ; Tue, 7 Mar 2023 07:10:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71A56E0843; Tue, 7 Mar 2023 07:10:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45F9BE0843 for ; Tue, 7 Mar 2023 07:10:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80D663410F4 for ; Tue, 7 Mar 2023 07:10:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F00F8888 for ; Tue, 7 Mar 2023 07:10:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678173002.4029824a2813d5d5957e1f27f6bc6ebab6b34646.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/bird/files/, net-misc/bird/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/bird/bird-2.0.10.ebuild net-misc/bird/bird-2.0.9.ebuild net-misc/bird/files/bird-2.0.9-musl-tests.patch X-VCS-Directories: net-misc/bird/ net-misc/bird/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4029824a2813d5d5957e1f27f6bc6ebab6b34646 X-VCS-Branch: master Date: Tue, 7 Mar 2023 07:10:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19f707dd-4353-4b3d-acc6-10778e3f1848 X-Archives-Hash: 73c13eb8f2e7adc83ac115a6a4b310fe commit: 4029824a2813d5d5957e1f27f6bc6ebab6b34646 Author: Alarig Le Lay swordarmor fr> AuthorDate: Mon Mar 6 20:11:51 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 7 07:10:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4029824a net-misc/bird: fixing tests on MUSL Closes: https://bugs.gentoo.org/836713 Signed-off-by: Alarig Le Lay swordarmor.fr> Closes: https://github.com/gentoo/gentoo/pull/29962 Signed-off-by: Sam James gentoo.org> net-misc/bird/bird-2.0.10.ebuild | 6 +++- net-misc/bird/bird-2.0.9.ebuild | 6 +++- net-misc/bird/files/bird-2.0.9-musl-tests.patch | 43 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/net-misc/bird/bird-2.0.10.ebuild b/net-misc/bird/bird-2.0.10.ebuild index 7301cfefc2dd..05e00dc95fd6 100644 --- a/net-misc/bird/bird-2.0.10.ebuild +++ b/net-misc/bird/bird-2.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,6 +36,10 @@ FILECAPS=( CAP_NET_RAW usr/sbin/bird ) +PATCHES=( + "${FILESDIR}/${PN}-2.0.9-musl-tests.patch" +) + src_prepare() { default eautoreconf diff --git a/net-misc/bird/bird-2.0.9.ebuild b/net-misc/bird/bird-2.0.9.ebuild index d04ea9812f50..31d6bb48520a 100644 --- a/net-misc/bird/bird-2.0.9.ebuild +++ b/net-misc/bird/bird-2.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -37,6 +37,10 @@ FILECAPS=( CAP_NET_RAW usr/sbin/bird ) +PATCHES=( + "${FILESDIR}/${P}-musl-tests.patch" +) + src_prepare() { default 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 new file mode 100644 index 000000000000..df6e00e04dfe --- /dev/null +++ b/net-misc/bird/files/bird-2.0.9-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?= +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 +