CVS commit: [pkgsrc-2016Q2] pkgsrc/net/haproxy

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Jul 14 18:31:58 UTC 2016

Modified Files:
        pkgsrc/net/haproxy [pkgsrc-2016Q2]: Makefile distinfo
        pkgsrc/net/haproxy/patches [pkgsrc-2016Q2]: patch-Makefile

Log Message:
Pullup ticket #5057 - requested by sevan
net/haproxy: security fix

Revisions pulled up:
- net/haproxy/Makefile                                          1.28
- net/haproxy/distinfo                                          1.23
- net/haproxy/patches/patch-Makefile                            1.2

---
   Module Name:    pkgsrc
   Committed By:   morr
   Date:           Sun Jul  3 14:06:45 UTC 2016

   Modified Files:
           pkgsrc/net/haproxy: Makefile distinfo
           pkgsrc/net/haproxy/patches: patch-Makefile

   Log Message:
   Update to newer version 1.6.6.

   Changes:

   - BUG/MAJOR: fix listening IP address storage for frontends
   - BUG/MINOR: fix listening IP address storage for frontends (cont)
   - DOC: Fix typo so fetch is properly parsed by Cyril's converter
   - BUG/MAJOR: http: fix breakage of "reqdeny" causing random crashes
   - BUG/MEDIUM: stick-tables: fix breakage in table converters
   - BUG/MEDIUM: dns: unbreak DNS resolver after header fix
   - BUILD: fix build on Solaris 11
   - CLEANUP: connection: fix double negation on memcmp()
   - BUG/MEDIUM: stats: show servers state may show an servers from another backend
   - BUG/MEDIUM: fix risk of segfault with "show tls-keys"
   - BUG/MEDIUM: sticktables: segfault in some configuration error cases
   - BUG/MEDIUM: lua: converters doesn't work
   - BUG/MINOR: http: add-header: header name copied twice
   - BUG/MEDIUM: http: add-header: buffer overwritten
   - BUG/MINOR: ssl: fix potential memory leak in ssl_sock_load_dh_params()
   - BUG/MINOR: http: url32+src should use the big endian version of url32
   - BUG/MINOR: http: url32+src should check cli_conn before using it
   - DOC: http: add documentation for url32 and url32+src
   - BUG/MINOR: fix http-response set-log-level parsing error
   - MINOR: systemd: Use variable for config and pidfile paths
   - MINOR: systemd: Perform sanity check on config before reload (cherry picked from commit 68535bddf305fdd22f1449a039939b57245212e7)
   - BUG/MINOR: init: always ensure that global.rlimit_nofile matches actual limits
   - BUG/MINOR: init: ensure that FD limit is raised to the max allowed
   - BUG/MEDIUM: external-checks: close all FDs right after the fork()
   - BUG/MAJOR: external-checks: use asynchronous signal delivery
   - BUG/MINOR: external-checks: do not unblock undesired signals
   - BUILD/MEDIUM: rebuild everything when an include file is changed
   - BUILD/MEDIUM: force a full rebuild if some build options change
   - BUG/MINOR: srv-state: fix incorrect output of state file
   - BUG/MINOR: ssl: close ssl key file on error
   - BUG/MINOR: http: fix misleading error message for response captures
   - BUG/BUILD: don't automatically run "make" on "make install"
   - DOC: add missing doc for http-request deny [deny_status <status>]

   Drop one patch included upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.2.1 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.22 -r1.22.2.1 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.1 -r1.1.4.1 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.27 pkgsrc/net/haproxy/Makefile:1.27.2.1
--- pkgsrc/net/haproxy/Makefile:1.27    Mon May 16 21:44:44 2016
+++ pkgsrc/net/haproxy/Makefile Thu Jul 14 18:31:58 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2016/05/16 21:44:44 morr Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2016/07/14 18:31:58 bsiegert Exp $
 
-DISTNAME=      haproxy-1.6.5
+DISTNAME=      haproxy-1.6.6
 CATEGORIES=    net www
 MASTER_SITES=  http://www.haproxy.org/download/1.6/src/
 

Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.22 pkgsrc/net/haproxy/distinfo:1.22.2.1
--- pkgsrc/net/haproxy/distinfo:1.22    Mon May 16 21:44:44 2016
+++ pkgsrc/net/haproxy/distinfo Thu Jul 14 18:31:58 2016
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.22 2016/05/16 21:44:44 morr Exp $
+$NetBSD: distinfo,v 1.22.2.1 2016/07/14 18:31:58 bsiegert Exp $
 
-SHA1 (haproxy-1.6.5.tar.gz) = d9f5b6cade54d958ada2f67c6c7b97c9c8ef14ac
-RMD160 (haproxy-1.6.5.tar.gz) = 11c62455dc0e2f28209fa277f311f6f68184b2ab
-SHA512 (haproxy-1.6.5.tar.gz) = 68222f97cb9515c05c46f8650fe63c522de409118a533f90d8c03d1d09d99c21faa8d53f570313407d9f40605dec5151f5fe560280b8ba99734ffdf5bd3db03a
-Size (haproxy-1.6.5.tar.gz) = 1563272 bytes
-SHA1 (patch-Makefile) = 5618e5a15c710267b06756d529486acfdb831e5f
-SHA1 (patch-include_common_standard.h) = cc4b46e4923447a2d5d95cff2f241981ed77ad1d
+SHA1 (haproxy-1.6.6.tar.gz) = 51deaf978218518afe74240bbc800a28c5a37644
+RMD160 (haproxy-1.6.6.tar.gz) = 48c9bfa2d531e81f3d13686655b2e6c8b959785b
+SHA512 (haproxy-1.6.6.tar.gz) = 66503bb9bb33bf345d5e9351fa8a0aea2ef8c3c2870d35ee2f1e4f8e79ed66b3936e7410ce79571901a9936a2eec3695ce3080bb664200fb55040b1ef1f7f888
+Size (haproxy-1.6.6.tar.gz) = 1565046 bytes
+SHA1 (patch-Makefile) = f635093d547270603ffea8837a42a8cca2e03bdf

Index: pkgsrc/net/haproxy/patches/patch-Makefile
diff -u pkgsrc/net/haproxy/patches/patch-Makefile:1.1 pkgsrc/net/haproxy/patches/patch-Makefile:1.1.4.1
--- pkgsrc/net/haproxy/patches/patch-Makefile:1.1       Mon Feb  1 10:07:56 2016
+++ pkgsrc/net/haproxy/patches/patch-Makefile   Thu Jul 14 18:31:58 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2016/02/01 10:07:56 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.1.4.1 2016/07/14 18:31:58 bsiegert Exp $
 
 Skip installing unnecessary documentation.
 
---- Makefile.orig      2015-11-03 10:22:06.000000000 +0000
+--- Makefile.orig      2016-06-26 17:41:01.000000000 +0000
 +++ Makefile
-@@ -801,9 +801,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D
+@@ -812,9 +812,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D
  
  install-doc:
        install -d "$(DESTDIR)$(DOCDIR)"
@@ -12,5 +12,5 @@ Skip installing unnecessary documentatio
 -              install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
 -      done
  
- install-bin: haproxy $(EXTRA)
-       install -d "$(DESTDIR)$(SBINDIR)"
+ install-bin:
+       @for i in haproxy $(EXTRA); do \