Hi,
Update for haproxy to 1.4.21 with some changes:
- MINOR: patch for minor typo (ressources/resources)
- CLEANUP: fix typo in findserver() log message
- MINOR: stats admin: allow unordered parameters in POST requests
- MINOR: stats admin: use the backend id instead of its name in the form
- BUG/MAJOR: trash must always be the size of a buffer
- BUG/MAJOR: possible crash when using capture headers on TCP frontends
- MINOR: config: disable header captures in TCP mode and complain
- BUG/MEDIUM: balance source did not properly hash IPv6 addresses
- CLEANUP: http: message parser must ignore HTTP_MSG_ERROR
- CLEANUP: remove a few warning about unchecked return values in debug code
- CLEANUP: http: remove unused http_msg->col
- BUG/MINOR: http: error snapshots are wrong if buffer wraps
- BUG/MAJOR: checks: don't call set_server_status_* when no LB algo is set
- MINOR: proxy: make findproxy() return proxies from numeric IDs too
- BUILD: http: stop gcc-4.1.2 from complaining about possibly uninitialized
values
- BUG/MINOR: stop connect timeout when connect succeeds
And others (http://haproxy.1wt.eu/download/1.4/src/CHANGELOG), while here GROFF
is not needed and
add a rc.d(8) script.
Tested on i386.
Ok? Comments?
Cheers.
--
Sending from my VCR...
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 19 Nov 2010 22:31:33 -0000 1.6
+++ Makefile 10 Aug 2012 13:51:02 -0000
@@ -2,7 +2,7 @@
COMMENT = reliable, high performance TCP/HTTP load balancer
-DISTNAME = haproxy-1.3.15.7
+DISTNAME = haproxy-1.4.21
CATEGORIES = net www
HOMEPAGE = http://haproxy.1wt.eu/
@@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c pcre pcreposix
-MASTER_SITES = ${HOMEPAGE}/download/1.3/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.4/src/
HAPROXYCONF = ${SYSCONFDIR}/haproxy
HAPROXYSTATE = /var/haproxy
@@ -28,7 +28,6 @@ SUBST_VARS = HAPROXYCONF HAPROXYSTATE \
MAKE_FILE = Makefile.bsd
MAKE_FLAGS += CC="${CC}" LD="${CC}"
-USE_GROFF = Yes
NO_REGRESS = Yes
LIB_DEPENDS = devel/pcre
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Feb 2009 22:38:33 -0000 1.2
+++ distinfo 10 Aug 2012 13:51:02 -0000
@@ -1,5 +1,2 @@
-MD5 (haproxy-1.3.15.7.tar.gz) = bBl4BxE5xcwnVjIywqSI2g==
-RMD160 (haproxy-1.3.15.7.tar.gz) = GXoLDX98wkVyJVrbvRA02YLaJ5o=
-SHA1 (haproxy-1.3.15.7.tar.gz) = 57QLFuJ67Xc1xzwY/X0upAmquAU=
-SHA256 (haproxy-1.3.15.7.tar.gz) = fYbSE3Hr0i+jmkEuybrvDHWbm8vWFHg269qIZrjDejg=
-SIZE (haproxy-1.3.15.7.tar.gz) = 502900
+SHA256 (haproxy-1.4.21.tar.gz) = bihXXwSS3vMcMx+vnq0IIl3WIVMzSIBoj4p8R3yMMaQ=
+SIZE (haproxy-1.4.21.tar.gz) = 827392
Index: patches/patch-Makefile_bsd
===================================================================
RCS file: /cvs/ports/net/haproxy/patches/patch-Makefile_bsd,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_bsd
--- patches/patch-Makefile_bsd 17 Jul 2008 04:31:45 -0000 1.1.1.1
+++ patches/patch-Makefile_bsd 10 Aug 2012 13:51:02 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_bsd,v 1.1.1.1 2008/07/17 04:31:45 jdixon Exp $
---- Makefile.bsd.orig Sat Jun 21 15:59:05 2008
-+++ Makefile.bsd Tue Jul 15 12:51:26 2008
-@@ -19,13 +19,13 @@ CPU = generic
+--- 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.
@@ -19,16 +19,16 @@ $OpenBSD: patch-Makefile_bsd,v 1.1.1.1 2
# This is the directory hosting include/pcre.h and lib/libpcre.* when
REGEX=pcre
PCREDIR!= pcre-config --prefix 2>/dev/null || :
-@@ -36,7 +36,7 @@ COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE
+@@ -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
- COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
-@@ -51,11 +51,11 @@ LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
+@@ -53,11 +53,11 @@ LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
# options for static libpcre
COPTS.static-pcre=-DUSE_PCRE -I$(PCREDIR)/include
@@ -42,9 +42,9 @@ $OpenBSD: patch-Makefile_bsd,v 1.1.1.1 2
# 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
-@@ -95,8 +95,8 @@ VER_OPTS := -DCONFIG_HAPROXY_VERSION=\"$(VERSION)$(SUB
- COPTS = -Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) \
- $(SMALL_OPTS) $(VER_OPTS) $(DEFINE)
+@@ -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
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/net/haproxy/pkg/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 MESSAGE
--- pkg/MESSAGE 17 Jul 2008 04:31:45 -0000 1.1.1.1
+++ pkg/MESSAGE 10 Aug 2012 13:51:02 -0000
@@ -1,9 +1,2 @@
A sample config file for HAProxy has been installed in
${HAPROXYCONF}, edit it to your site's needs.
-
-To start, add the following to /etc/rc.local:
-
-if [ -x ${PREFIX}/sbin/haproxy ]; then
- ${PREFIX}/sbin/haproxy -f ${HAPROXYCONF}/haproxy.cfg
- echo -n ' haproxy'
-fi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/haproxy/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 23 Jul 2008 15:33:17 -0000 1.2
+++ pkg/PLIST 10 Aug 2012 13:51:02 -0000
@@ -20,3 +20,4 @@ share/examples/haproxy/haproxy.cfg
share/examples/haproxy/option-http_proxy.cfg
share/examples/haproxy/tarpit.cfg
share/examples/haproxy/url-switching.cfg
+@rcscript ${RCDIR}/haproxy
Index: pkg/haproxy.rc
===================================================================
RCS file: pkg/haproxy.rc
diff -N pkg/haproxy.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/haproxy.rc 10 Aug 2012 13:51:02 -0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/haproxy -f ${HAPROXYCONF}/haproxy.cfg"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1
