Skip to contentSkip to conversation

package/bird: bump version to 2.0.3

PATCH Superseded Adrien Gallouët 3 participants 9 messages Feb 4, 2019 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/bird: bump version to 2.0.3

---
 ...fix-installation-with-disable-client.patch | 41 -------------------
 package/bird/bird.hash                        |  4 +-
 package/bird/bird.mk                          |  5 ++-
 3 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch
package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch deleted +0 -41
deleted file mode 100644
index c0faec21b0..0000000000
@@ -1,41 +0,0 @@
-From 6cb15abfc00cb5e492175a9efc71bfdfd1aa457c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 9 Oct 2018 12:51:08 +0200
-Subject: [PATCH] Makefile.in: fix installation with --disable-client
-
-The configure.ac script initializes the CLIENT variable this way:
-
-CLIENT=birdcl
-if client enabled
- CLIENT=$CLIENT birdc
-fi
-
-This means that checking if @CLIENT@ is empty to decide whether birdc
-should be installed or not doesn't work, and causes a failure at
-installation time when --disable-client is passed.
-
-Instead, check if the birdc binary has been produced or not to decide
-whether it should be installed.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: http://trubka.network.cz/pipermail/bird-users/2018-October/012763.html
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c8168bbe..fea3683e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,7 +171,7 @@ install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
--	if test -n "@CLIENT@" ; then								\
-+	if test -f $(exedir)/birdc ; then							\
- 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
- 	fi
- 	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
--- 
-2.14.4
-
package/bird/bird.hash +2 -2
index 449e8afd8d..0570373ad3 100644
@@ -1,2 +1,2 @@
-sha256 bd42d48fbcc2c0046d544f1183cd98193ff15b792d332ff45f386b0180b09335  bird-v2.0.2.tar.gz
-sha256 f018596a97af0108efc446320631e2fddc0c1d1f3ffab3129327ccdb4f0c29ed  README
+sha256 54ec151518564f87e81de4ac19376689e5ba8dd9129f1e9a79086db3df0931f8  bird-v2.0.3.tar.gz
+sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2  README
package/bird/bird.mk +3 -2
index 297e21dd95..1253137afa 100644
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-BIRD_VERSION = v2.0.2
-BIRD_SITE = $(call github,BIRD,bird,$(BIRD_VERSION))
+BIRD_VERSION = v2.0.3
+BIRD_SOURCE = bird-$(BIRD_VERSION).tar.gz
+BIRD_SITE = https://gitlab.labs.nic.cz/labs/bird/-/archive/$(BIRD_VERSION)
 BIRD_LICENSE = GPL-2.0+
 BIRD_LICENSE_FILES = README
 # autoreconf is needed since the package is fetched from github
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 package/bird: bump version to 2.0.3

Hi Adrien,

Quoted 7 lines · Adrien Gallou?t
---
 ...fix-installation-with-disable-client.patch | 41 -------------------
 package/bird/bird.hash                        |  4 +-
 package/bird/bird.mk                          |  5 ++-
 3 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch

Please explain in the commit log why this patch is no longer needed.

Quoted 53 lines
package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch deleted +0 -41
deleted file mode 100644
index c0faec21b0..0000000000
@@ -1,41 +0,0 @@
-From 6cb15abfc00cb5e492175a9efc71bfdfd1aa457c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 9 Oct 2018 12:51:08 +0200
-Subject: [PATCH] Makefile.in: fix installation with --disable-client
-
-The configure.ac script initializes the CLIENT variable this way:
-
-CLIENT=birdcl
-if client enabled
- CLIENT=$CLIENT birdc
-fi
-
-This means that checking if @CLIENT@ is empty to decide whether birdc
-should be installed or not doesn't work, and causes a failure at
-installation time when --disable-client is passed.
-
-Instead, check if the birdc binary has been produced or not to decide
-whether it should be installed.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: http://trubka.network.cz/pipermail/bird-users/2018-October/012763.html
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c8168bbe..fea3683e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,7 +171,7 @@ install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
--	if test -n "@CLIENT@" ; then								\
-+	if test -f $(exedir)/birdc ; then							\
- 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
- 	fi
- 	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
--- 
-2.14.4
-
package/bird/bird.hash +0 -0
index 449e8afd8d..0570373ad3 100644

package/bird/bird.hash line 2

Quoted 4 lines
package/bird/bird.hash +2 -2
@@ -1,2 +1,2 @@
-sha256 bd42d48fbcc2c0046d544f1183cd98193ff15b792d332ff45f386b0180b09335  bird-v2.0.2.tar.gz
-sha256 f018596a97af0108efc446320631e2fddc0c1d1f3ffab3129327ccdb4f0c29ed  README
+sha256 54ec151518564f87e81de4ac19376689e5ba8dd9129f1e9a79086db3df0931f8  bird-v2.0.3.tar.gz
+sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2  README

Since you update the license file hash the commit log should say whether these changes affect the license.

package/bird/bird.mk line 8

Quoted 12 lines
package/bird/bird.mk +2 -2
index 297e21dd95..1253137afa 100644
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-BIRD_VERSION = v2.0.2
-BIRD_SITE = $(call github,BIRD,bird,$(BIRD_VERSION))
+BIRD_VERSION = v2.0.3
+BIRD_SOURCE = bird-$(BIRD_VERSION).tar.gz

This is the value for <PKG>_SOURCE. You can drop it.

package/bird/bird.mk line 12

Quoted 4 lines
package/bird/bird.mk +1 -0
+BIRD_SITE = https://gitlab.labs.nic.cz/labs/bird/-/archive/$(BIRD_VERSION)
 BIRD_LICENSE = GPL-2.0+
 BIRD_LICENSE_FILES = README
 # autoreconf is needed since the package is fetched from github

This comment is now outdated.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#2 lore raw

PATCH v2 1/1 package/bird: bump version to 2.0.3

Patch 0001 is no longer needed as it has been ported to this version. Also, the README changes but the licence is still GPL-2.0+

---
 ...fix-installation-with-disable-client.patch | 41 -------------------
 package/bird/bird.hash                        |  4 +-
 package/bird/bird.mk                          |  6 +--
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch
package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch deleted +0 -41
deleted file mode 100644
index c0faec21b0..0000000000
@@ -1,41 +0,0 @@
-From 6cb15abfc00cb5e492175a9efc71bfdfd1aa457c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 9 Oct 2018 12:51:08 +0200
-Subject: [PATCH] Makefile.in: fix installation with --disable-client
-
-The configure.ac script initializes the CLIENT variable this way:
-
-CLIENT=birdcl
-if client enabled
- CLIENT=$CLIENT birdc
-fi
-
-This means that checking if @CLIENT@ is empty to decide whether birdc
-should be installed or not doesn't work, and causes a failure at
-installation time when --disable-client is passed.
-
-Instead, check if the birdc binary has been produced or not to decide
-whether it should be installed.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: http://trubka.network.cz/pipermail/bird-users/2018-October/012763.html
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c8168bbe..fea3683e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,7 +171,7 @@ install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
--	if test -n "@CLIENT@" ; then								\
-+	if test -f $(exedir)/birdc ; then							\
- 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
- 	fi
- 	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
--- 
-2.14.4
-
package/bird/bird.hash +2 -2
index 449e8afd8d..0570373ad3 100644
@@ -1,2 +1,2 @@
-sha256 bd42d48fbcc2c0046d544f1183cd98193ff15b792d332ff45f386b0180b09335  bird-v2.0.2.tar.gz
-sha256 f018596a97af0108efc446320631e2fddc0c1d1f3ffab3129327ccdb4f0c29ed  README
+sha256 54ec151518564f87e81de4ac19376689e5ba8dd9129f1e9a79086db3df0931f8  bird-v2.0.3.tar.gz
+sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2  README
package/bird/bird.mk +3 -3
index 297e21dd95..9be0f6e17d 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-BIRD_VERSION = v2.0.2
-BIRD_SITE = $(call github,BIRD,bird,$(BIRD_VERSION))
+BIRD_VERSION = v2.0.3
+BIRD_SITE = https://gitlab.labs.nic.cz/labs/bird/-/archive/$(BIRD_VERSION)
 BIRD_LICENSE = GPL-2.0+
 BIRD_LICENSE_FILES = README
-# autoreconf is needed since the package is fetched from github
+# autoreconf is needed since the package is fetched from gitlab
 BIRD_AUTORECONF = YES
 BIRD_DEPENDENCIES = host-flex host-bison
 
Signature · 1 line
2.19.1
#3 lore raw

PATCH v2 1/1 package/bird: bump version to 2.0.3

Hello Adrien,

Thanks for this new iteration.

package/bird/bird.mk line 8

Quoted 12 lines · On Mon, 4 Feb 2019 10:02:01 +0000 Adrien Gallou?t <[email protected]> wrote:
package/bird/bird.mk +2 -2
index 297e21dd95..9be0f6e17d 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-BIRD_VERSION = v2.0.2
-BIRD_SITE = $(call github,BIRD,bird,$(BIRD_VERSION))
+BIRD_VERSION = v2.0.3
+BIRD_SITE = https://gitlab.labs.nic.cz/labs/bird/-/archive/$(BIRD_VERSION)

Is the tarball auto-generated by gitlab stable over time ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

A message that is not in the archive (sent off-list or not yet received): CAFtSRGAAkpuyg7==BY7oQ++_uWTeYaZZnA9GjrB2aNXTazQj8Q@mail.gmail.com

#5 lore raw

PATCH v2 1/1 package/bird: bump version to 2.0.3

Hello,

Please keep the mailing list in Cc and avoid top-posting. Thanks!

Quoted 3 lines · On Mon, 4 Feb 2019 15:17:44 +0100 Adrien Gallou?t <[email protected]> wrote:

Hi,
Yes (I think). We can still download the first tag of BIRD released 9yrs ago.

Well, that it is not really the question I was asking. My question is whether this tarball is always *exactly* identical. As you say, it's a tarball generated automatically. Since we store a hash of the tarball in bird.hash, if gitlab does some subtle changes in how the tarball is generated, the hash will change, breaking the download.

We had this issue with Github in the past.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH v2 1/1 package/bird: bump version to 2.0.3

Quoted 4 lines · Thomas Petazzoni

Hello,

Please keep the mailing list in Cc and avoid top-posting. Thanks!

Sorry, I'll double check from now :)

Quoted 8 lines
Quoted 3 lines · On Mon, 4 Feb 2019 15:17:44 +0100 Adrien Gallou?t <[email protected]> wrote:

Hi,
Yes (I think). We can still download the first tag of BIRD released 9yrs ago.

Quoted 5 lines

Well, that it is not really the question I was asking. My question is whether this tarball is always *exactly* identical. As you say, it's a tarball generated automatically. Since we store a hash of the tarball in bird.hash, if gitlab does some subtle changes in how the tarball is generated, the hash will change, breaking the download.

They moved from something like archive.tar.gz?ref=<ref> to <repo>-<ref>.tar.gz so there is no guarantee AFAIK but they are sensible to this like github.

BIRD ppl use an ftp server: ftp://bird.network.cz/pub/bird/ for packaging maybe it is preferable to use it ?

Quoted 10 lines

We had this issue with Github in the past.

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#7 lore raw

PATCH v2 1/1 package/bird: bump version to 2.0.3

Hello,

Quoted 2 lines · On Mon, 4 Feb 2019 16:03:25 +0100 Adrien Gallou?t <[email protected]> wrote:

BIRD ppl use an ftp server: ftp://bird.network.cz/pub/bird/ for packaging maybe it is preferable to use it ?

Yes, please use a tarball from there instead. Much better.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH v3 1/1 package/bird: bump version to 2.0.3

Patch 0001 is no longer needed as it has been ported to this version. Also, the README changes but the licence is still GPL-2.0+

---
 ...fix-installation-with-disable-client.patch | 41 -------------------
 package/bird/bird.hash                        |  4 +-
 package/bird/bird.mk                          |  6 +--
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch
package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch deleted +0 -41
deleted file mode 100644
index c0faec21b0..0000000000
@@ -1,41 +0,0 @@
-From 6cb15abfc00cb5e492175a9efc71bfdfd1aa457c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 9 Oct 2018 12:51:08 +0200
-Subject: [PATCH] Makefile.in: fix installation with --disable-client
-
-The configure.ac script initializes the CLIENT variable this way:
-
-CLIENT=birdcl
-if client enabled
- CLIENT=$CLIENT birdc
-fi
-
-This means that checking if @CLIENT@ is empty to decide whether birdc
-should be installed or not doesn't work, and causes a failure at
-installation time when --disable-client is passed.
-
-Instead, check if the birdc binary has been produced or not to decide
-whether it should be installed.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: http://trubka.network.cz/pipermail/bird-users/2018-October/012763.html
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c8168bbe..fea3683e 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -171,7 +171,7 @@ install: all
- 	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
--	if test -n "@CLIENT@" ; then								\
-+	if test -f $(exedir)/birdc ; then							\
- 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc ;		\
- 	fi
- 	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
--- 
-2.14.4
-
package/bird/bird.hash +2 -2
index 449e8afd8d..3f3a93b964 100644
@@ -1,2 +1,2 @@
-sha256 bd42d48fbcc2c0046d544f1183cd98193ff15b792d332ff45f386b0180b09335  bird-v2.0.2.tar.gz
-sha256 f018596a97af0108efc446320631e2fddc0c1d1f3ffab3129327ccdb4f0c29ed  README
+sha256 0f49b38327d3109553acfa662ac0cf0377719226a03c124cd2e0ea2265ecb1de  bird-2.0.3.tar.gz
+sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2  README
package/bird/bird.mk +2 -4
index 297e21dd95..da2f868070 100644
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-BIRD_VERSION = v2.0.2
-BIRD_SITE = $(call github,BIRD,bird,$(BIRD_VERSION))
+BIRD_VERSION = 2.0.3
+BIRD_SITE = ftp://bird.network.cz/pub/bird
 BIRD_LICENSE = GPL-2.0+
 BIRD_LICENSE_FILES = README
-# autoreconf is needed since the package is fetched from github
-BIRD_AUTORECONF = YES
 BIRD_DEPENDENCIES = host-flex host-bison
 
 ifeq ($(BR2_PACKAGE_BIRD_CLIENT),y)
Signature · 1 line
2.19.1
#9 lore raw

PATCH v3 1/1 package/bird: bump version to 2.0.3

Quoted 10 lines · On Mon, 4 Feb 2019 15:22:51 +0000 Adrien Gallou?t <[email protected]> wrote:

Patch 0001 is no longer needed as it has been ported to this version. Also, the README changes but the licence is still GPL-2.0+

---
 ...fix-installation-with-disable-client.patch | 41 -------------------
 package/bird/bird.hash                        |  4 +-
 package/bird/bird.mk                          |  6 +--
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 package/bird/0001-Makefile.in-fix-installation-with-disable-client.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com