Date: Sat, 30 Jan 2010 20:58:07 +0100 (CET) From: Stephane Clodic <sclo+freebsd-ports@rapsody.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Stephane Clodic <sclo+freebsd-ports@rapsody.com> Subject: ports/143378: update net/haproxy to 1.3.23 from net/haproxy-devel Message-ID: <201001301958.o0UJw7X5065780@ns366358.ovh.net> Resent-Message-ID: <201001302000.o0UK0HI8040874@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143378 >Category: ports >Synopsis: update net/haproxy to 1.3.23 from net/haproxy-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 30 20:00:17 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Stephane Clodic <sclo+freebsd-ports@rapsody.com> >Release: FreeBSD 8.0-STABLE i386 >Organization: >Environment: System: FreeBSD nsXXXXXX.ovh.net 8.0-STABLE FreeBSD 8.0-STABLE #18: Mon Jan 25 07:05:14 CET 2010 root@ns366358.ovh.net:/usr/obj/usr/src/sys/H2D2 i386 >Description: Please find attached diff againts etc/haproxy port. This net/haproxy port is issued from net/haproxy-devel (1.3.22) with version bumped to 1.3.23 Regarding haproxy website, 1.3 is the current stable branch, and 1.2.x the previous branch. Regards (excuse me for the first empty PR) >How-To-Repeat: none >Fix: Please find attached diff --- haproxy.diff begins here --- diff -urN haproxy_1.2.18/Makefile haproxy/Makefile --- haproxy_1.2.18/Makefile 2009-11-12 05:56:14.000000000 +0100 +++ haproxy/Makefile 2010-01-30 20:23:01.000000000 +0100 @@ -1,62 +1,45 @@ -# New ports collection Makefile for: haproxy -# Date created: Apr 30, 2003 -# Whom: Clement Laforet +# New ports collection makefile for: haproxy-devel +# Date created: Thu May 3 16:30:19 WEST 2007 +# Whom: Hugo Saro <hugo@barafranca.com> # -# $FreeBSD: ports/net/haproxy/Makefile,v 1.21 2009/11/12 04:56:14 linimon Exp $ +# $FreeBSD: ports/net/haproxy-devel/Makefile,v 1.31 2009/11/01 13:47:25 sylvio Exp $ # PORTNAME= haproxy -PORTVERSION= 1.2.18 -CATEGORIES= net www -MASTER_SITES= http://haproxy.1wt.eu/download/1.2/src/ +PORTVERSION= 1.3.23 +CATEGORIES= net +MASTER_SITES= http://haproxy.1wt.eu/download/1.3/src/ -MAINTAINER= ports@FreeBSD.org -COMMENT= High-performance and highly-robust TCP/HTTP load balancer +MAINTAINER= hugo@barafranca.com +COMMENT= The Reliable, High Performance TCP/HTTP Load Balancer -USE_RC_SUBR= haproxy.sh - -STATS_INTERVAL?= 0 -CFLAGS+= -DSTATTIME=${STATS_INTERVAL} - -.if defined(WITH_TPROXY) -CFLAGS+= -DTPROXY -.endif - -.if defined(WITH_PCRE) -PKGNAMESUFFIX= -pcre -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -MAKE_ENV+= "REGEX=pcre" -CFLAGS+= -DUSE_PCRE -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lpcreposix -lpcre -.endif - -.if defined(WITH_SMALLOPTS) -CFLAGS+= -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024 -.endif +CONFLICTS= haproxy-1.2* haproxy-devel-* +USE_RC_SUBR= haproxy MAKEFILE= Makefile.bsd -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Available options:" - @${ECHO_MSG} "WITH_PCRE: Use pcre regex engine" - @${ECHO_MSG} "WITH_TPROXY: Enable Transparent proxy support" - @${ECHO_MSG} "WITH_SMALLOPTS: Enable low memory footprint support" - @${ECHO_MSG} "STATS_INTERVAL=###: Statistics interval in milliseconds," - @${ECHO_MSG} " (default to 0, disabled)" - @${ECHO_MSG} "" - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin + .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \ - ${EXAMPLESDIR}/haproxy.cfg + @${MKDIR} ${DOCSDIR}/design-thoughts + @${MKDIR} ${DOCSDIR}/internals + @${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}/ + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} internals ${DOCSDIR}/) + @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} design-thoughts ${DOCSDIR}/) .endif + @${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \ + ${PREFIX}/etc/haproxy.conf-dist post-install: - @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} "" + @${ECHO_MSG} "" + @${ECHO_MSG} "" + @${ECHO_MSG} "${PORTNAME} is now installed." + @${ECHO_MSG} "To configure it, rename ${PREFIX}/etc/haproxy.conf-dist" + @${ECHO_MSG} "and add haproxy_enable=\"YES\" to /etc/rc.conf" + @${ECHO_MSG} "" + @${ECHO_MSG} "" .include <bsd.port.mk> diff -urN haproxy_1.2.18/distinfo haproxy/distinfo --- haproxy_1.2.18/distinfo 2008-08-31 22:09:58.000000000 +0200 +++ haproxy/distinfo 2010-01-30 20:23:13.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (haproxy-1.2.18.tar.gz) = aa1884cbbb22fab2e8ff0beb37db1f8b -SHA256 (haproxy-1.2.18.tar.gz) = e0ef06180fae5e3a96712b86486788a0f961459640fd94d99389548df50aa9c0 -SIZE (haproxy-1.2.18.tar.gz) = 206287 +MD5 (haproxy-1.3.23.tar.gz) = 4ffe926ccf4f4d53f149290eb001fad5 +SHA256 (haproxy-1.3.23.tar.gz) = cbdf1677ed2665e1ad0e9a32b314c33555442287baf63aedd108b56fe45764d9 +SIZE (haproxy-1.3.23.tar.gz) = 660161 diff -urN haproxy_1.2.18/files/haproxy.sh.in haproxy/files/haproxy.sh.in --- haproxy_1.2.18/files/haproxy.sh.in 2006-11-01 15:42:14.000000000 +0100 +++ haproxy/files/haproxy.sh.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/net/haproxy/files/haproxy.sh.in,v 1.1 2006/11/01 14:42:14 clement Exp $ -# - -# PROVIDE: haproxy -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable haproxy: -# haproxy_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable haproxy -# haproxylimits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before haproxy starts. -# haproxy_flags (str): Set to "" by default. -# Extra flags passed to start command -# haproxylimits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. %%RC_SUBR%% - -name="haproxy" -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/haproxy" -pidfile="/var/run/haproxy.pid" -required_files=%%PREFIX%%/etc/haproxy.conf - -[ -z "$haproxy_enable" ] && haproxy_enable="NO" -[ -z "$haproxy_flags" ] && haproxy_flags="-p ${pidfile} -f /usr/local/etc/haproxy.conf" -[ -z "$haproxylimits_enable" ] && haproxylimits_enable="NO" -[ -z "$haproxylimits_args" ] && haproxylimits_args="-e -C daemon" - -load_rc_config $name - -checkyesno haproxylimits_enable && \ - start_precmd="eval `/usr/bin/limits ${haproxylimits_args}` 2>/dev/null" - -sig_gracefulstop=SIGUSR1 - -haproxy_gracefulstop() { - echo "Gracefully shutdown haproxy ($rc_pid)" - kill -${sig_gracefulstop} ${rc_pid} - } - -extra_commands="gracefulstop" -run_rc_command "$1" diff -urN haproxy_1.2.18/files/patch-Makefile.bsd haproxy/files/patch-Makefile.bsd --- haproxy_1.2.18/files/patch-Makefile.bsd 2007-08-12 17:45:08.000000000 +0200 +++ haproxy/files/patch-Makefile.bsd 2008-07-08 11:19:03.000000000 +0200 @@ -1,7 +1,17 @@ ---- ./Makefile.bsd.orig 2007-03-18 05:04:39.000000000 +0800 -+++ ./Makefile.bsd 2007-07-24 20:38:01.803049803 +0800 -@@ -5,22 +5,22 @@ - TARGET = openbsd +--- ./Makefile.bsd.orig 2007-12-05 16:25:44.000000000 -0800 ++++ ./Makefile.bsd 2008-01-17 11:26:47.695860700 -0800 +@@ -1,4 +1,4 @@ +-# This makefile is dedicated to OpenBSD (and possibly other BSDs) ++# This makefile is dedicated to FreeBSD (and possibly other BSDs) + # You should use it this way : + # make TARGET=os CPU=cpu + # +@@ -9,31 +9,31 @@ + + # Select target OS. TARGET must match a system for which COPTS and LIBS are + # correctly defined below. +-TARGET = openbsd ++TARGET = freebsd # pass CPU=<cpu_name> to make to optimize for a particular CPU -CPU = generic @@ -20,15 +30,25 @@ # tools options -CC = gcc -LD = gcc -+CC?= gcc -+LD?= gcc ++CC? = gcc ++LD? = gcc --PCREDIR=/usr/local + # This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre +-PCREDIR!= pcre-config --prefix 2>/dev/null || : +-#PCREDIR=/usr/local ++#PCREDIR!= pcre-config --prefix 2>/dev/null || : +PCREDIR=${LOCALBASE} - # This is for OpenBSD 3.0 - COPTS.openbsd = -DENABLE_POLL -@@ -46,7 +46,7 @@ +-# This is for OpenBSD 3.0 and above +-COPTS.openbsd = -DENABLE_POLL -DENABLE_KQUEUE +-LIBS.openbsd = ++# This is for FreeBSD ++COPTS.freebsd = -DENABLE_POLL -DENABLE_KQUEUE ++LIBS.freebsd = + + # CPU dependant optimizations + COPTS.generic = -O2 +@@ -55,7 +55,7 @@ # you can enable debug arguments with "DEBUG=-g" or disable them with "DEBUG=" #DEBUG = -g -DDEBUG_MEMORY -DDEBUG_FULL @@ -37,7 +57,7 @@ # 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 -@@ -54,7 +54,7 @@ +@@ -63,7 +63,7 @@ # will avoid the additionnal paramters to overflow a page. 8030 bytes is # exactly 5.5 TCP segments of 1460 bytes. #SMALL_OPTS = @@ -46,40 +66,31 @@ # redefine this if you want to add some special PATH to include/libs ADDINC = -@@ -65,7 +65,7 @@ - # - use -DSTATTIME=0 to disable statistics, else specify an interval in - # milliseconds. +@@ -75,7 +75,7 @@ + # set some defines when needed. + # Known ones are -DENABLE_POLL # - use -DTPROXY to compile with transparent proxy support. --DEFINE = -DSTATTIME=0 -DTPROXY -+#DEFINE = -DSTATTIME=0 -DTPROXY +-DEFINE = -DTPROXY ++#DEFINE = -DTPROXY - # global options - TARGET_OPTS=$(COPTS.$(TARGET)) -@@ -75,14 +75,14 @@ - COPTS=-I. $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE) - LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB) - --CFLAGS = -Wall $(COPTS) $(DEBUG) --LDFLAGS = -g -+CFLAGS+= -Wall $(COPTS) -+LDFLAGS+= #-g /lib/crt0.o -lc + # May be changed to patch PAGE_SIZE on every platform when using dlmalloc + DLMALLOC_THRES=4096 +@@ -95,7 +95,7 @@ + COPTS = -Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) \ + $(SMALL_OPTS) $(VER_OPTS) $(DEFINE) + LIBS = $(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB) +-CFLAGS = -Wall $(COPTS) $(DEBUG) ++CFLAGS += -Wall $(COPTS) + LDFLAGS = -g + OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \ +@@ -112,7 +112,8 @@ all: haproxy - haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o \ - src/uri_auth.o src/rbtree.o + haproxy: $(OBJS) $(OPT_OBJS) - $(LD) $(LDFLAGS) -o $@ $> $(LIBS) ++# $(LD) $(LDFLAGS) -o $@ $> $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS) - src/base64.o: src/base64.c - $(CC) $(CFLAGS) -c -o $@ $< -@@ -99,6 +99,9 @@ - src/hashpjw.o: src/hashpjw.c - $(CC) $(CFLAGS) -c -o $@ $< - -+src/rbtree.o: src/rbtree.c -+ $(CC) $(CFLAGS) -c -o $@ $< -+ - haproxy.o: haproxy.c - $(CC) $(CFLAGS) -c -o $@ $< + .SUFFIXES: .c.o diff -urN haproxy_1.2.18/pkg-descr haproxy/pkg-descr --- haproxy_1.2.18/pkg-descr 2006-09-24 12:56:30.000000000 +0200 +++ haproxy/pkg-descr 2007-08-05 21:42:52.000000000 +0200 @@ -1,8 +1,8 @@ -HAproxy is a high-performance and highly-robust TCP/HTTP load balancer which -provides cookie-based persistence, automatic failover, header insertion, -deletion, modification on the fly, advanced logging contents to help trouble- -shooting buggy applications and/or networks, and a few other features. It uses -its own state machine to achieve up to ten thousands hits per second on modern +HAproxy is a high-performance and highly-robust TCP/HTTP load balancer which +provides cookie-based persistence, automatic failover, header insertion, +deletion, modification on the fly, advanced logging contents to help trouble- +shooting buggy applications and/or networks, and a few other features. It uses +its own state machine to achieve up to ten thousands hits per second on modern hardware, even with thousands simultaneous connections. WWW: http://haproxy.1wt.eu/ diff -urN haproxy_1.2.18/pkg-message haproxy/pkg-message --- haproxy_1.2.18/pkg-message 2004-06-08 12:31:00.000000000 +0200 +++ haproxy/pkg-message 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -===> BE CAREFULL HOW TO BOOT on 1.1.28 or after: - To run haproxy from startup, add haproxy_enable="YES" in your - /etc/rc.conf. diff -urN haproxy_1.2.18/pkg-plist haproxy/pkg-plist --- haproxy_1.2.18/pkg-plist 2006-11-03 09:27:13.000000000 +0100 +++ haproxy/pkg-plist 2009-04-21 10:20:59.000000000 +0200 @@ -1,7 +1,33 @@ +etc/haproxy.conf-dist sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/architecture.txt +%%PORTDOCS%%%%DOCSDIR%%/configuration.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/buffers.fig +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/cttproxy-changes.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url +%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt +%%PORTDOCS%%%%DOCSDIR%%/gpl.txt %%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt %%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg +%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/ebtree +%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig +%%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy +%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt +%%PORTDOCS%%%%DOCSDIR%%/tcp-splicing.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals +%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% --- haproxy.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001301958.o0UJw7X5065780>