Pullup ticket #4759 - requested by morr

net/haproxy: security fix

Revisions pulled up:
- net/haproxy/Makefile                                          1.21
- net/haproxy/distinfo                                          1.16
- net/haproxy/patches/patch-standard_h                          deleted

---
   Module Name:	pkgsrc
   Committed By:	morr
   Date:		Sat Jul  4 13:13:53 UTC 2015

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

   Log Message:
   Security update to newest version.

   Changes:

   Released version 1.5.14 with the following main changes :
     - BUILD/MINOR: tools: rename popcount to my_popcountl
     - BUG/MAJOR: buffers: make the buffer_slow_realign() function respect output data

   Released version 1.5.13 with the following main changes :
     - BUG/MINOR: check: fix tcpcheck error message
     - CLEANUP: deinit: remove codes for cleaning p->block_rules
     - DOC: Update doc about weight, act and bck fields in the statistics
     - MINOR: ssl: add a destructor to free allocated SSL ressources
     - BUG/MEDIUM: ssl: fix tune.ssl.default-dh-param value being overwritten
     - MEDIUM: ssl: replace standards DH groups with custom ones
     - BUG/MINOR: debug: display (null) in place of "meth"
     - BUG/MINOR: cfgparse: fix typo in 'option httplog' error message
     - BUG/MEDIUM: cfgparse: segfault when userlist is misused
     - BUG/MEDIUM: stats: properly initialize the scope before dumping stats
     - BUG/MEDIUM: http: don't forward client shutdown without NOLINGER except for tunnels
     - CLEANUP: checks: fix double usage of cur / current_step in tcp-checks
     - BUG/MEDIUM: checks: do not dereference head of a tcp-check at the end
     - CLEANUP: checks: simplify the loop processing of tcp-checks
     - BUG/MAJOR: checks: always check for end of list before proceeding
     - BUG/MEDIUM: checks: do not dereference a list as a tcpcheck struct
     - BUG/MEDIUM: peers: apply a random reconnection timeout
     - BUG/MINOR: ssl: fix smp_fetch_ssl_fc_session_id
     - MEDIUM: init: don't stop proxies in parent process when exiting
     - MINOR: peers: store the pointer to the signal handler
     - MEDIUM: peers: unregister peers that were never started
     - MEDIUM: config: propagate the table's process list to the peers sections
     - MEDIUM: init: stop any peers section not bound to the correct process
     - MEDIUM: config: validate that peers sections are bound to exactly one process
     - MAJOR: peers: allow peers section to be used with nbproc > 1
     - DOC: relax the peers restriction to single-process
     - CLEANUP: config: fix misleading information in error message.
     - MINOR: config: report the number of processes using a peers section in the error case
     - BUG/MEDIUM: config: properly compute the default number of processes for a proxy

   pkgsrc changes:
   Thanks to "rename popcount to my_popcountl" one of patches can be removed.

4 files changed, 9 insertions, 38 deletions

diff --git a/doc/CHANGES-pkgsrc-2015Q2 b/doc/CHANGES-pkgsrc-2015Q2
index 579b743b91d..2b791c24c58 100644
--- a/doc/CHANGES-pkgsrc-2015Q2
+++ b/doc/CHANGES-pkgsrc-2015Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2015Q2,v 1.1.2.12 2015/07/22 20:16:43 tron Exp $
+$NetBSD: CHANGES-pkgsrc-2015Q2,v 1.1.2.13 2015/07/26 15:41:36 bsiegert Exp $
 
 Changes to the packages collection and infrastructure on the 2015Q2 branch:
 
@@ -51,3 +51,5 @@ Pullup ticket #4779 - requested by taca
 www/apache24: security update
 Pullup ticket #4780 - requested by taca
 mail/postfix: security update
+Pullup ticket #4759 - requested by morr
+net/haproxy: security fix
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 0c809369fdf..d7b37de0702 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2015/06/26 13:37:27 rodent Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2015/07/26 15:41:36 bsiegert Exp $
 
-DISTNAME=	haproxy-1.5.12
+DISTNAME=	haproxy-1.5.14
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.5/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index 27547e49ca8..aec529265d3 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2015/06/26 13:37:27 rodent Exp $
+$NetBSD: distinfo,v 1.15.2.1 2015/07/26 15:41:36 bsiegert Exp $
 
-SHA1 (haproxy-1.5.12.tar.gz) = c488f7f108ddefb558bd86e7cbc1b71636ada856
-RMD160 (haproxy-1.5.12.tar.gz) = b51fb65360e768c788324a02be773ab23946d430
-Size (haproxy-1.5.12.tar.gz) = 1344813 bytes
+SHA1 (haproxy-1.5.14.tar.gz) = 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f
+RMD160 (haproxy-1.5.14.tar.gz) = 76577b9bf86390582bf43ae7649ed30761267d5d
+Size (haproxy-1.5.14.tar.gz) = 1345345 bytes
 SHA1 (patch-aa) = be43fca3478d170620607cfe7f4b9ed30f341651
-SHA1 (patch-standard_h) = 08ef71d48cd846d16b7427e6dd133bb4a02d431c
diff --git a/net/haproxy/patches/patch-standard_h b/net/haproxy/patches/patch-standard_h
deleted file mode 100644
index 00cd3939b4a..00000000000
--- a/net/haproxy/patches/patch-standard_h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-standard_h,v 1.1 2014/07/14 15:30:10 fhajny Exp $
-
-Remove local version of popcount(3), conflicts w/ libc.
-
---- include/common/standard.h.orig	2014-07-12 14:40:52.000000000 +0000
-+++ include/common/standard.h
-@@ -24,6 +24,7 @@
- 
- #include <limits.h>
- #include <string.h>
-+#include <strings.h>
- #include <time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -565,6 +566,7 @@ static inline unsigned int div64_32(unsi
- 	return result;
- }
- 
-+#if !defined(__NetBSD__)
- /* Simple popcount implementation. It returns the number of ones in a word */
- static inline unsigned int popcount(unsigned long a)
- {
-@@ -575,6 +577,7 @@ static inline unsigned int popcount(unsi
- 	}
- 	return cnt;
- }
-+#endif
- 
- /* Build a word with the <bits> lower bits set (reverse of popcount) */
- static inline unsigned long nbits(int bits)