From 381998eb5e3ec0713e5535b999bbdcc0fa047473 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 29 Mar 2021 01:36:35 +0200 Subject: [PATCH] bird: update to 2.0.8 also patch printf_test so it does not fail on musl --- srcpkgs/bird/patches/fix-tests-musl.patch | 25 +++++++++++++++++++++++ srcpkgs/bird/template | 11 ++++------ 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/bird/patches/fix-tests-musl.patch diff --git a/srcpkgs/bird/patches/fix-tests-musl.patch b/srcpkgs/bird/patches/fix-tests-musl.patch new file mode 100644 index 000000000000..2bac77b009d1 --- /dev/null +++ b/srcpkgs/bird/patches/fix-tests-musl.patch @@ -0,0 +1,25 @@ +--- lib/printf_test.c ++++ lib/printf_test.c +@@ -22,6 +22,7 @@ static int + t_simple(void) + { + char buf[256]; ++ const char *errormsg; + memset(buf, 0xa5, 256); + + BSPRINTF(0, "", buf, "", NULL); +@@ -32,11 +33,12 @@ t_simple(void) + BSPRINTF(1, "@", buf, "@", 64); + BSPRINTF(1, "\xff", buf, "%c", 0xff); + +- errno = 5; +- BSPRINTF(18, "Input/output error", buf, "%m"); ++ errormsg = strerror(EIO); ++ errno = EIO; ++ BSPRINTF(strlen(errormsg), errormsg, buf, "%m"); + errno = 0; + +- BSPRINTF(18, "Input/output error", buf, "%M", 5); ++ BSPRINTF(strlen(errormsg), errormsg, buf, "%M", EIO); + + BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg"); diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template index 1b6dd7be22b8..bc40598b0360 100644 --- a/srcpkgs/bird/template +++ b/srcpkgs/bird/template @@ -1,7 +1,8 @@ # Template file for 'bird' pkgname=bird -version=2.0.7 -revision=2 +version=2.0.8 +revision=1 +wrksrc=bird-v$version build_style=gnu-configure hostmakedepends="flex autoconf" makedepends="ncurses-devel readline-devel libssh-devel" @@ -10,17 +11,13 @@ maintainer="Philipp Hirsch " license="GPL-2.0-or-later" homepage="https://bird.network.cz" distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz" -checksum=d0c6aeaaef3217d6210261a49751fc662838b55fec92f576e20938917dbf89ab +checksum=4d0eeea762dcd4422e1e276e2ed123cfed630cf1cce017b50463d79fcf2fff0c conf_files="/etc/bird.conf" system_accounts="_bird" CFLAGS="-fcommon" -post_extract() { - mv -v ${wrksrc/-/-v} $wrksrc -} - pre_configure() { autoreconf }