diff options
Diffstat (limited to 'main/quagga')
| -rw-r--r-- | main/quagga/APKBUILD | 43 | ||||
| -rw-r--r-- | main/quagga/automake.patch | 11 | ||||
| -rw-r--r-- | main/quagga/quagga-0.99.11-link-libcap.patch | 24 | ||||
| -rw-r--r-- | main/quagga/texinfo.patch | 13 |
4 files changed, 41 insertions, 50 deletions
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 50c3d51299..83281971ef 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,23 +1,21 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga -pkgver=0.99.21 -pkgrel=3 +pkgver=0.99.22 +pkgrel=0 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" arch="all" license="GPL-2" depends="iproute2" -makedepends="readline-dev ncurses-dev gawk texinfo - autoconf automake libtool" +makedepends="readline-dev ncurses-dev gawk texinfo" install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-doc" pkgusers="quagga" pkggroups="quagga" source="http://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.xz - $pkgname-0.99.11-link-libcap.patch $pkgname-0.99.11-del-routes.patch quagga-0.99.16-ipctl_forwarding.patch - automake.patch + texinfo.patch bgpd.initd ospf6d.initd ospfd.initd @@ -35,12 +33,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - - msg "Running autotools..." - aclocal || return 1 - autoconf || return 1 - automake --add-missing || return 1 - libtoolize || return 1 } build() { @@ -74,11 +66,10 @@ package() { install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra install -d -m755 "$pkgdir"/etc/quagga } -md5sums="0980758b1865b9aa0c60975120bf3453 quagga-0.99.21.tar.xz -8f99d41a8ed79e51704e8f655d255f29 quagga-0.99.11-link-libcap.patch +md5sums="0a8b01d01a1e02a7a6ec90a781fb774c quagga-0.99.22.tar.xz 1cbcf60a637b2577dee4d6df711e1247 quagga-0.99.11-del-routes.patch 2328ad4066584654cfc73f66d39dc267 quagga-0.99.16-ipctl_forwarding.patch -f29ce383b0a2d43a416b9cfa20943f05 automake.patch +93a7ca43d7637ce9b2624ad9adef7385 texinfo.patch ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd 92aba039c049050c48abf984c2db7e2b ospf6d.initd 878328ead225e6eb5f5f77f05ab39106 ospfd.initd @@ -86,3 +77,25 @@ ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd cda4115283d9f4a8304fec1b6881a7eb ripngd.initd 172e5b0e3f169e2b3328123e73517084 zebra.initd 34e06a1d2bc602ce691abc9ed169dd15 zebra.confd" +sha256sums="50336547ed53a03a3fa9130de5721fb916c40fef6652a1a36c9a71fdf338c75a quagga-0.99.22.tar.xz +11eee48e2954f1ac47e522dee8ca6e87f486abafccfe12ee5bd0f5845077ffc5 quagga-0.99.11-del-routes.patch +f06053e2a9030be80992bb7d4b18f4cfecd2d43cb09458557b6b8c1ac3fd22ca quagga-0.99.16-ipctl_forwarding.patch +d58c016b597e27bdcece897a9bfc66b611569ae2a7fbbc3740e30496c9365616 texinfo.patch +962afa79a0bcb781acc4c367ed55ccea2fbb927cf1271bc1fefaffcbb2f9389a bgpd.initd +f1017e7681692d99eab6f9842313be18104612055bcdab14dd7ac4ac1be38f53 ospf6d.initd +fed815e6530551f314297704e5491f5d2eeb16e930dcff6f12edc88a78b6023a ospfd.initd +36abd1158130a9268b6b852b7511a3457f8a17528f7d1b8a0b3f8ac41248a3c3 ripd.initd +565b6c0380a0010f464e37490468d58b9867bf6cfcbb36ac682a5e2760c40191 ripngd.initd +ca7c252cc1c79f05a55f933317d9a7f523dc6501bf5c72c553c43da4f8fd68dd zebra.initd +f7a52d383f60270a5a8fee5d4ac522c5c0ec2b7c4b5252cff54e260f32d9b323 zebra.confd" +sha512sums="580113cd9b68c1267cc737b98c64f15c8754c7ce2f9a23979b8beb03049ab81ac08feb4df38dbc46cfeeac79992bd6fa5e59a35c8f226945f752b873624718db quagga-0.99.22.tar.xz +34fda1c9ccb645a3df1ccc1947f87c4086f8aadeb9b53746bfd45f3562f6c1051964b45ec3a6f7e0eb1db46e424aae3daada49fea2582a62aeff71f78b885f4b quagga-0.99.11-del-routes.patch +1f4c45765bc1a8678ad1404bfab65799d9329e8f78a897b5c9c294d167745dd10d25304ba490988d9e94ae815c2c6f107b13efb3c710c44515470a61e2dd7c84 quagga-0.99.16-ipctl_forwarding.patch +31131f7bdf44ecc23831d857bc982864dc909a7f6da079675fc94d172692d025c656503af0591157f8cae88da4340dfc16072d7a9fd8456ea058d5b9d0d45f52 texinfo.patch +a865d9f5d2593270abc56dc65785317115337da00e8f389df3bf9af314052a4dc9e8f7af1142f7726637e06f1d8f7640cafd2a9e5ee8a7b4fd6b4e7b7c5bc784 bgpd.initd +f76aaacb1949a528a71a4bb69e9b6fa522c507000e8fa0cd60e0d80b8d2820155fa40fe7dedd86bdf38dc8029b1958c90bfbc8423afc737aae59248adba906b3 ospf6d.initd +fa3edb10d5b543c3f53a4dbd82edcda011be01f2d94b7b208cc02c1137a33adb703b734e7a4f22a51ec4d66203c44918dc9441be02b67248858b413146c61c16 ospfd.initd +95c96968133ed082a9e49661d1ea66fbeeb871d9bdd0dc5602953360e73ec2a83992c787f745211448629e3d90e69dc38a5fcae948825a7a73d3f2e4b8b91cc6 ripd.initd +6dbb662755ef84827768f2ed4779205e52b7eae50d377af5e4a951eb94317dbce3958184deb70dd3aa27f96d614e0be4d0fe2d871d961f4ffceaa84de454181c ripngd.initd +978a61e24ec9fc5558df550894f24cde4b729f88243e3f3d45394ec78009e22a87116c5a1dc4c382c7fa41e888155c8d901fc6028fba1cf9554349d4b432524e zebra.initd +900972c6f98e561dfacf384111251db262326e8764b8c763a5ef639fa11c7949c03eef5e3bce324a4b1964fe45416d2db74ae1b6bc967f7d4ba48c2eeda017c4 zebra.confd" diff --git a/main/quagga/automake.patch b/main/quagga/automake.patch deleted file mode 100644 index 7e10700c53..0000000000 --- a/main/quagga/automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.ac.orig 2012-12-31 21:49:07.571163898 +0000 -+++ ./configure.ac 2012-12-31 21:49:15.491232258 +0000 -@@ -19,7 +19,7 @@ - AC_CANONICAL_TARGET() - - AM_INIT_AUTOMAKE(1.6) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - AC_CHECK_PROG([GAWK],[gawk],[gawk],[not-in-PATH]) - if test "x$GAWK" = "xnot-in-PATH" ; then diff --git a/main/quagga/quagga-0.99.11-link-libcap.patch b/main/quagga/quagga-0.99.11-link-libcap.patch deleted file mode 100644 index 2c1b868d15..0000000000 --- a/main/quagga/quagga-0.99.11-link-libcap.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur quagga-0.99.11.orig/lib/Makefile.am quagga-0.99.11/lib/Makefile.am ---- quagga-0.99.11.orig/lib/Makefile.am 2008-09-24 15:22:43.000000000 +0000 -+++ quagga-0.99.11/lib/Makefile.am 2008-10-09 20:29:17.000000000 +0000 -@@ -18,7 +18,7 @@ - - libzebra_la_DEPENDENCIES = @LIB_REGEX@ - --libzebra_la_LIBADD = @LIB_REGEX@ -+libzebra_la_LIBADD = @LIB_REGEX@ @LIBCAP@ - - pkginclude_HEADERS = \ - buffer.h checksum.h command.h filter.h getopt.h hash.h \ -diff -ur quagga-0.99.11.orig/zebra/Makefile.am quagga-0.99.11/zebra/Makefile.am ---- quagga-0.99.11.orig/zebra/Makefile.am 2008-09-05 14:27:26.000000000 +0000 -+++ quagga-0.99.11/zebra/Makefile.am 2008-10-09 20:29:17.000000000 +0000 -@@ -39,7 +39,7 @@ - connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \ - interface.h ipforward.h irdp.h router-id.h kernel_socket.h - --zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la -+zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6) - - testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la - diff --git a/main/quagga/texinfo.patch b/main/quagga/texinfo.patch new file mode 100644 index 0000000000..9f50687c69 --- /dev/null +++ b/main/quagga/texinfo.patch @@ -0,0 +1,13 @@ +--- ./doc/ipv6.texi.orig 2013-03-13 09:18:49.807751249 +0000 ++++ ./doc/ipv6.texi 2013-03-13 09:19:04.531223449 +0000 +@@ -136,8 +136,8 @@ + Default: 0 + @end deffn + +-+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} +-+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} ++@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} ++@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} + The value to be placed in Home Agent Option, when Home Agent config flag is set, + which indicates to hosts Home Agent Lifetime. The default value of 0 means to + place the current Router Lifetime value. |