From: klarasm <klarasm@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] bird: update to 2.0.8
Date: Mon, 29 Mar 2021 21:12:59 +0200 [thread overview]
Message-ID: <20210329191259.hnmra0m_r9DYvahCpsMGCugb23IuUGj4KXLcH6Rp26E@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29839@inbox.vuxu.org>
[-- 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
}
next prev parent reply other threads:[~2021-03-29 19:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-28 23:46 [PR PATCH] " klarasm
2021-03-29 0:54 ` klarasm
2021-03-29 1:29 ` ericonr
2021-03-29 18:23 ` ericonr
2021-03-29 18:36 ` ericonr
2021-03-29 18:43 ` ericonr
2021-03-29 19:12 ` klarasm [this message]
2021-03-29 19:22 ` klarasm
2021-03-29 19:58 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210329191259.hnmra0m_r9DYvahCpsMGCugb23IuUGj4KXLcH6Rp26E@z \
--to=klarasm@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).