CVS commit: pkgsrc/net/haproxy

["Daniel Horecki" <morr%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   morr
Date:           Sat Aug  3 20:37:19 UTC 2019

Modified Files:
        pkgsrc/net/haproxy: Makefile PLIST distinfo options.mk
        pkgsrc/net/haproxy/patches: patch-Makefile

Log Message:
Update to version 2.0.3.

ChangeLog too big to list here, please take a look at
http://www.haproxy.org/download/2.0/src/CHANGELOG


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/haproxy/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/haproxy/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/haproxy/patches/patch-Makefile

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.46 pkgsrc/net/haproxy/Makefile:1.47
--- pkgsrc/net/haproxy/Makefile:1.46    Thu Jun 13 09:07:08 2019
+++ pkgsrc/net/haproxy/Makefile Sat Aug  3 20:37:19 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2019/06/13 09:07:08 adam Exp $
+# $NetBSD: Makefile,v 1.47 2019/08/03 20:37:19 morr Exp $
 
-DISTNAME=      haproxy-1.8.20
+DISTNAME=      haproxy-2.0.3
 CATEGORIES=    net www
 MASTER_SITES=  http://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/
 

Index: pkgsrc/net/haproxy/PLIST
diff -u pkgsrc/net/haproxy/PLIST:1.8 pkgsrc/net/haproxy/PLIST:1.9
--- pkgsrc/net/haproxy/PLIST:1.8        Tue Mar  7 17:48:06 2017
+++ pkgsrc/net/haproxy/PLIST    Sat Aug  3 20:37:19 2019
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2017/03/07 17:48:06 morr Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/08/03 20:37:19 morr Exp $
 man/man1/haproxy.1
 sbin/haproxy
 share/doc/haproxy/architecture.txt
 share/doc/haproxy/configuration.txt
 share/examples/haproxy/acl-content-sw.cfg
-share/examples/haproxy/auth.cfg
 share/examples/haproxy/content-sw-sample.cfg
 share/examples/haproxy/option-http_proxy.cfg
-share/examples/haproxy/ssl.cfg
+share/examples/haproxy/socks4.cfg
 share/examples/haproxy/transparent_proxy.cfg
 share/examples/haproxy/wurfl-example.cfg

Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.41 pkgsrc/net/haproxy/distinfo:1.42
--- pkgsrc/net/haproxy/distinfo:1.41    Thu Jun 13 09:07:08 2019
+++ pkgsrc/net/haproxy/distinfo Sat Aug  3 20:37:19 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.41 2019/06/13 09:07:08 adam Exp $
+$NetBSD: distinfo,v 1.42 2019/08/03 20:37:19 morr Exp $
 
-SHA1 (haproxy-1.8.20.tar.gz) = 7aa627e4ae0b2ee603d5525436c7f4d13b8e2f5e
-RMD160 (haproxy-1.8.20.tar.gz) = 20df9c96ec28b202ff8ab4957edbc41633151be1
-SHA512 (haproxy-1.8.20.tar.gz) = c288ccf223da71a29ae0f08f3c9753002735816229ea83ca497d46c860fb8a4bd422077a94652aa475e48aefb78787979cdce7f1bd0b5919dc671ba25212c133
-Size (haproxy-1.8.20.tar.gz) = 2083917 bytes
-SHA1 (patch-Makefile) = 0d80582ae4fc755b5a0aeefd5b943d9b2e238768
+SHA1 (haproxy-2.0.3.tar.gz) = 32426b727f88a90b0e8ed04190ba1d138d535394
+RMD160 (haproxy-2.0.3.tar.gz) = e2c94917923852f7df329bd69a59cd409639259e
+SHA512 (haproxy-2.0.3.tar.gz) = dd7eaf7e05c9b3ee162fcc17bc116f81184523437d6f4dbd940b0a6a8e4d01e1984fc8fabafcfc20261203e60e8bd0bc5b0bf813f5eff47b9ba364465bd0633c
+Size (haproxy-2.0.3.tar.gz) = 2534678 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.6 pkgsrc/net/haproxy/options.mk:1.7
--- pkgsrc/net/haproxy/options.mk:1.6   Tue Jul  4 07:04:17 2017
+++ pkgsrc/net/haproxy/options.mk       Sat Aug  3 20:37:19 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2017/07/04 07:04:17 adam Exp $
+# $NetBSD: options.mk,v 1.7 2019/08/03 20:37:19 morr Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.haproxy
-PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas lua
+PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas lua prometheus
 PKG_SUGGESTED_OPTIONS= pcre ssl
 
 .include "../../mk/bsd.options.mk"
@@ -26,6 +26,14 @@ BUILD_MAKE_FLAGS+=   LUA_INC=${PREFIX}/${L
 .endif
 
 ###
+### Use Prometheus
+###
+.if !empty(PKG_OPTIONS:Mprometheus)
+BUILD_MAKE_FLAGS+=     EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+.endif
+
+
+###
 ### Support DeviceAtlas detection.
 ###
 .if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas)

Index: pkgsrc/net/haproxy/patches/patch-Makefile
diff -u pkgsrc/net/haproxy/patches/patch-Makefile:1.6 pkgsrc/net/haproxy/patches/patch-Makefile:1.7
--- pkgsrc/net/haproxy/patches/patch-Makefile:1.6       Thu Jun 13 09:07:08 2019
+++ pkgsrc/net/haproxy/patches/patch-Makefile   Sat Aug  3 20:37:19 2019
@@ -1,15 +1,37 @@
-$NetBSD: patch-Makefile,v 1.6 2019/06/13 09:07:08 adam Exp $
+$NetBSD: patch-Makefile,v 1.7 2019/08/03 20:37:19 morr Exp $
 
 Do not hardcode _XOPEN_SOURCE.
 
---- Makefile.orig      2019-04-25 21:59:27.000000000 +0000
+--- Makefile.orig      2019-07-23 13:21:26.000000000 +0000
 +++ Makefile
-@@ -316,7 +316,7 @@ ifeq ($(TARGET),solaris)
-   # This is for Solaris 8
-   # We also enable getaddrinfo() which works since solaris 8.
-   USE_POLL       = implicit
--  TARGET_CFLAGS  = -fomit-frame-pointer -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+@@ -333,7 +333,7 @@ ifeq ($(TARGET),solaris)
+   set_target_defaults = $(call default_opts, \
+     USE_POLL USE_TPROXY USE_LIBCRYPT USE_CRYPT_H USE_GETADDRINFO USE_THREAD \
+     USE_RT USE_OBSOLETE_LINKER USE_EVPORTS)
+-  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
 +  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT -D__EXTENSIONS__
    TARGET_LDFLAGS = -lnsl -lsocket
-   USE_TPROXY     = implicit
-   USE_LIBCRYPT    = implicit
+ endif
+ 
+@@ -852,8 +852,8 @@ src/haproxy.o:     src/haproxy.c $(DEP)
+              -c -o $@ $<
+ 
+ install-man:
+-      $(Q)install -v -d "$(DESTDIR)$(MANDIR)"/man1
+-      $(Q)install -v -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1
++      $(Q)install -d "$(DESTDIR)$(MANDIR)"/man1
++      $(Q)install -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1
+ 
+ EXCLUDE_DOCUMENTATION = lgpl gpl coding-style
+ DOCUMENTATION = $(filter-out $(EXCLUDE_DOCUMENTATION),$(patsubst doc/%.txt,%,$(wildcard doc/*.txt)))
+@@ -871,8 +871,8 @@ install-bin:
+                       exit 1; \
+               fi; \
+       done
+-      $(Q)install -v -d "$(DESTDIR)$(SBINDIR)"
+-      $(Q)install -v haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
++      $(Q)install -d "$(DESTDIR)$(SBINDIR)"
++      $(Q)install haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
+ 
+ install: install-bin install-man install-doc
+