From 97d8e409ab662f24ea88994f4868dec8b6cf8714 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Mon, 30 Nov 2015 20:46:29 +0100
Subject: [PATCH] haproxy: update to 1.6.2.

---
 .../patches/haproxy-1.6.2-libressl.patch      | 42 +++++++++++++++++++
 srcpkgs/haproxy/template                      |  8 ++--
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/haproxy/patches/haproxy-1.6.2-libressl.patch

diff --git a/srcpkgs/haproxy/patches/haproxy-1.6.2-libressl.patch b/srcpkgs/haproxy/patches/haproxy-1.6.2-libressl.patch
new file mode 100644
index 00000000000..3ff9701daf9
--- /dev/null
+++ b/srcpkgs/haproxy/patches/haproxy-1.6.2-libressl.patch
@@ -0,0 +1,42 @@
+X-Git-Url: http://git.haproxy.org/?p=haproxy-1.6.git;a=blobdiff_plain;f=src%2Fssl_sock.c;h=c67cd5617e3e9c44f8c4af60d72f110b49eb2f1a;hp=3f66af1c50e67a50fbb702641a0562e47c05100b;hb=96414cce6acd7617bcbfedfa0584ebecb5404a30;hpb=bfb76be4076b70aa05db2f5f8ec2c0b0698dd4b0
+
+diff --git src/ssl_sock.c src/ssl_sock.c
+index 3f66af1..c67cd56 100644
+--- src/ssl_sock.c
++++ src/ssl_sock.c
+@@ -714,7 +714,7 @@ out:
+ 
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
+ 
+ #define CT_EXTENSION_TYPE 18
+ 
+@@ -1736,7 +1736,7 @@ static int ssl_sock_load_cert_file(const char *path, struct bind_conf *bind_conf
+ 	}
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
+ 	if (sctl_ex_index >= 0) {
+ 		ret = ssl_sock_load_sctl(ctx, path);
+ 		if (ret < 0) {
+@@ -5348,7 +5348,7 @@ struct xprt_ops ssl_sock = {
+ 	.init     = ssl_sock_init,
+ };
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
+ 
+ static void ssl_sock_sctl_free_func(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, long argl, void *argp)
+ {
+@@ -5381,7 +5381,7 @@ static void __ssl_sock_init(void)
+ 	SSL_library_init();
+ 	cm = SSL_COMP_get_compression_methods();
+ 	sk_SSL_COMP_zero(cm);
+-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
++#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER)
+ 	sctl_ex_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, ssl_sock_sctl_free_func);
+ #endif
+ 	sample_register_fetches(&sample_fetch_keywords);
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index c128b1f138e..b6756ac09d8 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,22 +1,22 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=1.5.15
+version=1.6.2
 revision=1
 build_style=gnu-makefile
 make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1
- USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1"
+ USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1"
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/$pkgname"
 conf_files="/etc/${pkgname}/${pkgname}.cfg"
 system_accounts="${pkgname}"
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
-makedepends="libressl-devel pcre-devel zlib-devel"
+makedepends="libressl-devel pcre-devel zlib-devel lua-devel"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2 LGPL-2.1"
 homepage="http://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=5af46e1438601d0919f5628081f660f9533087d88af3d9274f245395475663e1
+checksum=bd4a7eee79e1bfd25af59d956bb60e82acbb6f146f3fb3b30636036f4c9548d3
 
 do_build() {
 	sed -e '/install haproxy-systemd-wrapper/d' -i Makefile