From 93dfbba194f96215a717cb2ff4fc76156165c404 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 1 Jan 2013 10:18:13 +0000
Subject: main/snort: build fix for automake-1.13

---
 main/snort/APKBUILD       | 17 ++++++++++++++---
 main/snort/automake.patch | 11 +++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 main/snort/automake.patch

(limited to 'main')

diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 0e220b15f4..d612b0b06e 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -14,6 +14,7 @@ makedepends="pcre-dev libpcap-dev libnet-dev libdnet-dev daq-dev
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://www.snort.org/dl/snort-current/snort-$pkgver.tar.gz
+	automake.patch
         snort.initd
         snort.confd
 	"
@@ -21,9 +22,13 @@ pkgusers="snort"
 pkggroups="snort"
 
 _builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
+prepare() {
         cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 
 	# fix parallel builds
 	sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
@@ -32,8 +37,13 @@ build() {
 	sed -i -e 's|/usr/local|/usr|' etc/snort.conf || return 1
 	sed -i -e 's|\.\./|/var/lib/snort/|' etc/snort.conf || return 1
 	
-	aclocal -I m4 && autoconf && automake --add-missing && libtoolize || return 1
+	libtoolize --force && aclocal -I m4 && autoconf \
+		&& automake --add-missing || return 1
 
+}
+
+build() {
+        cd "$_builddir"
         ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --mandir=/usr/share/man \
@@ -66,5 +76,6 @@ package() {
 }
 
 md5sums="e79ee6b4fbb32edc5dfed2d7dfcc6813  snort-2.9.4.tar.gz
+6a8b6d9c00971d419f0c1ea036c76ea4  automake.patch
 b65d10cce3e79f38aa6fb5e0aa494144  snort.initd
 446f8d2b3435b8a6be738da978670605  snort.confd"
diff --git a/main/snort/automake.patch b/main/snort/automake.patch
new file mode 100644
index 0000000000..efab362368
--- /dev/null
+++ b/main/snort/automake.patch
@@ -0,0 +1,11 @@
+--- ./configure.in.orig	2013-01-01 10:08:17.414478737 +0000
++++ ./configure.in	2013-01-01 10:08:24.514546679 +0000
+@@ -3,7 +3,7 @@
+ AC_CONFIG_SRCDIR([src/snort.c])
+ AC_PREREQ(2.50)
+ #LT_PREREQ([2.2.6])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ # When changing the snort version, please also update the VERSION
+ # definition in "src/win32/WIN32-Includes/config.h"
+ AM_INIT_AUTOMAKE(snort,2.9.4)
-- 
cgit v1.2.3