Hi,
Update for HAproxy to 1.5.3:
- DOC: fix typo in Unix Socket commands
- BUG/MEDIUM: connection: fix memory corruption when building a
proxy v2 header
- BUG/MEDIUM: ssl: Fix a memory leak in DHE key exchange
- DOC: mention that Squid correctly responds 400 to PPv2 header
- BUG/MINOR: http: base32+src should use the big endian version of
base32
- BUG/MEDIUM: connection: fix proxy v2 header again!
Now use GMAKE.
Please test! :)
Comments? Ok?
Cheers.-
--
Sending from my toaster.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 12 May 2014 12:34:52 -0000 1.14
+++ Makefile 4 Sep 2014 15:42:03 -0000
@@ -2,7 +2,7 @@
COMMENT = reliable, high performance TCP/HTTP load balancer
-DISTNAME = haproxy-1.4.25
+DISTNAME = haproxy-1.5.3
CATEGORIES = net www
HOMEPAGE = http://haproxy.1wt.eu/
@@ -11,7 +11,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c pcre pcreposix
-MASTER_SITES = ${HOMEPAGE}/download/1.4/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.5/src/
HAPROXYCONF = ${SYSCONFDIR}/haproxy
HAPROXYSTATE = /var/haproxy
@@ -20,7 +20,7 @@ HAPROXYGID = 604
SUBST_VARS = HAPROXYCONF HAPROXYSTATE \
HAPROXYUID HAPROXYGID
-MAKE_FILE = Makefile.bsd
+USE_GMAKE = Yes
MAKE_FLAGS += CC="${CC}" LD="${CC}"
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 12 May 2014 12:34:52 -0000 1.7
+++ distinfo 4 Sep 2014 15:42:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.4.25.tar.gz) = hECOweN78wjGtFrjx+ZvKp0vdiy2iattMixnu6aR22I=
-SIZE (haproxy-1.4.25.tar.gz) = 838775
+SHA256 (haproxy-1.5.3.tar.gz) = Da02gODDWSoWV4HhzJsNXMiNjqqOv1lxnJvWK7nBzZ4=
+SIZE (haproxy-1.5.3.tar.gz) = 1335245
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 4 Sep 2014 15:42:03 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Thu Sep 4 12:15:59 2014
++++ Makefile Thu Sep 4 12:16:16 2014
+@@ -90,7 +90,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
+ # following list (use the default "generic" if uncertain) :
+ # generic, linux22, linux24, linux24e, linux26, solaris,
+ # freebsd, openbsd, cygwin, custom, aix51, aix52
+-TARGET =
++TARGET = openbsd
+
+ #### TARGET CPU
+ # Use CPU=<cpu_name> to optimize for a particular CPU, among the following
Index: patches/patch-Makefile_bsd
===================================================================
RCS file: patches/patch-Makefile_bsd
diff -N patches/patch-Makefile_bsd
--- patches/patch-Makefile_bsd 27 Aug 2012 13:03:06 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-$OpenBSD: patch-Makefile_bsd,v 1.2 2012/08/27 13:03:06 gonzalo Exp $
---- Makefile.bsd.orig Mon May 21 02:03:24 2012
-+++ Makefile.bsd Fri Aug 10 10:12:34 2012
-@@ -20,13 +20,13 @@ CPU = generic
-
- # By default, we use libc's regex. WARNING! On Solaris 8/Sparc, group
- # references seem broken using libc ! Use pcre instead.
--REGEX=libc
-+#REGEX=libc
- #REGEX=pcre
--#REGEX=static-pcre
-+REGEX=static-pcre
-
- # tools options
--CC = gcc
--LD = gcc
-+CC ?= gcc
-+LD ?= gcc
-
- # This is the directory hosting include/pcre.h and lib/libpcre.* when
REGEX=pcre
- PCREDIR!= pcre-config --prefix 2>/dev/null || :
-@@ -37,7 +37,7 @@ COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE
- LIBS.openbsd =
-
- # CPU dependant optimizations
--COPTS.generic = -O2
-+#COPTS.generic = -O2
- COPTS.native = -O2 -march=native
- COPTS.i586 = -O2 -march=i586
- COPTS.i686 = -O2 -march=i686
-@@ -53,11 +53,11 @@ LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
-
- # options for static libpcre
- COPTS.static-pcre=-DUSE_PCRE -I$(PCREDIR)/include
--LIBS.static-pcre=-L$(PCREDIR)/lib -Wl,-Bstatic -lpcreposix -lpcre
-Wl,-Bdynamic
-+LIBS.static-pcre=-L$(PCREDIR)/lib -Bstatic -lpcreposix -lpcre -Bdynamic
-
- # you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG="
- #DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL
--DEBUG = -g
-+#DEBUG = -g
-
- # if small memory footprint is required, you can reduce the buffer size. There
- # are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB memory
-@@ -101,8 +101,8 @@ EBTREE_DIR := ebtree
- COPTS = -Iinclude -I$(EBTREE_DIR) $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) \
- $(SPEC_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(VER_OPTS) $(DEFINE)
- LIBS = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
--CFLAGS = -Wall $(COPTS) $(DEBUG)
--LDFLAGS = -g
-+CFLAGS += -Wall $(COPTS) $(DEBUG)
-+#LDFLAGS = -g
-
- OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
- src/uri_auth.o src/standard.o src/buffers.o src/log.o src/task.o \
Index: patches/patch-doc_haproxy_1
===================================================================
RCS file: /cvs/ports/net/haproxy/patches/patch-doc_haproxy_1,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_haproxy_1
--- patches/patch-doc_haproxy_1 13 Mar 2014 08:58:14 -0000 1.2
+++ patches/patch-doc_haproxy_1 4 Sep 2014 15:42:03 -0000
@@ -1,13 +1,12 @@
$OpenBSD: patch-doc_haproxy_1,v 1.2 2014/03/13 08:58:14 dcoppa Exp $
---- doc/haproxy.1.orig Sat Jun 21 15:59:05 2008
-+++ doc/haproxy.1 Sun Jul 13 01:17:14 2008
-@@ -164,9 +164,7 @@ This signal is intercepted and ignored on systems with
+--- doc/haproxy.1.orig Fri Jul 25 03:56:07 2014
++++ doc/haproxy.1 Thu Sep 4 12:12:46 2014
+@@ -188,8 +188,7 @@ This signal is intercepted and ignored on systems with
.SH SEE ALSO
--A much better documentation can be found in haproxy-en.txt. On debian
--systems, you can find this file in
--/usr/share/doc/haproxy/haproxy-en.txt.gz.
+-A much better documentation can be found in configuration.txt. On Debian
+-systems, you can find this file in
/usr/share/doc/haproxy/configuration.txt.gz.
+More complete documentation can be found in
${TRUEPREFIX}/share/doc/haproxy/configuration.txt.
.SH AUTHOR
