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.

1 files changed, 5 insertions, 5 deletions

diff --git a/net/haproxy/patches/patch-Makefile b/net/haproxy/patches/patch-Makefile
index 49b943a163a..32ac8f1d1fd 100644
--- a/net/haproxy/patches/patch-Makefile
+++ b/net/haproxy/patches/patch-Makefile
@@ -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 documentation.
 -		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 \