From 62abf74f5e5e2c59a7a1e1612218cf5102fc28aa Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 1 Jan 2013 07:05:40 +0000
Subject: main/quagga: build fixes for automake and recent kernel headers

---
 main/quagga/APKBUILD                              | 14 +++++++++-----
 main/quagga/automake.patch                        | 11 +++++++++++
 main/quagga/quagga-0.99.16-ipctl_forwarding.patch | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 main/quagga/automake.patch
 create mode 100644 main/quagga/quagga-0.99.16-ipctl_forwarding.patch

diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index 0b243d2ec..50c3d5129 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -1,21 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
 pkgver=0.99.21
-pkgrel=2
+pkgrel=3
 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
+makedepends="readline-dev ncurses-dev gawk texinfo
 	autoconf automake libtool"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-dev $pkgname-doc"
 pkgusers="quagga"
 pkggroups="quagga"
-source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz
+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
 	bgpd.initd
 	ospf6d.initd
 	ospfd.initd
@@ -37,7 +39,7 @@ prepare() {
 	msg "Running autotools..."
 	aclocal || return 1
 	autoconf || return 1
-	automake || return 1
+	automake --add-missing || return 1
 	libtoolize || return 1
 }
 
@@ -72,9 +74,11 @@ package() {
 	install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra
 	install -d -m755 "$pkgdir"/etc/quagga
 }
-md5sums="99840adbe57047c90dfba6b6ed9aec7f  quagga-0.99.21.tar.gz
+md5sums="0980758b1865b9aa0c60975120bf3453  quagga-0.99.21.tar.xz
 8f99d41a8ed79e51704e8f655d255f29  quagga-0.99.11-link-libcap.patch
 1cbcf60a637b2577dee4d6df711e1247  quagga-0.99.11-del-routes.patch
+2328ad4066584654cfc73f66d39dc267  quagga-0.99.16-ipctl_forwarding.patch
+f29ce383b0a2d43a416b9cfa20943f05  automake.patch
 ec7ac8cc1103f023cf5b9482b26ece59  bgpd.initd
 92aba039c049050c48abf984c2db7e2b  ospf6d.initd
 878328ead225e6eb5f5f77f05ab39106  ospfd.initd
diff --git a/main/quagga/automake.patch b/main/quagga/automake.patch
new file mode 100644
index 000000000..7e10700c5
--- /dev/null
+++ b/main/quagga/automake.patch
@@ -0,0 +1,11 @@
+--- ./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.16-ipctl_forwarding.patch b/main/quagga/quagga-0.99.16-ipctl_forwarding.patch
new file mode 100644
index 000000000..5a1e4e229
--- /dev/null
+++ b/main/quagga/quagga-0.99.16-ipctl_forwarding.patch
@@ -0,0 +1,19 @@
+diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
+--- quagga-0.99.16.orig/zebra/ipforward_sysctl.c	2010-03-11 12:11:32.000000000 -0500
++++ quagga-0.99.16/zebra/ipforward_sysctl.c	2010-03-11 12:11:39.000000000 -0500
+@@ -31,6 +31,15 @@
+ 
+ #define MIB_SIZ 4
+ 
++/* Fix for recent (2.6.14) kernel headers */
++#ifndef IPCTL_FORWARDING
++    #define IPCTL_FORWARDING       NET_IPV4_FORWARD
++#endif
++
++#ifndef IP6CTL_FORWARDING
++    #define IP6CTL_FORWARDING      NET_IPV6_FORWARDING
++#endif
++
+ extern struct zebra_privs_t zserv_privs;
+ 
+ /* IPv4 forwarding control MIB. */
-- 
cgit v1.2.3