From f829b49cc148a0b4c4f6c894690fbe4aa0ddc9c6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 31 Dec 2012 10:40:22 +0000
Subject: main/coova-chilli: fix building against automake-1.13

---
 main/coova-chilli/APKBUILD               | 17 ++++++++++-------
 main/coova-chilli/automake.patch         | 11 +++++++++++
 main/coova-chilli/coova-chilli-ssl.patch | 21 ---------------------
 3 files changed, 21 insertions(+), 28 deletions(-)
 create mode 100644 main/coova-chilli/automake.patch
 delete mode 100644 main/coova-chilli/coova-chilli-ssl.patch

(limited to 'main/coova-chilli')

diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index ba15b6fb9..4d26c3453 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=coova-chilli
 pkgver=1.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
@@ -12,18 +12,21 @@ makedepends="perl openssl-dev autoconf automake libtool curl-dev"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://ap.coova.org/chilli/coova-chilli-$pkgver.tar.gz
-	coova-chilli-ssl.patch"
+	automake.patch"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd $_builddir
-#	patch -p1 -i ../coova-chilli-ssl.patch || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 	sed -i 's/-Werror//g' src/Makefile.am || return 1
-	sed -i 's/-Werror//g' src/Makefile.in || return 1
 	sed -i 's%(localstatedir)/run%(localstatedir)%' src/Makefile.am || return 1
-	sed -i 's%(localstatedir)/run%(localstatedir)%' src/Makefile.in || return 1
-	aclocal && autoconf && automake && libtoolize || return 1
+	libtoolize --force \
+		&& aclocal && autoconf && automake || return 1
 }
 
 build() {
@@ -69,4 +72,4 @@ package() {
 }
 
 md5sums="a493d0562fc3b05fe86d8ad65f7f2dc0  coova-chilli-1.2.9.tar.gz
-4135e6e19bafdad777b8ca7388ff4101  coova-chilli-ssl.patch"
+b3aaf43bcdb5cfbf39d1c730d1de1a3b  automake.patch"
diff --git a/main/coova-chilli/automake.patch b/main/coova-chilli/automake.patch
new file mode 100644
index 000000000..4b50fc01d
--- /dev/null
+++ b/main/coova-chilli/automake.patch
@@ -0,0 +1,11 @@
+--- ./configure.in.orig	2012-12-31 10:19:51.189518846 +0000
++++ ./configure.in	2012-12-31 10:20:07.352988340 +0000
+@@ -7,7 +7,7 @@
+ 
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADER([config.h])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ 
diff --git a/main/coova-chilli/coova-chilli-ssl.patch b/main/coova-chilli/coova-chilli-ssl.patch
deleted file mode 100644
index 1567c96cb..000000000
--- a/main/coova-chilli/coova-chilli-ssl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,7 +13,8 @@
- chilli.h options.h util.c garden.c garden.h ssl.h ssl.c \
- dns.c dns.h session.c session.h limits.h pkt.h pkt.c \
- chksum.c net.h net.c ms_chap.c options.c statusfile.c \
--conn.h conn.c 
-+conn.h conn.c
-+libchilli_la_LIBADD = $(LIBOPENSSL)
- 
- AM_CFLAGS = -D_GNU_SOURCE -Wall -fno-builtin -fno-strict-aliasing \
-   -O2 -fomit-frame-pointer -funroll-loops -pipe \
-@@ -33,7 +34,7 @@
- #test_radius_SOURCES = test-radius.c 
- #test_dhcp_SOURCES = test-dhcp.c 
- 
--LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la ${LIBRT}
-+LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la $(LIBOPENSSL)
- 
- if WITH_OPENSSL
- LDADD += ${LIBSSL}
-- 
cgit v1.2.3