~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
2 2

[alpine-aports] [PATCH] testing/bird: update to 1.5.0

Francesco Zanini
Details
Message ID
<1444807602-2799-1-git-send-email-francesco@zanini.me>
Sender timestamp
1444807602
DKIM signature
missing
Download raw message
Patch: +12 -28
http://bird.network.cz/
The BIRD Internet Routing Daemon
---
 testing/bird/APKBUILD                      | 26 +++++++++++---------------
 testing/bird/bird-1.4.0-readline-6.3.patch | 12 ------------
 testing/bird/bird.initd                    |  2 +-
 3 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 testing/bird/bird-1.4.0-readline-6.3.patch

diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index 3713b80..f66d854 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -1,19 +1,18 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Francesco Zanini <francesco@zanini.me>
+# Maintainer: Francesco Zanini <francesco@zanini.me>
 pkgname=bird
-pkgver=1.4.0
+pkgver=1.5.0
 pkgrel=0
 pkgdesc="BIRD Internet Routing Daemon"
 url="http://bird.network.cz/"
 arch="all"
 license="GPLv2+"
 depends=""
-makedepends="bison flex ncurses-dev readline-dev"
+makedepends="bison flex ncurses-dev readline-dev linux-headers"
 install=""
 subpackages="bird6"
 source="ftp://bird.network.cz/pub/bird/bird-$pkgver.tar.gz
-	bird.initd
-	bird-1.4.0-readline-6.3.patch"
+	bird.initd"
 
 _builddir="$srcdir"/bird-$pkgver
 prepare() {
@@ -71,12 +70,9 @@ bird6() {
 	done
 }
 
-md5sums="4e5a47308335b1b0bf4691cac6c4174f  bird-1.4.0.tar.gz
-4d58a7c5e495a4544b6e602a3ad658d3  bird.initd
-57d11d57eebbc091249dd6344ab38097  bird-1.4.0-readline-6.3.patch"
-sha256sums="da1b41cab26388b01d861c30afe41678df22dc9ea0110a14c1cc7b7bffc693c5  bird-1.4.0.tar.gz
-88250ff48068d994a2b82dd62e14c836a7a1074637b52ae0360347db25253696  bird.initd
-bff7a3b6ae0522443ed6a541367113587170fd7533f5e7c309772c5beaf69bd5  bird-1.4.0-readline-6.3.patch"
-sha512sums="9a485999278a60568a6c5cabf36b84535312c82022813e52015676192d313fde9daf03a56aba92d956c31c4bca1f79089e354c932c59ace48ebb251882c232c6  bird-1.4.0.tar.gz
-def255018b9b288bcce6e4fd5c7ad2b559f3d92b73cba7e2761abb98a37935940fdbb7c7323f442e046dd12e219abf1190d98c5fb380f13d8bac0f2d2d66b269  bird.initd
-6945ba00f24879c5e4d98faa0429dbee2e1f54ba32fc4436a1337b015e2ea09f265ae330002b74084f7fe5434b8afca669d3ddbf424e6ad932c6e790f0b13a3c  bird-1.4.0-readline-6.3.patch"
+md5sums="330bde6372afa106abfe5a9737e471c1  bird-1.5.0.tar.gz
+4d58a7c5e495a4544b6e602a3ad658d3  bird.initd"
+sha256sums="79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d  bird-1.5.0.tar.gz
+88250ff48068d994a2b82dd62e14c836a7a1074637b52ae0360347db25253696  bird.initd"
+sha512sums="6814a1393d192083bc9807fd9c56e4bfe169aa34b70811f10da61c79d2fd4b18827bd4f3ea70d9ceba32125e54afb3f8df388416bff619c6f7e838a171f70ae8  bird-1.5.0.tar.gz
+def255018b9b288bcce6e4fd5c7ad2b559f3d92b73cba7e2761abb98a37935940fdbb7c7323f442e046dd12e219abf1190d98c5fb380f13d8bac0f2d2d66b269  bird.initd"
diff --git a/testing/bird/bird-1.4.0-readline-6.3.patch b/testing/bird/bird-1.4.0-readline-6.3.patch
deleted file mode 100644
index 4e569f0..0000000
--- a/testing/bird/bird-1.4.0-readline-6.3.patch
@@ -1,12 +0,0 @@
-diff -rupN a/client/birdc.c b/client/birdc.c
---- a/client/birdc.c	2013-11-23 13:29:53.000000000 +0100
-+++ b/client/birdc.c	2014-03-22 13:09:40.278580657 +0100
-@@ -29,7 +29,7 @@ static int prompt_active;
- /* HACK: libreadline internals we need to access */
- extern int _rl_vis_botlin;
- extern void _rl_move_vert(int);
--extern Function *rl_last_func;
-+extern rl_command_func_t *rl_last_func;
- 
- static void
- add_history_dedup(char *cmd)
diff --git a/testing/bird/bird.initd b/testing/bird/bird.initd
index f3b51aa..3685af0 100644
--- a/testing/bird/bird.initd
+++ b/testing/bird/bird.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 extra_started_commands="reload"
 
-- 
2.4.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20151015091110.07ab2492@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1444807602-2799-1-git-send-email-francesco@zanini.me> (view parent)
Sender timestamp
1444893070
DKIM signature
missing
Download raw message
On Wed, 14 Oct 2015 09:26:42 +0200
Francesco Zanini <francesco@zanini.me> wrote:

> http://bird.network.cz/
> The BIRD Internet Routing Daemon
> ---
>  testing/bird/APKBUILD                      | 26 +++++++++++---------------
>  testing/bird/bird-1.4.0-readline-6.3.patch | 12 ------------
>  testing/bird/bird.initd                    |  2 +-
>  3 files changed, 12 insertions(+), 28 deletions(-)
>  delete mode 100644 testing/bird/bird-1.4.0-readline-6.3.patch


>>> bird: Checking sha512sums...
bird-1.5.0.tar.gz: OK
bird.initd: FAILED
sha512sum: WARNING: 1 of 1 computed checksums did NOT match
>>> ERROR: bird: all failed


I am not sure if the checksum is wrong or if there was an unintentional
change in the script. Care to resend with fixed checksum?

http://wiki.alpinelinux.org/wiki/Creating_patches#Resend_an_updated_patch

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH v2] testing/bird: update to 1.5.0

Francesco Zanini
Details
Message ID
<1444902551-2543-1-git-send-email-francesco@zanini.me>
In-Reply-To
<20151015091110.07ab2492@ncopa-desktop.alpinelinux.org> (view parent)
Sender timestamp
1444902551
DKIM signature
missing
Download raw message
Patch: +12 -28
http://bird.network.cz/
The BIRD Internet Routing Daemon
---
Changes v1 -> v2:
  - Fix checksum of init script

 testing/bird/APKBUILD                      | 26 +++++++++++---------------
 testing/bird/bird-1.4.0-readline-6.3.patch | 12 ------------
 testing/bird/bird.initd                    |  2 +-
 3 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 testing/bird/bird-1.4.0-readline-6.3.patch

diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index 3713b80..86c1433 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -1,19 +1,18 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Francesco Zanini <francesco@zanini.me>
+# Maintainer: Francesco Zanini <francesco@zanini.me>
 pkgname=bird
-pkgver=1.4.0
+pkgver=1.5.0
 pkgrel=0
 pkgdesc="BIRD Internet Routing Daemon"
 url="http://bird.network.cz/"
 arch="all"
 license="GPLv2+"
 depends=""
-makedepends="bison flex ncurses-dev readline-dev"
+makedepends="bison flex ncurses-dev readline-dev linux-headers"
 install=""
 subpackages="bird6"
 source="ftp://bird.network.cz/pub/bird/bird-$pkgver.tar.gz
-	bird.initd
-	bird-1.4.0-readline-6.3.patch"
+	bird.initd"
 
 _builddir="$srcdir"/bird-$pkgver
 prepare() {
@@ -71,12 +70,9 @@ bird6() {
 	done
 }
 
-md5sums="4e5a47308335b1b0bf4691cac6c4174f  bird-1.4.0.tar.gz
-4d58a7c5e495a4544b6e602a3ad658d3  bird.initd
-57d11d57eebbc091249dd6344ab38097  bird-1.4.0-readline-6.3.patch"
-sha256sums="da1b41cab26388b01d861c30afe41678df22dc9ea0110a14c1cc7b7bffc693c5  bird-1.4.0.tar.gz
-88250ff48068d994a2b82dd62e14c836a7a1074637b52ae0360347db25253696  bird.initd
-bff7a3b6ae0522443ed6a541367113587170fd7533f5e7c309772c5beaf69bd5  bird-1.4.0-readline-6.3.patch"
-sha512sums="9a485999278a60568a6c5cabf36b84535312c82022813e52015676192d313fde9daf03a56aba92d956c31c4bca1f79089e354c932c59ace48ebb251882c232c6  bird-1.4.0.tar.gz
-def255018b9b288bcce6e4fd5c7ad2b559f3d92b73cba7e2761abb98a37935940fdbb7c7323f442e046dd12e219abf1190d98c5fb380f13d8bac0f2d2d66b269  bird.initd
-6945ba00f24879c5e4d98faa0429dbee2e1f54ba32fc4436a1337b015e2ea09f265ae330002b74084f7fe5434b8afca669d3ddbf424e6ad932c6e790f0b13a3c  bird-1.4.0-readline-6.3.patch"
+md5sums="330bde6372afa106abfe5a9737e471c1  bird-1.5.0.tar.gz
+47e25c48363125156e8b61680685c1bc  bird.initd"
+sha256sums="79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d  bird-1.5.0.tar.gz
+f32612cfb938b9c634163f1c0177ccd664b77661eb41c978a4a5a4e2941c63ef  bird.initd"
+sha512sums="6814a1393d192083bc9807fd9c56e4bfe169aa34b70811f10da61c79d2fd4b18827bd4f3ea70d9ceba32125e54afb3f8df388416bff619c6f7e838a171f70ae8  bird-1.5.0.tar.gz
+0ac7aadd9ed5d736aa39f586002c0ccdaa71817abba09789fd36c773a029e98aee37b449a9c6917836ed495c3838356cdd871e7b1d4ad3dc8e68f18fdf6c3aab  bird.initd"
diff --git a/testing/bird/bird-1.4.0-readline-6.3.patch b/testing/bird/bird-1.4.0-readline-6.3.patch
deleted file mode 100644
index 4e569f0..0000000
--- a/testing/bird/bird-1.4.0-readline-6.3.patch
@@ -1,12 +0,0 @@
-diff -rupN a/client/birdc.c b/client/birdc.c
---- a/client/birdc.c	2013-11-23 13:29:53.000000000 +0100
-+++ b/client/birdc.c	2014-03-22 13:09:40.278580657 +0100
-@@ -29,7 +29,7 @@ static int prompt_active;
- /* HACK: libreadline internals we need to access */
- extern int _rl_vis_botlin;
- extern void _rl_move_vert(int);
--extern Function *rl_last_func;
-+extern rl_command_func_t *rl_last_func;
- 
- static void
- add_history_dedup(char *cmd)
diff --git a/testing/bird/bird.initd b/testing/bird/bird.initd
index f3b51aa..3685af0 100644
--- a/testing/bird/bird.initd
+++ b/testing/bird/bird.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 extra_started_commands="reload"
 
-- 
2.4.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---