From 6fd7e86b311ce75083b61dd25f2577ef4461a8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Mon, 31 Jul 2017 17:22:12 +0200
Subject: main/haproxy: upgrade to 1.7.8 and modernize abuild

---
 main/haproxy/APKBUILD | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'main/haproxy/APKBUILD')

diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 2de8f19151..d74d186823 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=haproxy
-pkgver=1.7.7
+pkgver=1.7.8
 _pkgmajorver=${pkgver%.*}
 pkgrel=0
 pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
@@ -30,30 +30,24 @@ build() {
 	     USE_LUA=1 \
 	     LUA_LIB=/usr/lib/lua${_luaver} \
 	     LUA_INC=/usr/include/lua${_luaver} \
-	     CFLAGS="$CFLAGS" \
-		|| return 1
+	     CFLAGS="$CFLAGS"
 }
 
 package() {
 	cd "$builddir"
 	make install \
-	     DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy \
-		|| return 1
+	     DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy
 	install -d \
-	        "$pkgdir"/var/lib/haproxy \
-		|| return 1
+	        "$pkgdir"/var/lib/haproxy
 	install -D -m 755 \
 	        "$srcdir"/$pkgname.initd \
-	        "$pkgdir"/etc/init.d/$pkgname \
-		|| return 1
+	        "$pkgdir"/etc/init.d/$pkgname
 	install -D -m 644 \
 	        "$srcdir"/haproxy.cfg \
-	        "$pkgdir"/etc/haproxy/haproxy.cfg \
-		|| return 1
+	        "$pkgdir"/etc/haproxy/haproxy.cfg
 	install -m 755 \
 	        haproxy-systemd-wrapper \
-	        "$pkgdir"/usr/sbin/ \
-		|| return 1
+	        "$pkgdir"/usr/sbin/
 }
 
 wrapper() {
@@ -63,7 +57,7 @@ wrapper() {
 	   "$subpkgdir"/usr/sbin/
 }
 
-sha512sums="aa4720962e94b00c2b6090f62fb875e8977783256d877eb799b6a48c884833bac00b12d04fabd440011007e2af1914e0d67ab485026a447d8a61d58128d04a5a  haproxy-1.7.7.tar.gz
+sha512sums="e1d65c8a4607c01d52628f36f8c7342096267130a0f949474746f571158e4f795281f78765004c214a0527f74ce180760f9cc910d3650d30026776076d721c0c  haproxy-1.7.8.tar.gz
 a69734b0760dacf9a3e9b69202623eb55b8a8ae75dae7a9c7ee92240636b3dfd05f640ead2be604249c86280f85f149837aa9da284e7796ecd7f9f907c439121  fix-libressl-2.5.patch
 3ab277bf77fe864ec6c927118dcd70bdec0eb3c54535812d1c3c0995fa66a3ea91a73c342edeb8944caeb097d2dd1a7761099182df44af5e3ef42de6e2176d26  haproxy.initd
 26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f  haproxy.cfg"
-- 
cgit v1.2.3