2015/12/27 : 1.6.3

    - BUG/MINOR: http rule: http capture 'id' rule points to a non existing id
    - BUG/MINOR: server: check return value of fgets() in apply_server_state()
    - BUG/MINOR: acl: don't use record layer in req_ssl_ver
    - BUILD: freebsd: double declaration
    - BUG/MEDIUM: lua: clean output buffer
    - BUILD: check for libressl to be able to build against it
    - DOC: lua-api/index.rst small example fixes, spelling correction.
    - DOC: lua: architecture and first steps
    - DOC: relation between timeout http-request and option http-buffer-request
    - BUILD: Make deviceatlas require PCRE
    - BUG: http: do not abort keep-alive connections on server timeout
    - BUG/MEDIUM: http: switch the request channel to no-delay once done.
    - BUG/MINOR: lua: don't force-sslv3 LUA's SSL socket
    - BUILD/MINOR: http: proto_http.h needs sample.h
    - BUG/MEDIUM: http: don't enable auto-close on the response side
    - BUG/MEDIUM: stream: fix half-closed timeout handling
    - CLEANUP: compression: don't allocate DEFAULT_MAXZLIBMEM without USE_ZLIB
    - BUG/MEDIUM: cli: changing compression rate-limiting must require admin level
    - BUG/MEDIUM: sample: urlp can't match an empty value
    - BUILD: dumpstats: silencing warning for printf format specifier / time_t
    - CLEANUP: proxy: calloc call inverted arguments
    - MINOR: da: silent logging by default and displaying DeviceAtlas support if built.
    - BUG/MEDIUM: da: stop DeviceAtlas processing in the convertor if there is no input.
    - DOC: Edited 51Degrees section of README/ (cherry picked from commit a7bbdd955984f0d69812ff055cc145a338e76daa)
    - BUG/MEDIUM: checks: email-alert not working when declared in defaults
    - BUG/MINOR: checks: email-alert causes a segfault when an unknown mailers section is configured
    - BUG/MINOR: checks: typo in an email-alert error message
    - BUG/MINOR: tcpcheck: conf parsing error when no port configured on server and last rule is a CONNECT with no port
    - BUG/MINOR: tcpcheck: conf parsing error when no port configured on server and first rule(s) is (are) COMMENT
    - BUG/MEDIUM: http: fix http-reuse when frontend and backend differ
    - DOC: prefer using http-request/response over reqXXX/rspXXX directives
    - BUG/MEDIUM: config: properly adjust maxconn with nbproc when memmax is forced
    - BUG/MEDIUM: peers: table entries learned from a remote are pushed to others after a random delay.
    - BUG/MEDIUM: peers: old stick table updates could be repushed.
    - CLEANUP: haproxy: using _GNU_SOURCE instead of __USE_GNU macro.
    - MINOR: lua: service/applet can have access to the HTTP headers when a POST is received
    - REORG/MINOR: lua: convert boolean "int" to bitfield
    - BUG/MEDIUM: lua: Lua applets must not fetch samples using http_txn
    - BUG/MINOR: lua: Lua applets must not use http_txn
    - BUG/MEDIUM: lua: Forbid HTTP applets from being called from tcp rulesets
    - BUG/MAJOR: lua: Do not force the HTTP analysers in use-services
    - CLEANUP: lua: bad error messages
    - DOC: lua: fix lua API
    - DOC: mailers: typo in 'hostname' description
    - DOC: compression: missing mention of libslz for compression algorithm
    - BUILD/MINOR: regex: missing header
    - BUG/MINOR: stream: bad return code
    - DOC: lua: fix somme errors and add implicit types


While there, add better support for deviceatlas option, from David CARLIER.

3 files changed, 14 insertions, 10 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index bd90e7bdf69..c79a19040a4 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2015/11/12 16:32:29 morr Exp $
+# $NetBSD: Makefile,v 1.23 2016/01/03 17:13:40 morr Exp $
 
-DISTNAME=	haproxy-1.6.2
+DISTNAME=	haproxy-1.6.3
 CATEGORIES=	net www
 MASTER_SITES=	http://www.haproxy.org/download/1.6/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index ca018604437..bfc0364aada 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.18 2015/12/29 04:04:29 dholland Exp $
+$NetBSD: distinfo,v 1.19 2016/01/03 17:13:40 morr Exp $
 
-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 (deviceatlas-enterprise-c-2.1.zip) = fbd4a4198307616d51518e50d09666aeac2eea29
+RMD160 (deviceatlas-enterprise-c-2.1.zip) = fc4b78bc18c80cc19e36fa5b8776cbf8b959abd7
+SHA512 (deviceatlas-enterprise-c-2.1.zip) = 99a8e89f3d1c084a93b184685108ea65d1fd925e0c8b52599a42dbe70af3126103da0a9fd284b14ddf59b996204334d360a12651025413bc4d7f76054779275b
+Size (deviceatlas-enterprise-c-2.1.zip) = 504286 bytes
+SHA1 (haproxy-1.6.3.tar.gz) = f7da36b53188fa15551978dfbda80a9e1816fa01
+RMD160 (haproxy-1.6.3.tar.gz) = 936f280639b24aa29c71f60660c093a3d0da6b2a
+SHA512 (haproxy-1.6.3.tar.gz) = 79ed526cd857dcd68d9b8289df4d4a2d87594e8d0d119f4d7c618597db7563a0cedc8417ddcfefb464a322d1fb50cb044656a2fbe78867f58052e0ddaa894bb9
+Size (haproxy-1.6.3.tar.gz) = 1555861 bytes
 SHA1 (patch-Makefile.diff) = bb8cfc3ce5e2abbe60ddde18affe17fbf4ab7ef2
diff --git a/net/haproxy/options.mk b/net/haproxy/options.mk
index 65c47eae51b..3a68aa4c928 100644
--- a/net/haproxy/options.mk
+++ b/net/haproxy/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2015/11/12 16:32:29 morr Exp $
+# $NetBSD: options.mk,v 1.4 2016/01/03 17:13:40 morr Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.haproxy
-PKG_SUPPORTED_OPTIONS=	pcre ssl
+PKG_SUPPORTED_OPTIONS=	pcre ssl deviceatlas
 PKG_SUGGESTED_OPTIONS=	pcre ssl
 
 .include "../../mk/bsd.options.mk"
@@ -20,7 +20,7 @@ BUILD_MAKE_FLAGS+=	USE_PCRE=1
 .if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas)
 DEVICEATLAS_VERSION=	2.1
 DEVICEATLAS_DISTFILE=	deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
-DISTFILES+=		${DEVICEATLAS_DISTFILE}.zip
+DISTFILES=		${DISTNAME}.tar.gz ${DEVICEATLAS_DISTFILE}.zip
 DEVICEATLAS_HOMEPAGE=	https://www.deviceatlas.com/deviceatlas-haproxy-module
 
 BUILD_MAKE_FLAGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_SRC=../${DEVICEATLAS_DISTFILE}