Update to newest version.

ChangeLog (only stable versions):

2015/11/03 : 1.6.2
    - BUILD: ssl: fix build error introduced in commit 7969a3 with OpenSSL < 1.0.0
    - DOC: fix a typo for a "deviceatlas" keyword
    - FIX: small typo in an example using the "Referer" header
    - BUG/MEDIUM: config: count memory limits on 64 bits, not 32
    - BUG/MAJOR: dns: first DNS response packet not matching queried hostname may lead to a loop
    - BUG/MINOR: dns: unable to parse CNAMEs response
    - BUG/MINOR: examples/haproxy.init: missing brace in quiet_check()
    - DOC: deviceatlas: more example use cases.
    - BUG/BUILD: replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
    - BUG/MAJOR: http: don't requeue an idle connection that is already queued
    - DOC: typo on capture.res.hdr and capture.req.hdr
    - BUG/MINOR: dns: check for duplicate nameserver id in a resolvers section was missing
    - CLEANUP: use direction names in place of numeric values
    - BUG/MEDIUM: lua: sample fetches based on response doesn't work

2015/10/20 : 1.6.1
    - DOC: specify that stats socket doc (section 9.2) is in management
    - BUILD: install only relevant and existing documentation
    - CLEANUP: don't ignore debian/ directory if present
    - BUG/MINOR: dns: parsing error of some DNS response
    - BUG/MEDIUM: namespaces: don't fail if no namespace is used
    - BUG/MAJOR: ssl: free the generated SSL_CTX if the LRU cache is disabled
    - MEDIUM: dns: Don't use the ANY query type

2015/10/13 : 1.6.0
    - BUG/MINOR: Handle interactive mode in cli handler
    - DOC: global section missing parameters
    - DOC: backend section missing parameters
    - DOC: stats paramaters available in frontend
    - MINOR: lru: do not allocate useless memory in lru64_lookup
    - BUG/MINOR: http: Add OPTIONS in supported http methods (found by find_http_meth)
    - BUG/MINOR: ssl: fix management of the cache where forged certificates are stored
    - MINOR: ssl: Release Servers SSL context when HAProxy is shut down
    - MINOR: ssl: Read the file used to generate certificates in any order
    - MINOR: ssl: Add support for EC for the CA used to sign generated certificates
    - MINOR: ssl: Add callbacks to set DH/ECDH params for generated certificates
    - BUG/MEDIUM: logs: fix time zone offset format in RFC5424
    - BUILD: Fix the build on OSX (htonll/ntohll)
    - BUILD: enable build on Linux/s390x
    - BUG/MEDIUM: lua: direction test failed
    - MINOR: lua: fix a spelling error in some error messages
    - CLEANUP: cli: ensure we can never double-free error messages
    - BUG/MEDIUM: lua: force server-close mode on Lua services
    - MEDIUM: init: support more command line arguments after pid list
    - MEDIUM: init: support a list of files on the command line
    - MINOR: debug: enable memory poisonning to use byte 0
    - BUILD: ssl: fix build error introduced by recent commit
    - BUG/MINOR: config: make the stats socket pass the correct proxy to the parsers
    - MEDIUM: server: implement TCP_USER_TIMEOUT on the server
    - DOC: mention the "namespace" options for bind and server lines
    - DOC: add the "management" documentation
    - DOC: move the stats socket documentation from config to management
    - MINOR: examples: update haproxy.spec to mention new docs
    - DOC: mention management.txt in README
    - DOC: remove haproxy-{en,fr}.txt
    - BUILD: properly report when USE_ZLIB and USE_SLZ are used together
    - MINOR: init: report use of libslz instead of "no compression"
    - CLEANUP: examples: remove some obsolete and confusing files
    - CLEANUP: examples: remove obsolete configuration file samples
    - CLEANUP: examples: fix the example file content-sw-sample.cfg
    - CLEANUP: examples: update sample file option-http_proxy.cfg
    - CLEANUP: examples: update sample file ssl.cfg
    - CLEANUP: tests: move a test file from examples/ to tests/
    - CLEANUP: examples: shut up warnings in transparent proxy example
    - CLEANUP: tests: removed completely obsolete test files
    - DOC: update ROADMAP to remove what was done in 1.6
    - BUG/MEDIUM: pattern: fixup use_after_free in the pat_ref_delete_by_id

5 files changed, 47 insertions, 15 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 493f65093b9..bd90e7bdf69 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2015/07/04 13:13:53 morr Exp $
+# $NetBSD: Makefile,v 1.22 2015/11/12 16:32:29 morr Exp $
 
-DISTNAME=	haproxy-1.5.14
+DISTNAME=	haproxy-1.6.2
 CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.5/src/
+MASTER_SITES=	http://www.haproxy.org/download/1.6/src/
 
 MAINTAINER=	morr@NetBSD.org
 HOMEPAGE=	http://haproxy.1wt.eu/
@@ -20,6 +20,7 @@ INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 RCD_SCRIPTS=		haproxy
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
@@ -51,7 +52,8 @@ TARGET=generic
 LIBS.SunOS+=		-lxnet
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/haproxy/PLIST b/net/haproxy/PLIST
index d72c92a330a..003c96bf1dd 100644
--- a/net/haproxy/PLIST
+++ b/net/haproxy/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2014/07/14 15:30:10 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/11/12 16:32:29 morr Exp $
 man/man1/haproxy.1
 sbin/haproxy
-sbin/haproxy-systemd-wrapper
 share/doc/haproxy/architecture.txt
 share/doc/haproxy/configuration.txt
-share/doc/haproxy/haproxy-en.txt
-share/doc/haproxy/haproxy-fr.txt
-share/examples/haproxy/haproxy.cfg
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 67414e3116e..56a4b8f9e2d 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2015/07/04 13:13:53 morr Exp $
+$NetBSD: distinfo,v 1.17 2015/11/12 16:32:29 morr Exp $
 
-SHA1 (haproxy-1.5.14.tar.gz) = 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f
-RMD160 (haproxy-1.5.14.tar.gz) = 76577b9bf86390582bf43ae7649ed30761267d5d
-Size (haproxy-1.5.14.tar.gz) = 1345345 bytes
-SHA1 (patch-aa) = be43fca3478d170620607cfe7f4b9ed30f341651
+SHA1 (haproxy-1.6.2.tar.gz) = 407bed920315cf66500ab57aea0c402bad850129
+RMD160 (haproxy-1.6.2.tar.gz) = 0b6eb76be8ad540e6d0ced41e2f14463c11bca7d
+SHA512 (haproxy-1.6.2.tar.gz) = 8cb1f2bb7e63e75b1350e37b4a06dae9627bc6004ceefc0e3dac7c6f56ea66cdc41ebaee0e536a5acbd4e5b067feba2589d3e360dd7fdc6d3d67c000f6c83ba9
+Size (haproxy-1.6.2.tar.gz) = 1538976 bytes
+SHA1 (patch-Makefile.diff) = 585bf4f04c22da7187be0a8bf329dbf51dad5ee4
diff --git a/net/haproxy/options.mk b/net/haproxy/options.mk
index b38ba829beb..65c47eae51b 100644
--- a/net/haproxy/options.mk
+++ b/net/haproxy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/03/14 20:36:23 rodent Exp $
+# $NetBSD: options.mk,v 1.3 2015/11/12 16:32:29 morr Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.haproxy
 PKG_SUPPORTED_OPTIONS=	pcre ssl
@@ -15,6 +15,25 @@ BUILD_MAKE_FLAGS+=	USE_PCRE=1
 .endif
 
 ###
+### Support DeviceAtlas detection.
+###
+.if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas)
+DEVICEATLAS_VERSION=	2.1
+DEVICEATLAS_DISTFILE=	deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
+DISTFILES+=		${DEVICEATLAS_DISTFILE}.zip
+DEVICEATLAS_HOMEPAGE=	https://www.deviceatlas.com/deviceatlas-haproxy-module
+
+BUILD_MAKE_FLAGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_SRC=../${DEVICEATLAS_DISTFILE}
+
+.if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.zip)
+FETCH_MESSAGE= 		"Please fetch ${DEVICEATLAS_DISTFILE}.zip manually from"
+FETCH_MESSAGE+=		"${DEVICEATLAS_HOMEPAGE}"
+FETCH_MESSAGE+= 	"and put into"
+FETCH_MESSAGE+= 	"${DISTDIR}"
+.endif
+.endif
+
+###
 ### Support OpenSSL for termination.
 ###
 .if !empty(PKG_OPTIONS:Mssl)
diff --git a/net/haproxy/patches/patch-Makefile.diff b/net/haproxy/patches/patch-Makefile.diff
new file mode 100644
index 00000000000..780dc379185
--- /dev/null
+++ b/net/haproxy/patches/patch-Makefile.diff
@@ -0,0 +1,14 @@
+--- Makefile.orig	2015-10-30 11:52:16.000000000 +0000
++++ Makefile	2015-10-30 11:52:35.000000000 +0000
+--- Makefile.orig	2015-11-03 10:22:06.000000000 +0000
++++ Makefile
+@@ -801,9 +801,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D
+ 
+ install-doc:
+ 	install -d "$(DESTDIR)$(DOCDIR)"
+-	for x in $(DOCUMENTATION); do \
+-		install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
+-	done
+ 
+ install-bin: haproxy $(EXTRA)
+ 	install -d "$(DESTDIR)$(SBINDIR)"