[PR PATCH] bird: update to 2.0.8

[PR PATCH] bird: update to 2.0.8

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]

There is a new pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages bird-v2.0.8
https://github.com/void-linux/void-packages/pull/29839

bird: update to 2.0.8
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/29839.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bird-v2.0.8-29839.patch --]
[-- Type: text/x-diff, Size: 1097 bytes --]

From e39bf1135a4ae9180856810dfe2ef67ce77d9b15 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 29 Mar 2021 01:36:35 +0200
Subject: [PATCH] bird: update to 2.0.8

---
 srcpkgs/bird/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 1b6dd7be22b8..c9226211c42c 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,7 +1,7 @@
 # Template file for 'bird'
 pkgname=bird
-version=2.0.7
-revision=2
+version=2.0.8
+revision=1
 build_style=gnu-configure
 hostmakedepends="flex autoconf"
 makedepends="ncurses-devel readline-devel libssh-devel"
@@ -10,7 +10,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 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"

Re: bird: update to 2.0.8

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 1710 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/29839#issuecomment-808997947

Comment:
It seems that the build fails on x86_64-musl with `XBPS_CHECK_PKGS=yes`. I have replicated this on my machine. Attaching logs from builds with and without checks. I have not noticed any problems yet, but my use of the package may not trigger it.

I have located the error in the check to the following tests in lib/printf_test.c:
```
  /* These tests fail.
   * from man 3 printf:
   *        m      (Glibc extension; supported by uClibc and musl.)  Print output of strerror(er‐
   *                      rno).  No argument is required.
   * Maybe libc problem?
  errno = 5;
  BSPRINTF(18, "Input/output error", buf, "%m");
   */
  /* printf("%m\n\0", buf);
   * outputs "I/O error" instead
   */
  /*
  errno = 0;

  BSPRINTF(18, "Input/output error", buf, "%M", 5);
  */
  /*
   * printf("%M\n\0", buf);
   * does not seem to output anything
   */
```

Anyway, the tests that do not pass don't seem very critical to the function of the package. If it's a libc issue it's a bit weird that it only manifests on x86_64 and none of the arm archs.

From musl-1.1.24 src/errno/__strerror.h:39
`E(EIO,          "I/O error")`
From man 3 errno
`       EIO             Input/output error (POSIX.1-2001).`

[bird-v2.0.8_build.log](https://github.com/void-linux/void-packages/files/6218463/bird-v2.0.8_build.log)
[bird-v2.0.8_build-with-checks.log](https://github.com/void-linux/void-packages/files/6218464/bird-v2.0.8_build-with-checks.log)
[printf_test.c.txt](https://github.com/void-linux/void-packages/files/6218550/printf_test.c.txt)

Re: bird: update to 2.0.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29839#issuecomment-809006457

Comment:
I can look into this later tomorrow, will assign myself so I don't forget. Thanks for the investigation.

Re: bird: update to 2.0.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29839#issuecomment-809607767

Comment:
Please apply:

```diff
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index 1b6dd7be22..fbdf5c7734 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -2,6 +2,7 @@
 pkgname=bird
 version=2.0.7
 revision=2
+wrksrc=bird-v$version
 build_style=gnu-configure
 hostmakedepends="flex autoconf"
 makedepends="ncurses-devel readline-devel libssh-devel"
@@ -17,10 +18,6 @@ system_accounts="_bird"
 
 CFLAGS="-fcommon"
 
-post_extract() {
-	mv -v ${wrksrc/-/-v} $wrksrc
-}
-
 pre_configure() {
 	autoreconf
 }
```

The musl test failure already existed, so we can investigate it after merging, if you prefer (please open an issue, in that case).

Re: bird: update to 2.0.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29839#issuecomment-809616297

Comment:
The failing test can be left as is, I will reach out to upstream musl.

Re: bird: update to 2.0.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1001 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29839#issuecomment-809620671

Comment:
Actually, please add this patch:

```
diff --git a/lib/printf_test.c b/lib/printf_test.c
index 47ea905..2ec5814 100644
--- a/lib/printf_test.c
+++ b/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");
 
```

And please look into upstreaming it :)

Re: [PR PATCH] [Updated] bird: update to 2.0.8

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages bird-v2.0.8
https://github.com/void-linux/void-packages/pull/29839

bird: update to 2.0.8
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/29839.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bird-v2.0.8-29839.patch --]
[-- Type: text/x-diff, Size: 2362 bytes --]

From 381998eb5e3ec0713e5535b999bbdcc0fa047473 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
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 <itself@hanspolo.net>"
 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
 }

Re: bird: update to 2.0.8

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/29839#issuecomment-809646006

Comment:
Updated to address issues, confirmed that tests pass with the patch. I may look at upstreaming to bird later. Thanks for the help :)

Re: [PR PATCH] [Merged]: bird: update to 2.0.8

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1424 bytes --]

There's a merged pull request on the void-packages repository

bird: update to 2.0.8
https://github.com/void-linux/void-packages/pull/29839

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl