diff options
| -rw-r--r-- | net/haproxy/Makefile | 4 | ||||
| -rw-r--r-- | net/haproxy/distinfo | 12 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-aa | 16 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-ab | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 3ca4091302b..15d8147fe3d 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.7 2013/04/17 19:55:37 morr Exp $ -DISTNAME= haproxy-1.4.22 +DISTNAME= haproxy-1.4.23 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..560dfc7461c 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.5 2013/04/17 19:55:37 morr 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.23.tar.gz) = a171a98e58a853e6487ff768db53a496012fd704 +RMD160 (haproxy-1.4.23.tar.gz) = d87ef7665dbde877bbe3428b95080673efbf85f1 +Size (haproxy-1.4.23.tar.gz) = 835907 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..de1cfdf652b 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.3 2013/04/17 19:55:37 morr 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..7dbae3baca2 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.2 2013/04/17 19:55:37 morr 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 = { |