Update to 1.4.22 and replace a gcc-ism with a c99-ism. Notable changes:

    - BUG/MEDIUM: option forwardfor if-none doesn't work with some configurations
    - BUG/MEDIUM: ebtree: ebmb_insert() must not call cmp_bits on full-length matches

4 files changed, 38 insertions, 18 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index e48e449b2f4..3ca4091302b 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 17:18:26 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/15 19:04:55 shattered Exp $
 
-DISTNAME=	haproxy-1.4.21
+DISTNAME=	haproxy-1.4.22
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index eeb8b8221e6..e587ee80043 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2012/05/25 08:19:47 morr Exp $
+$NetBSD: distinfo,v 1.4 2012/12/15 19:04:55 shattered Exp $
 
-SHA1 (haproxy-1.4.21.tar.gz) = 31df0e8bd18350457a5d3432f367c6218ecc9042
-RMD160 (haproxy-1.4.21.tar.gz) = 78d2d81f4ffa03e57fedaf090c42479ceb669438
-Size (haproxy-1.4.21.tar.gz) = 827392 bytes
-SHA1 (patch-aa) = 6012886156a54054cebf7f184d69a0cd0b1ad17b
+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
diff --git a/net/haproxy/patches/patch-aa b/net/haproxy/patches/patch-aa
index 1a87d31d193..e22c787771d 100644
--- a/net/haproxy/patches/patch-aa
+++ b/net/haproxy/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/10/31 23:34:07 morr Exp $
+$NetBSD: patch-aa,v 1.2 2012/12/15 19:04:56 shattered Exp $
 
 Add support for NetBSD.
 
---- Makefile.orig	2011-03-09 08:00:16.000000000 +0000
+--- Makefile.orig	2012-08-14 07:09:31.000000000 +0000
 +++ Makefile
 @@ -71,7 +71,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,
--#    freebsd, openbsd, cygwin, custom
-+#    freebsd, netbsd, openbsd, cygwin, custom
+-#    freebsd, openbsd, cygwin, custom, aix52
++#    freebsd, netbsd, openbsd, cygwin, custom, aix52
  TARGET =
  
  #### TARGET CPU
@@ -21,7 +21,7 @@ Add support for NetBSD.
  LD = $(CC)
  
  #### Debug flags (typically "-g").
-@@ -228,6 +227,12 @@ ifeq ($(TARGET),freebsd)
+@@ -240,6 +239,12 @@ ifeq ($(TARGET),freebsd)
    USE_TPROXY     = implicit
    USE_LIBCRYPT   = implicit
  else
@@ -34,20 +34,20 @@ Add support for NetBSD.
  ifeq ($(TARGET),openbsd)
    # This is for OpenBSD >= 3.0
    USE_POLL       = implicit
-@@ -242,6 +247,7 @@ ifeq ($(TARGET),cygwin)
-   TARGET_CFLAGS  = $(if $(filter 1.5.%, $(shell uname -r)), -DUSE_IPV6 -DAF_INET6=23 -DINET6_ADDRSTRLEN=46, )
+@@ -262,6 +267,7 @@ ifeq ($(TARGET),cygwin)
  endif # cygwin
+ endif # aix52
  endif # openbsd
 +endif # netbsd
  endif # freebsd
  endif # solaris
- endif # linux26
-@@ -473,7 +479,7 @@ all:
+ endif # linux2628
+@@ -495,7 +501,7 @@ all:
  	@echo "Please choose the target among the following supported list :"
  	@echo
- 	@echo "   linux26, linux24, linux24e, linux22, solaris"
+ 	@echo "   linux2628, linux26, linux24, linux24e, linux22, solaris"
 -	@echo "   freebsd, openbsd, cygwin, custom, generic"
-+	@echo "   freebsd, netbsd, openbsd, cygwin, custom, generic"
++	@echo "   freebsd, netbsd, openbsd, cygwin, custom, generic, aix52"
  	@echo
  	@echo "Use \"generic\" if you don't want any optimization, \"custom\" if you"
  	@echo "want to precisely tweak every option, or choose the target which"
diff --git a/net/haproxy/patches/patch-ab b/net/haproxy/patches/patch-ab
new file mode 100644
index 00000000000..2fa70497113
--- /dev/null
+++ b/net/haproxy/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2012/12/15 19:04:56 shattered Exp $
+
+--- src/haproxy.c.orig	2012-05-21 05:03:24.000000000 +0000
++++ src/haproxy.c
+@@ -100,10 +100,10 @@ int  relative_pid = 1;		/* process id st
+ 
+ /* global options */
+ struct global global = {
+-	logfac1 : -1,
+-	logfac2 : -1,
+-	loglev1 : 7, /* max syslog level : debug */
+-	loglev2 : 7,
++	.logfac1 = -1,
++	.logfac2 = -1,
++	.loglev1 = 7, /* max syslog level : debug */
++	.loglev2 = 7,
+ 	.stats_sock = {
+ 		.maxconn = 10, /* 10 concurrent stats connections */
+ 		.perm = {