CVS commit: pkgsrc/net/haproxy

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan  1 21:18:07 UTC 2020

Modified Files:
        pkgsrc/net/haproxy: Makefile distinfo options.mk

Log Message:
haproxy: updated to 2.1.2

2.1.2:
* BUG/MEDIUM: stream: Be sure to never assign a TCP backend to an HTX stream
* BUILD: ssl: improve SSL_CTX_set_ecdh_auto compatibility
* BUG/MEDIUM: ssl: Don't set the max early data we can receive too early.
* BUG/MEDIUM: ssl: Revamp the way early data are handled.
* BUG/MEDIUM: fd/threads: fix a concurrency issue between add and rm on the
  same fd
* BUG/MINOR: ssl: openssl-compat: Fix getm_ defines
* MINOR: sample: Validate the number of bits for the sha2 converter
* DOC: clarify the fact that replace-uri works on a full URI
* BUG/MINOR: sample: fix the closing bracket and LF in the debug converter
* BUG/MINOR: sample: always check converters' arguments
* MINOR: debug: support logging to various sinks
* MINOR: http: add a new "replace-path" action
* MINOR: task: only check TASK_WOKEN_ANY to decide to requeue a task
* BUG/MAJOR: task: add a new TASK_SHARED_WQ flag to fix foreing requeuing
* MINOR: fd/threads: make _GET_NEXT()/_GET_PREV() use the volatile attribute
* BUG/MEDIUM: state-file: do not allocate a full buffer for each server
* BUG/MINOR: state-file: do not store duplicates in the global tree
* BUG/MINOR: state-file: do not leak memory on parse errors


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/haproxy/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/haproxy/Makefile
diff -u pkgsrc/net/haproxy/Makefile:1.56 pkgsrc/net/haproxy/Makefile:1.57
--- pkgsrc/net/haproxy/Makefile:1.56    Mon Dec 30 13:57:40 2019
+++ pkgsrc/net/haproxy/Makefile Wed Jan  1 21:18:07 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2019/12/30 13:57:40 adam Exp $
+# $NetBSD: Makefile,v 1.57 2020/01/01 21:18:07 adam Exp $
 
-DISTNAME=      haproxy-2.0.12
+DISTNAME=      haproxy-2.1.2
 CATEGORIES=    net www
 MASTER_SITES=  https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
 

Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.49 pkgsrc/net/haproxy/distinfo:1.50
--- pkgsrc/net/haproxy/distinfo:1.49    Mon Dec 30 13:57:40 2019
+++ pkgsrc/net/haproxy/distinfo Wed Jan  1 21:18:07 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2019/12/30 13:57:40 adam Exp $
+$NetBSD: distinfo,v 1.50 2020/01/01 21:18:07 adam Exp $
 
-SHA1 (haproxy-2.0.12.tar.gz) = 69c5ca5c99ddd3f8a4ef886cb45e7c77666230b3
-RMD160 (haproxy-2.0.12.tar.gz) = b4055474bf0a55e8da19864799231881919aecc5
-SHA512 (haproxy-2.0.12.tar.gz) = bc81a5f88278b56bddfec52dba5231a06567177fe806faeb5ffb1965d8c4731704e0b92949cc72de0b4738c8baad28c5211d46d1dc980c4145c90081fc2d838c
-Size (haproxy-2.0.12.tar.gz) = 2634202 bytes
+SHA1 (haproxy-2.1.2.tar.gz) = 9f9b84504590ad937ea680e6b136d461fbe23f77
+RMD160 (haproxy-2.1.2.tar.gz) = 0d8fe8b35de7615274db3ea3f9e3d6568602ea68
+SHA512 (haproxy-2.1.2.tar.gz) = 929d244a67f93337e3c791b1a29f9643ac288acdf0090dc7a05c72caf61c3b04ef376b84737351f0c54d58bca66ed8af18faa20ec3adc97067313732e0dfcd7d
+Size (haproxy-2.1.2.tar.gz) = 2663193 bytes
 SHA1 (patch-Makefile) = 790242ebde13ac1a9d95a16cba29e30a9bccd57c
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
 SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3

Index: pkgsrc/net/haproxy/options.mk
diff -u pkgsrc/net/haproxy/options.mk:1.7 pkgsrc/net/haproxy/options.mk:1.8
--- pkgsrc/net/haproxy/options.mk:1.7   Sat Aug  3 20:37:19 2019
+++ pkgsrc/net/haproxy/options.mk       Wed Jan  1 21:18:07 2020
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2019/08/03 20:37:19 morr Exp $
+# $NetBSD: options.mk,v 1.8 2020/01/01 21:18:07 adam Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.haproxy
-PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas lua prometheus
-PKG_SUGGESTED_OPTIONS= pcre ssl
+PKG_OPTIONS_VAR=               PKG_OPTIONS.haproxy
+PKG_SUPPORTED_OPTIONS=         deviceatlas lua prometheus ssl
+PKG_OPTIONS_OPTIONAL_GROUPS=   regex
+PKG_OPTIONS_GROUP.regex=       pcre pcre2 pcre2-jit
+PKG_SUGGESTED_OPTIONS=         pcre ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,14 +16,24 @@ PKG_SUGGESTED_OPTIONS=      pcre ssl
 BUILD_MAKE_FLAGS+=     USE_PCRE=1
 .endif
 
+.if !empty(PKG_OPTIONS:Mpcre2)
+.  include "../../devel/pcre2/buildlink3.mk"
+BUILD_MAKE_FLAGS+=     USE_PCRE2=1
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre2-jit)
+.  include "../../devel/pcre2/buildlink3.mk"
+BUILD_MAKE_FLAGS+=     USE_PCRE2_JIT=1
+.endif
+
 ###
 ### Use LUA
 ###
 .if !empty(PKG_OPTIONS:Mlua)
+LUA_VERSIONS_ACCEPTED= 53
 .  include "../../lang/lua/luaversion.mk"
 BUILD_MAKE_FLAGS+=     USE_LUA=1
-BUILD_MAKE_FLAGS+=     LUA_VERSION_ACCEPTED=53
-BUILD_MAKE_FLAGS+=     LUA_INC=${PREFIX}/${LUA_INCDIR}
+BUILD_MAKE_FLAGS+=     LUA_LIB_NAME=lua5.3
 .  include "../../lang/lua/buildlink3.mk"
 .endif
 
@@ -32,7 +44,6 @@ BUILD_MAKE_FLAGS+=    LUA_INC=${PREFIX}/${L
 BUILD_MAKE_FLAGS+=     EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
 .endif
 
-
 ###
 ### Support DeviceAtlas detection.
 ###