main/varnish: build fix

2 files changed, 26 insertions, 20 deletions

diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD
index 3bbe9c0d87..6680c0fd83 100644
--- a/main/varnish/APKBUILD
+++ b/main/varnish/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
-pkgver=4.1.2
-pkgrel=3
+pkgver=4.1.3
+pkgrel=0
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
@@ -20,6 +20,7 @@ source="http://repo.varnish-cache.org/source/varnish-$pkgver.tar.gz
 	fix-compat-execinfo.patch
 	fix-stack-overflow.patch
 	musl-mode_t.patch
+	varnish-4.1.3_fix_Werror_el6.patch
 
 	varnishd.initd
 	varnishd.confd
@@ -31,21 +32,11 @@ source="http://repo.varnish-cache.org/source/varnish-$pkgver.tar.gz
 	maxminddb.vcl
 	"
 
-_builddir="$srcdir"/varnish-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	update_config_sub || return 1
-}
+builddir="$srcdir"/varnish-$pkgver
 
 build() {
-	cd "$_builddir"
-	CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \
+	cd "$builddir"
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -59,7 +50,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	for i in $source; do
 		case $i in
@@ -89,13 +80,15 @@ geoip() {
 	pkgdesc="Maxmind GeoIP2 lookup plugin for varnish"
 	depends="libmaxminddb-dev"
 
-	install -m755 -D "$srcdir"/maxminddb.vcl "$subpkgdir"/usr/lib/varnish/plugins/maxminddb.vcl
+	install -m755 -D "$srcdir"/maxminddb.vcl \
+		"$subpkgdir"/usr/lib/varnish/plugins/maxminddb.vcl
 }
 
-md5sums="51d446c0193dd773f5a881f7c0beb304  varnish-4.1.2.tar.gz
+md5sums="f9c761a54324ad02c4fe44ce1d291d70  varnish-4.1.3.tar.gz
 2fec4f98c892e07d97d93a7bb8529fea  fix-compat-execinfo.patch
 c942796a1359c9b7e0a5a53d16db476e  fix-stack-overflow.patch
 54d12d231c505c95ae3ae09487b5dde4  musl-mode_t.patch
+52f8e68d5a92c0fa69885aa01e13aa6c  varnish-4.1.3_fix_Werror_el6.patch
 698e7376fa224ebdf052acd7dd8c8a82  varnishd.initd
 73f89f154632bc21c9256ecca0ebf3d1  varnishd.confd
 fa0be78eca165a032bc975e809eac0c4  varnishlog.initd
@@ -104,10 +97,11 @@ fa0be78eca165a032bc975e809eac0c4  varnishlog.initd
 fbe42d5da63b4567a7cfa0ecb7df8d3c  varnishncsa.confd
 acd003fbcd1d8607508960e13c5ede85  varnishd.logrotate
 2cbaa46b9da9f78ecf4c906730f7c5e3  maxminddb.vcl"
-sha256sums="9728da944d28eb5be90e7ab6799c2c4c831ef4df5e5154537eb7f2e5d5e348c4  varnish-4.1.2.tar.gz
+sha256sums="9f9469b9fda2a578da2a9d282c71c34eeb5c42eda7f8d8728284d92282108429  varnish-4.1.3.tar.gz
 66a281c03bcf0c01bc8215fe39a3b6a593751fb2034824b471596d517554e183  fix-compat-execinfo.patch
 a58d9c5dd2c1a0e9883d58ddec684993bc9fe6e91132c99b00c82a1c4228e647  fix-stack-overflow.patch
 f96b6dab0e68e169cffceb63776e312d8585bc2a46dfcc5fa2b1ec5e953ad624  musl-mode_t.patch
+05ca9db1a0199a293d9faddf03c19fc90db771fef885da1d678e604270897c0b  varnish-4.1.3_fix_Werror_el6.patch
 d8a2dffca49df2867824ef71f9aacb05ad4f2803da979621e67433df989d022d  varnishd.initd
 bc29e1a65f1712e414479323bfb88833e86ad277e03ac87c892a32d959917a4e  varnishd.confd
 553292b71e489a84058b84ff06f14cc6f6cce5c735b3566eb7ef4b7aa4241f61  varnishlog.initd
@@ -116,10 +110,11 @@ ae6eff8b0a3a4c35f9227e244e7dc06f5a3fdf625d1fc524bbc6965e3f9aacfb  varnishncsa.in
 60e03274b8d786abf7769be26a4ee6c671a155a761b16ee92d5c8b183491870e  varnishncsa.confd
 4c1b7abf23bfc32a65f65633c0be0d065fb9fee72e4b533feca35c596d9c5a2c  varnishd.logrotate
 fd6c810a6099b1b0c2eb572aec239e3f51debc52a6c32fce715f265d7b1a1f85  maxminddb.vcl"
-sha512sums="28c4e5a3a74bf5294e6d1f7a48cd3ec64faffca89388b7ea9ed3de3cd58bede357383bcdd021ff783a411590c0a0a1cb747981507272352c1521b4fcac35e179  varnish-4.1.2.tar.gz
+sha512sums="9ba0b2490bfa6f068d6777b4e8f1afcd823a3d6bf8e18ad0274cc9aff7733cd65df0e2ed9f2c6a3d3261d19438cc3254c89b0e41508d2cac2f17bdfd8119e4f1  varnish-4.1.3.tar.gz
 e4c3b8fe85ccb3f37c69561b981f89c757acc5534379afec551b7eabc2fe8661e3566513f4bfea9192af8576fc587b34170008f5818038c17c412ac64b27cf51  fix-compat-execinfo.patch
 d07a187f5e17644d724b1b555506f65bd9e0a23084d0f4dbb836ec6cc1f1585b6e2d8b3818543823f60dcc3089a0466e08c627c9518ed178238580ec3996caef  fix-stack-overflow.patch
 8758bef9039a2cca23b7302668bd49f1ea07f54835512a8a9558bb9ed5de1c0fca53f2085ccd298fe0c6579fc81c3b583a85f4f6b25b6ad85f89bf3be04afb70  musl-mode_t.patch
+a7ceed7115c2ee6faf9afd40efb1742b250027274e5502a1aa9dc3486c9e0e84ba1e3e6b844bde70b00500d810c37a60494c8c8fbd5765f38323fc8a0798a6cf  varnish-4.1.3_fix_Werror_el6.patch
 5f9cd1da8a72e71d6317d9c9b625d4b2f4f46ff6c4f7aaf8fed5958ce141be572d7e4d2d207af51b1cf4201b19b9bc1574d3cfcf7616c043a309c04ce6ae949e  varnishd.initd
 98c8901e53f3c6adb908b9eb01fd441ea53f3c54d4a79aecb1fb1eddfa2fc93de3d0de403a4464a9baff15873b3a20623837e3a37cb225e924a329e32b9e37d6  varnishd.confd
 31758d5b328700d31cf078efce64421ab7b6f00961733b990367efa8ce9aa406e72b46be1cf21fe2f8e11e3cc1803dc9158930ae7803131a88d71f7193d2d270  varnishlog.initd
diff --git a/main/varnish/varnish-4.1.3_fix_Werror_el6.patch b/main/varnish/varnish-4.1.3_fix_Werror_el6.patch
new file mode 100644
index 0000000000..835d4033ea
--- /dev/null
+++ b/main/varnish/varnish-4.1.3_fix_Werror_el6.patch
@@ -0,0 +1,11 @@
+--- ./configure.orig	2016-08-02 14:56:14.888475820 +0200
++++ ./configure	2016-08-02 14:56:26.633158063 +0200
+@@ -17247,7 +17247,7 @@
+ # The reason for -Wno-error=unused-result is a glibc/gcc interaction
+ # idiocy where write is marked as warn_unused_result, causing build
+ # failures.
+-CFLAGS="${CFLAGS} -Wall -Werror"
++#CFLAGS="${CFLAGS} -Wall -Werror"
+ OCFLAGS="${OCFLAGS} -Wall -Werror"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unused-result" >&5
+ $as_echo_n "checking whether C compiler accepts -Werror=unused-result... " >&6; }