From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH] main/haproxy: upgrade to 1.8.19
Date: Sat,  2 Mar 2019 15:38:30 +0000
Message-Id: <20190302153830.9639-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Fix URL, ugly multi-line splits and lack of variable quoting.

Add vim syntax.

Add openrc & vim subpackages.
---
 main/haproxy/APKBUILD | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index e83bb1259c..99d6a07dc5 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=haproxy
-pkgver=1.8.12
+pkgver=1.8.19
 _pkgmajorver=${pkgver%.*}
-pkgrel=1
+pkgrel=0
 pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
-url="http://haproxy.1wt.eu"
+url="https://www.haproxy.org/"
 arch="all"
 license="GPL"
 _luaver="5.3"
@@ -13,7 +13,7 @@ options="!check"  # FIXME: no idea how to run tests
 depends=""
 makedepends="pcre-dev openssl-dev linux-headers lua${_luaver}-dev zlib-dev"
 install="haproxy.pre-install haproxy.pre-upgrade"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc $pkgname-vim::noarch"
 source="http://haproxy.1wt.eu/download/${_pkgmajorver}/src/$pkgname-$pkgver.tar.gz
 	haproxy.initd
 	haproxy.cfg"
@@ -38,18 +38,22 @@ build() {
 
 package() {
 	cd "$builddir"
-	make install \
-	     DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy
-	install -d \
-	        "$pkgdir"/var/lib/haproxy
-	install -D -m 755 \
-	        "$srcdir"/$pkgname.initd \
-	        "$pkgdir"/etc/init.d/$pkgname
-	install -D -m 644 \
-	        "$srcdir"/haproxy.cfg \
-	        "$pkgdir"/etc/haproxy/haproxy.cfg
+	make DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy install
+
+	install -d "$pkgdir"/var/lib/haproxy
+	install -Dm 755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
+	install -Dm 644 "$srcdir"/haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg
+}
+
+vim() {
+	pkgdesc="Vim syntax for $pkgname"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel vim"
+
+	install -Dm 644 "$builddir"/examples/haproxy.vim \
+		"$subpkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim
 }
 
-sha512sums="2b782a54988cc88d1af0e5f011af062910e8fac28eab13db7e05a58d0d23961f827da47e3871e8d081f5a2d222588480d81dec2e9f14ec9f54a1c3cb5bf3d56a  haproxy-1.8.12.tar.gz
+sha512sums="f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b  haproxy-1.8.19.tar.gz
 3ab277bf77fe864ec6c927118dcd70bdec0eb3c54535812d1c3c0995fa66a3ea91a73c342edeb8944caeb097d2dd1a7761099182df44af5e3ef42de6e2176d26  haproxy.initd
 26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f  haproxy.cfg"
-- 
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---