Pullup ticket #4164 - requested by morr

net/haproxy: security update
Pullup ticket #4165 - requested by morr
net/haproxy: security update

Revisions pulled up:
- net/haproxy/Makefile                                          1.8
- net/haproxy/distinfo                                          1.6
- net/haproxy/patches/patch-aa                                  1.3
- net/haproxy/patches/patch-ab                                  1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	morr
   Date:		Wed Apr 17 19:55:38 UTC 2013

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

   Log Message:
   Security update to version 1.4.23.

   ChangeLog:
   2013/04/03 : 1.4.23
    - CONTRIB: halog: sort URLs by avg bytes_read or total bytes_read
    - BUG: fix garbage data when http-send-name-header replaces an existing header
    - BUG/MEDIUM: remove supplementary groups when changing gid
    - BUG/MINOR: Correct logic in cut_crlf()
    - BUG/MINOR: config: use a copy of the file name in proxy configurations
    - BUG/MINOR: epoll: correctly disable FD polling in fd_rem()
    - MINOR: halog: sort output by cookie code
    - BUG/MINOR: halog: -ad/-ac report the correct number of output lines
    - BUG/MINOR: halog: fix help message for -ut/-uto
    - BUG/MEDIUM: http: set DONTWAIT on data when switching to tunnel mode
    - BUG/MEDIUM: command-line option -D must have precedence over "debug"
    - OPTIM: halog: keep a fast path for the lines-count only
    - MINOR: halog: add a parameter to limit output line count
    - BUG: halog: fix broken output limitation
    - MEDIUM: checks: avoid accumulating TIME_WAITs during checks
    - MEDIUM: checks: prevent TIME_WAITs from appearing also on timeouts
    - BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list
    - BUG/MINOR: http: don't report client aborts as server errors
    - BUG/MINOR: http: don't log a 503 on client errors while waiting for requests
    - BUG/MEDIUM: tcp: process could theorically crash on lack of source ports
    - BUG/MINOR: http: don't abort client connection on premature responses
    - BUILD: no need to clean up when making git-tar
    - MINOR: http: always report PR-- flags for redirect rules
    - BUG/MINOR: time: frequency counters are not totally accurate
    - BUG/MINOR: http: don't process abortonclose when request was sent
    - BUG/MINOR: epoll: use a fix maxevents argument in epoll_wait()
    - BUG/MINOR: config: fix improper check for failed memory alloc in ACL parser
    - BUG/MEDIUM: checks: ensure the health_status is always within bounds
    - CLEANUP: http: remove a useless null check
    - BUG/MEDIUM: signal: signal handler does not properly check for signal bounds
    - BUG/MEDIUM: uri_auth: missing NULL check and memory leak on memory shortage
    - CLEANUP: config: slowstart is never negative
    - BUILD: improve the makefile's support for libpcre
    - BUG/MINOR: checks: fix an warning introduced by commit 2f61455a
    - MEDIUM: halog: add support for counting per source address (-ic)
    - DOC: mention the new HTTP 307 and 308 redirect statues     (cherry picked from commit b67fdc4cd8bde202f2805d98683ddab929469a05)
    - MEDIUM: poll: do not use FD_* macros anymore
    - BUG/MAJOR: ev_select: disable the select() poller if maxsock > FD_SETSIZE
    - BUILD: enable poll() by default in the makefile
    - BUILD: add explicit support for Mac OS/X
    - BUG/CRITICAL: using HTTP information in tcp-request content may crash the process
    - MEDIUM: http: implement redirect 307 and 308
    - MINOR: http: status 301 should not be marked non-cacheable


   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/haproxy/Makefile
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/haproxy/distinfo
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/haproxy/patches/patch-aa
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/haproxy/patches/patch-ab

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	morr
   Date:		Thu Jun 20 21:36:28 UTC 2013

   Modified Files:
   	pkgsrc/net/haproxy: Makefile distinfo

   Log Message:
   Security update to version 1.4.24.

   ChangeLog:

   - BUG/MAJOR: backend: consistent hash can loop forever in certain circumstances
   - BUG/MEDIUM: checks: disable TCP quickack when pure TCP checks are used
   - MEDIUM: protocol: implement a "drain" function in protocol layers
   - BUG/CRITICAL: fix a possible crash when using negative header occurrences


   To generate a diff of this commit:
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/haproxy/Makefile
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/haproxy/distinfo

4 files changed, 19 insertions, 19 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 3ca4091302b..748574f4f8c 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/12/15 19:04:55 shattered Exp $
+# $NetBSD: Makefile,v 1.6.4.1 2013/06/23 07:36:06 spz Exp $
 
-DISTNAME=	haproxy-1.4.22
+DISTNAME=	haproxy-1.4.24
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index e587ee80043..1e4c9ee3dd3 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/12/15 19:04:55 shattered Exp $
+$NetBSD: distinfo,v 1.4.4.1 2013/06/23 07:36:06 spz Exp $
 
-SHA1 (haproxy-1.4.22.tar.gz) = ed8918c950bdb5b4b96d62c23073b7972443fe94
-RMD160 (haproxy-1.4.22.tar.gz) = fc9ee4c964683ee9f45eaed2629ae1e9e70d28ce
-Size (haproxy-1.4.22.tar.gz) = 831791 bytes
-SHA1 (patch-aa) = 885eea1c2d4268718f52db80164d04b9fb8086de
-SHA1 (patch-ab) = deacba36df58770b641cf6d4c04a790f966eb6e3
+SHA1 (haproxy-1.4.24.tar.gz) = 0c5104d029d8d58d39b0d94179edd84c661306d1
+RMD160 (haproxy-1.4.24.tar.gz) = b176de6feb19aec40f1808d81c10e0ff3f229e16
+Size (haproxy-1.4.24.tar.gz) = 836768 bytes
+SHA1 (patch-aa) = b2cb2fd29427acf4e679bac90acb4a5dc9d29f11
+SHA1 (patch-ab) = 10e051618f1fc561f5e5c87af576a87e1c3a884b
diff --git a/net/haproxy/patches/patch-aa b/net/haproxy/patches/patch-aa
index e22c787771d..1498da556d0 100644
--- a/net/haproxy/patches/patch-aa
+++ b/net/haproxy/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2012/12/15 19:04:56 shattered Exp $
+$NetBSD: patch-aa,v 1.2.4.1 2013/06/23 07:36:41 spz Exp $
 
 Add support for NetBSD.
 
---- Makefile.orig	2012-08-14 07:09:31.000000000 +0000
+--- Makefile.orig	2013-04-03 00:33:32.000000000 +0000
 +++ Makefile
-@@ -71,7 +71,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
+@@ -73,7 +73,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
  # Use TARGET=<target_name> to optimize for a specifc target OS among the
  # following list (use the default "generic" if uncertain) :
  #    generic, linux22, linux24, linux24e, linux26, solaris,
@@ -13,7 +13,7 @@ Add support for NetBSD.
  TARGET =
  
  #### TARGET CPU
-@@ -89,7 +89,6 @@ ARCH =
+@@ -91,7 +91,6 @@ ARCH =
  
  #### Toolchain options.
  # GCC is normally used both for compiling and linking.
@@ -21,7 +21,7 @@ Add support for NetBSD.
  LD = $(CC)
  
  #### Debug flags (typically "-g").
-@@ -240,6 +239,12 @@ ifeq ($(TARGET),freebsd)
+@@ -252,6 +251,12 @@ ifeq ($(TARGET),osx)
    USE_TPROXY     = implicit
    USE_LIBCRYPT   = implicit
  else
@@ -34,15 +34,15 @@ Add support for NetBSD.
  ifeq ($(TARGET),openbsd)
    # This is for OpenBSD >= 3.0
    USE_POLL       = implicit
-@@ -262,6 +267,7 @@ ifeq ($(TARGET),cygwin)
+@@ -274,6 +279,7 @@ ifeq ($(TARGET),cygwin)
  endif # cygwin
  endif # aix52
  endif # openbsd
 +endif # netbsd
+ endif # osx
  endif # freebsd
  endif # solaris
- endif # linux2628
-@@ -495,7 +501,7 @@ all:
+@@ -510,7 +516,7 @@ all:
  	@echo "Please choose the target among the following supported list :"
  	@echo
  	@echo "   linux2628, linux26, linux24, linux24e, linux22, solaris"
diff --git a/net/haproxy/patches/patch-ab b/net/haproxy/patches/patch-ab
index 2fa70497113..a49d9e2f8a2 100644
--- a/net/haproxy/patches/patch-ab
+++ b/net/haproxy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2012/12/15 19:04:56 shattered Exp $
+$NetBSD: patch-ab,v 1.1.4.1 2013/06/23 07:36:41 spz Exp $
 
---- src/haproxy.c.orig	2012-05-21 05:03:24.000000000 +0000
+--- src/haproxy.c.orig	2013-04-03 00:33:32.000000000 +0000
 +++ src/haproxy.c
-@@ -100,10 +100,10 @@ int  relative_pid = 1;		/* process id st
+@@ -101,10 +101,10 @@ int  relative_pid = 1;		/* process id st
  
  /* global options */
  struct global global = {