From b2a1fedf534ecf227d7ec16ea42d42d0798093a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 21 Mar 2014 08:50:55 +0000 Subject: main/quagga: fix build against libreadline-6.3 --- main/quagga/APKBUILD | 6 +++++- main/quagga/quagga-readline-6.3.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 main/quagga/quagga-readline-6.3.patch diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 7795e1dda..34a130960 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=quagga pkgver=0.99.22.4 -pkgrel=3 +pkgrel=4 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" arch="all" @@ -14,6 +14,7 @@ pkgusers="quagga" pkggroups="quagga" source="http://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.xz musl-fix-headers.patch + quagga-readline-6.3.patch bgpd.initd zebra.initd zebra.confd @@ -72,16 +73,19 @@ package() { } md5sums="03ef24a448be47beba80efa2152f8a28 quagga-0.99.22.4.tar.xz 27812f0aaaf8507c4338371aca1bd08d musl-fix-headers.patch +46e4020d7f3e1e8790f4b6e0592481b4 quagga-readline-6.3.patch e80a3df594eba8b09e19aa28d9283698 bgpd.initd 33d0e34f11460881161ab930d3d3b987 zebra.initd 34e06a1d2bc602ce691abc9ed169dd15 zebra.confd" sha256sums="5e12056692e2dbc272a929f96d0e98d9873f4e7f7ffcca62434b58f6660a6386 quagga-0.99.22.4.tar.xz 19068f58f034891c07b8a1324d0645e0f078e3dc98d1360d51c677cecaae8c9e musl-fix-headers.patch +40264c6f00afc45a88ac1dd488081abf8fdf8864b70e7a7ab2db55dc3e388cda quagga-readline-6.3.patch 41471bfda120cb57bc0f40e87ec23a4f150d2b97c97ececdda6c408eab7cf9a3 bgpd.initd d6cc9280df63859ba711ad2071b38b9ce317d718c34840a2b101debef3fa7b56 zebra.initd f7a52d383f60270a5a8fee5d4ac522c5c0ec2b7c4b5252cff54e260f32d9b323 zebra.confd" sha512sums="bcf429e71073e4fc71efc364a21a6c8b70871a17c66bd1328bc57b57962c2c15182436183b2e363c9c1c0e85d84c49d304d4049d40129272f52d6140db330b8a quagga-0.99.22.4.tar.xz 28a1695bd77991790df3b1b5a2c8ced929e6413e9acb87c4a8286569d05b20e65cba466e118fc16a11c264ba11dd1581e4143031ce3bbb478177e900ea68cb07 musl-fix-headers.patch +db69f04b7894871cb0a6ca2722a99ea2cf42e8a8c88af07b29034d9a1093fb1954767874226df1753c0c8f900e3fe2870f408167a48e7884a1f4c1fb961232f2 quagga-readline-6.3.patch d2bf7e8f2da49d0b039e72e76a77860b5b49d41a80550d6dc84791bbdec1d52e579393c5d42b45aa615991742421fef53ec1b92a5e740779b6060e20f5dd0413 bgpd.initd a4955fe54729ec8cb17b72f3d2205d0a4ba814a51a5eb3635a85339de9a2d2342e4814ef8b1e011803fa1dc3c6f9a23b178848e0812576876343104854feb723 zebra.initd 900972c6f98e561dfacf384111251db262326e8764b8c763a5ef639fa11c7949c03eef5e3bce324a4b1964fe45416d2db74ae1b6bc967f7d4ba48c2eeda017c4 zebra.confd" diff --git a/main/quagga/quagga-readline-6.3.patch b/main/quagga/quagga-readline-6.3.patch new file mode 100644 index 000000000..41ba831ac --- /dev/null +++ b/main/quagga/quagga-readline-6.3.patch @@ -0,0 +1,14 @@ +--- quagga-0.99.22.4.orig/vtysh/vtysh.c ++++ quagga-0.99.22.4/vtysh/vtysh.c +@@ -2211,9 +2211,9 @@ + vtysh_readline_init (void) + { + /* readline related settings. */ +- rl_bind_key ('?', (Function *) vtysh_rl_describe); ++ rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe); + rl_completion_entry_function = vtysh_completion_entry_function; +- rl_attempted_completion_function = (CPPFunction *)new_completion; ++ rl_attempted_completion_function = (rl_completion_func_t *) new_completion; + /* do not append space after completion. It will be appended + * in new_completion() function explicitly. */ + rl_completion_append_character = '\0'; -- cgit v1.2.3