* [PR PATCH] bird: update to 2.0.10
@ 2022-07-03 18:46 klarasm
2022-07-03 21:26 ` [PR REVIEW] " paper42
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: klarasm @ 2022-07-03 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is a new pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages bird-update
https://github.com/void-linux/void-packages/pull/37820
bird: update to 2.0.10
- upstream has dropped the 'v' in version so remove custom worksrc and
update distfile
- remove patch for babel as it already is upstream
- add changelog
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/37820.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bird-update-37820.patch --]
[-- Type: text/x-diff, Size: 2997 bytes --]
From aca3258393a5fa37a9bcbb51d6aee69270ab3851 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 3 Jul 2022 20:25:26 +0200
Subject: [PATCH] bird: update to 2.0.10
- upstream has dropped the 'v' in version so remove custom worksrc and
update distfile
- remove patch for babel as it already is upstream
- add changelog
---
...bel-Fix-bug-in-iface-reconfiguration.patch | 29 -------------------
srcpkgs/bird/template | 10 +++----
2 files changed, 5 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
diff --git a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
deleted file mode 100644
index bc809171e493..000000000000
--- a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fcb4dd0c831339c4374ace17d8f2ae6ebfeed279 Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
-Date: Sun, 27 Feb 2022 03:10:38 +0100
-Subject: [PATCH] Babel: Fix bug in iface reconfiguration
-
-A recent change in Babel causes ifaces to disappear after
-reconfiguration. The patch fixes that.
-
-Thanks to Johannes Kimmel for an insightful bugreport.
----
- proto/babel/babel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proto/babel/babel.c b/proto/babel/babel.c
-index e43818f5..174fc9e2 100644
---- a/proto/babel/babel.c
-+++ b/proto/babel/babel.c
-@@ -1899,7 +1899,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
- struct babel_iface *ifa = babel_find_iface(p, iface);
- struct babel_iface_config *ic = (void *) iface_patt_find(&cf->iface_list, iface, NULL);
-
-- if (ic && iface_is_valid(p, iface))
-+ if (ic && !iface_is_valid(p, iface))
- ic = NULL;
-
- if (ifa && ic)
---
-2.35.1
-
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index f2351acd7286..f17017e2d187 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,8 +1,7 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.9
-revision=2
-wrksrc=bird-v$version
+version=2.0.10
+revision=1
build_style=gnu-configure
hostmakedepends="flex autoconf"
makedepends="ncurses-devel readline-devel libssh-devel"
@@ -10,8 +9,9 @@ short_desc="BIRD Internet Routing Daemon"
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=912d5c1bbefffd6198b10688ef6e16d0b9dfb2886944f481fc38b4d869ffd2c4
+changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
+distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/${version}/bird-${version}.tar.gz"
+checksum=ea83dd15ff41024b08ae6fada8e725efae93079dbe83654edd52faabd0acd616
conf_files="/etc/bird.conf"
system_accounts="_bird"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] bird: update to 2.0.10
2022-07-03 18:46 [PR PATCH] bird: update to 2.0.10 klarasm
@ 2022-07-03 21:26 ` paper42
2022-07-04 18:47 ` klarasm
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-07-03 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37820#discussion_r912538519
Comment:
Could we use this tarball instead?
```suggestion
distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
```
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] bird: update to 2.0.10
2022-07-03 18:46 [PR PATCH] bird: update to 2.0.10 klarasm
2022-07-03 21:26 ` [PR REVIEW] " paper42
@ 2022-07-04 18:47 ` klarasm
2022-07-04 18:47 ` [PR PATCH] [Updated] " klarasm
2022-07-04 22:15 ` [PR PATCH] [Merged]: " paper42
3 siblings, 0 replies; 5+ messages in thread
From: klarasm @ 2022-07-04 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by klarasm on void-packages repository
https://github.com/void-linux/void-packages/pull/37820#discussion_r913224185
Comment:
Yeah, that one seems more consistent historically.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] bird: update to 2.0.10
2022-07-03 18:46 [PR PATCH] bird: update to 2.0.10 klarasm
2022-07-03 21:26 ` [PR REVIEW] " paper42
2022-07-04 18:47 ` klarasm
@ 2022-07-04 18:47 ` klarasm
2022-07-04 22:15 ` [PR PATCH] [Merged]: " paper42
3 siblings, 0 replies; 5+ messages in thread
From: klarasm @ 2022-07-04 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages bird-update
https://github.com/void-linux/void-packages/pull/37820
bird: update to 2.0.10
- upstream has dropped the 'v' in version so remove custom worksrc and
update distfile
- remove patch for babel as it already is upstream
- add changelog
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/37820.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bird-update-37820.patch --]
[-- Type: text/x-diff, Size: 3143 bytes --]
From ecd16daf692b7fb13e5d4ccc23c094fdca656595 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 3 Jul 2022 20:25:26 +0200
Subject: [PATCH] bird: update to 2.0.10
- change to a better mirror for source (this eliminates the need to
run autoreconf as it's done by upstream and a custom worksrc is not
needed either)
- remove patch for babel as it already is upstream
- add changelog
---
...bel-Fix-bug-in-iface-reconfiguration.patch | 29 -------------------
srcpkgs/bird/template | 16 ++++------
2 files changed, 6 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
diff --git a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch b/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
deleted file mode 100644
index bc809171e493..000000000000
--- a/srcpkgs/bird/patches/0001-Babel-Fix-bug-in-iface-reconfiguration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fcb4dd0c831339c4374ace17d8f2ae6ebfeed279 Mon Sep 17 00:00:00 2001
-From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
-Date: Sun, 27 Feb 2022 03:10:38 +0100
-Subject: [PATCH] Babel: Fix bug in iface reconfiguration
-
-A recent change in Babel causes ifaces to disappear after
-reconfiguration. The patch fixes that.
-
-Thanks to Johannes Kimmel for an insightful bugreport.
----
- proto/babel/babel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proto/babel/babel.c b/proto/babel/babel.c
-index e43818f5..174fc9e2 100644
---- a/proto/babel/babel.c
-+++ b/proto/babel/babel.c
-@@ -1899,7 +1899,7 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct babel_config *cf)
- struct babel_iface *ifa = babel_find_iface(p, iface);
- struct babel_iface_config *ic = (void *) iface_patt_find(&cf->iface_list, iface, NULL);
-
-- if (ic && iface_is_valid(p, iface))
-+ if (ic && !iface_is_valid(p, iface))
- ic = NULL;
-
- if (ifa && ic)
---
-2.35.1
-
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index f2351acd7286..e10b66e72742 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,27 +1,23 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.9
-revision=2
-wrksrc=bird-v$version
+version=2.0.10
+revision=1
build_style=gnu-configure
-hostmakedepends="flex autoconf"
+hostmakedepends="flex"
makedepends="ncurses-devel readline-devel libssh-devel"
short_desc="BIRD Internet Routing Daemon"
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=912d5c1bbefffd6198b10688ef6e16d0b9dfb2886944f481fc38b4d869ffd2c4
+changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
+distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
+checksum=7ed341ddd8dc87fa9736586b3515447a8436fec442d65f4022155ab9de1ffd5a
conf_files="/etc/bird.conf"
system_accounts="_bird"
CFLAGS="-fcommon"
-pre_configure() {
- autoreconf
-}
-
post_install() {
vsv bird
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: bird: update to 2.0.10
2022-07-03 18:46 [PR PATCH] bird: update to 2.0.10 klarasm
` (2 preceding siblings ...)
2022-07-04 18:47 ` [PR PATCH] [Updated] " klarasm
@ 2022-07-04 22:15 ` paper42
3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-07-04 22:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
There's a merged pull request on the void-packages repository
bird: update to 2.0.10
https://github.com/void-linux/void-packages/pull/37820
Description:
- upstream has dropped the 'v' in version so remove custom worksrc and
update distfile
- remove patch for babel as it already is upstream
- add changelog
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- aarch64-musl
- armv7l
- armv6l-musl
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-04 22:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-03 18:46 [PR PATCH] bird: update to 2.0.10 klarasm
2022-07-03 21:26 ` [PR REVIEW] " paper42
2022-07-04 18:47 ` klarasm
2022-07-04 18:47 ` [PR PATCH] [Updated] " klarasm
2022-07-04 22:15 ` [PR PATCH] [Merged]: " paper42
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).