From nobody@FreeBSD.org  Tue Dec 11 15:27:29 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2285616A41B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 11 Dec 2007 15:27:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 2513413C44B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 11 Dec 2007 15:27:29 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id lBBFRNcD060644
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 11 Dec 2007 15:27:23 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id lBBFRNLB060643;
	Tue, 11 Dec 2007 15:27:23 GMT
	(envelope-from nobody)
Message-Id: <200712111527.lBBFRNLB060643@www.freebsd.org>
Date: Tue, 11 Dec 2007 15:27:23 GMT
From: Hugo Saro <hugo@barafranca.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] Update port: net/haproxy-devel to 1.3.14
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         118552
>Category:       ports
>Synopsis:       [maintainer update] Update port: net/haproxy-devel to 1.3.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    araujo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 11 15:30:03 UTC 2007
>Closed-Date:    Fri Jan 04 11:02:24 UTC 2008
>Last-Modified:  Fri Jan 04 11:02:24 UTC 2008
>Originator:     Hugo Saro
>Release:        7.0-CURRENT
>Organization:
>Environment:
FreeBSD nexus.bsdlan.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sun Aug 26 15:56:22 WEST 2007     klr@nexus.bsdlan.org:/usr/obj/usr/src/sys/NEXUS  i386

>Description:
" A good part of the changes comes from nice contributors of the mailing list. Most sensible changes include support for dynamic server weights offering support for slow start and graceful shutdown. The load balancer is now able to report its servers state to outer components, enabling the building of more complex multi-site architectures involving dynamic routing protocols such as BGP. People who were complaining about the rough configuration, rough statistics, or lack of logging to UNIX sockets, should really give this one a try. Rate of changes after this version should significantly drop in order to progressively switch the tree to a stable state."
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/net/haproxy-devel/Makefile /home/klr/ports/haproxy-devel/Makefile
--- /usr/ports/net/haproxy-devel/Makefile	2007-10-13 16:29:06.000000000 +0100
+++ /home/klr/ports/haproxy-devel/Makefile	2007-12-11 15:02:17.632572016 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.3.12.2
+PORTVERSION=	1.3.14
 CATEGORIES=	net
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.3/src/
 PKGNAMESUFFIX=	-devel
@@ -36,7 +36,7 @@
 .endif
 
 post-install:
-	@${ECHO_MSG} ""
+	@${ECHO_MSG} "${CFLAGS}"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "${PORTNAME} is now installed."
diff -ruN /usr/ports/net/haproxy-devel/Makefile.orig /home/klr/ports/haproxy-devel/Makefile.orig
--- /usr/ports/net/haproxy-devel/Makefile.orig	2007-09-12 06:20:13.000000000 +0100
+++ /home/klr/ports/haproxy-devel/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-# 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-devel/Makefile,v 1.20 2007/09/12 05:20:13 edwin Exp $
-#
-
-PORTNAME=	haproxy
-PORTVERSION=	1.3.12
-#PORTREVISION=	0
-CATEGORIES=     net
-MASTER_SITES=   http://haproxy.1wt.eu/download/1.3/src/
-PKGNAMESUFFIX=  -devel
-DISTFILES=      ${DISTNAME}.tar.gz
-
-MAINTAINER=	hugo@barafranca.com
-COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
-
-CONFLICTS=	haproxy-1.2*
-USE_RC_SUBR=	haproxy
-
-MAKEFILE=       Makefile.bsd
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/design-thoughts
-	@${MKDIR} ${DOCSDIR}/internals
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
-#	@${INSTALL_DATA} ${WRKSRC}/doc/design-thoughts/* ${DOCSDIR}/design-thoughts/
-#	@${INSTALL_DATA} ${WRKSRC}/doc/internals/* ${DOCSDIR}/internals/
-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} internals ${DOCSDIR}/)
-	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} design-thoughts ${DOCSDIR}/)
-	@${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
-				${LOCALBASE}/etc/haproxy.conf-dist
-.endif
-
-post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "haproxy ${PORTVERSION} is now installed."
-	@${ECHO_MSG} "To configure it, rename ${LOCALBASE}/etc/haproxy.conf-dist"
-	@${ECHO_MSG} "and add haproxy_enable=\"YES\" to /etc/rc.conf"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} ""
-
-.include <bsd.port.mk>
diff -ruN /usr/ports/net/haproxy-devel/distinfo /home/klr/ports/haproxy-devel/distinfo
--- /usr/ports/net/haproxy-devel/distinfo	2007-10-10 16:53:37.750926999 +0100
+++ /home/klr/ports/haproxy-devel/distinfo	2007-12-11 14:36:44.869428376 +0000
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.3.12.2.tar.gz) = d299484c1bfcaacc360ee3adf2fb51ea
-SHA256 (haproxy-1.3.12.2.tar.gz) = 975786a16274a104fa269781322755314a3ec276dbeab3db94418d1dd7ee3547
-SIZE (haproxy-1.3.12.2.tar.gz) =  373552
+MD5 (haproxy-1.3.14.tar.gz) = baa977bbabc1ef0208748f475bf6bf3d
+SHA256 (haproxy-1.3.14.tar.gz) = 25c25ae068ed846f4650d4a53bd9ad06328ab182995a216deff9f2eec029d324
+SIZE (haproxy-1.3.14.tar.gz) =  434389
diff -ruN /usr/ports/net/haproxy-devel/distinfo.orig /home/klr/ports/haproxy-devel/distinfo.orig
--- /usr/ports/net/haproxy-devel/distinfo.orig	2007-09-12 06:20:13.000000000 +0100
+++ /home/klr/ports/haproxy-devel/distinfo.orig	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-MD5 (haproxy-1.3.12.tar.gz) = cdff6845362b29f9b2be4c207aa1fbb1
-SHA256 (haproxy-1.3.12.tar.gz) = 6fc6a48ed67ef10ba860f8a16a27d7de1d8499c331aa8037ea129c230caf141b
-SIZE (haproxy-1.3.12.tar.gz) =  355376
diff -ruN /usr/ports/net/haproxy-devel/files/patch-Makefile.bsd /home/klr/ports/haproxy-devel/files/patch-Makefile.bsd
--- /usr/ports/net/haproxy-devel/files/patch-Makefile.bsd	2007-09-12 06:20:13.000000000 +0100
+++ /home/klr/ports/haproxy-devel/files/patch-Makefile.bsd	2007-12-11 15:07:59.481467616 +0000
@@ -1,97 +1,101 @@
---- Makefile.bsd.orig	Mon Apr 16 00:33:37 2007
-+++ Makefile.bsd	Fri May  4 04:05:12 2007
-@@ -1,4 +1,4 @@
+--- Makefile.bsd.orig   2007-12-06 00:25:44.000000000 +0000
++++ Makefile.bsd        2007-12-11 15:07:31.578883070 +0000
+@@ -1,7 +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
- 
-@@ -6,31 +6,31 @@
- 
+-# You should use it this way :
+-#   make TARGET=os CPU=cpu
+-#
++# This makefile is dedicated to FreeBSD
+ # Some optional components may be added, such as DLMALLOC :
+ #
+ #   make TARGET=freebsd CPU=i686 DLMALLOC_SRC=/usr/local/src/dlmalloc.c \
+@@ -9,7 +6,7 @@
+
  # 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
-+#CPU = generic
- #CPU = i586
- #CPU = i686
- #CPU = ultrasparc
- 
- # 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
+ CPU = generic
+@@ -24,26 +21,25 @@
  #REGEX=static-pcre
- 
+
  # tools options
 -CC = gcc
 -LD = gcc
-+CC? = gcc
-+LD? = gcc
- 
++CC = cc
++LD = cc
+
  # 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}
- 
+ PCREDIR!= pcre-config --prefix 2>/dev/null || :
+ #PCREDIR=/usr/local
+
 -# 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
-@@ -52,7 +52,7 @@
- 
+-COPTS.generic = -O2
+-COPTS.i586 = -O2 -march=i586
+-COPTS.i686 = -O2 -march=i686
+-COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
++#COPTS.generic = -O2
++#COPTS.i586 = -O2 -march=i586
++#COPTS.i686 = -O2 -march=i686
++#COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc
+
+ # options for standard regex library
+-COPTS.libc=
+-LIBS.libc=
++#COPTS.libc=
++#LIBS.libc=
+
+ # options for libpcre
+ COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
+@@ -55,7 +51,7 @@
+
  # 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
-@@ -60,7 +60,7 @@
+@@ -63,19 +59,19 @@
  # will avoid the additionnal paramters to overflow a page. 8030 bytes is
  # exactly 5.5 TCP segments of 1460 bytes.
  #SMALL_OPTS =
 -SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
 +#SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
- 
+
  # redefine this if you want to add some special PATH to include/libs
- ADDINC =
-@@ -69,7 +69,7 @@
+-ADDINC =
+-ADDLIB =
++#ADDINC =
++#ADDLIB =
+
+ # redefine this if you want to add some special .o files
+-OPT_OBJS =
++#OPT_OBJS =
+
  # set some defines when needed.
  # Known ones are -DENABLE_POLL
  # - use -DTPROXY to compile with transparent proxy support.
 -DEFINE = -DTPROXY
 +#DEFINE = -DTPROXY
- 
- # global options
- TARGET_OPTS=$(COPTS.$(TARGET))
-@@ -79,7 +79,7 @@
- COPTS=-Iinclude $(ADDINC) $(CPU_OPTS) $(TARGET_OPTS) $(REGEX_OPTS) $(SMALL_OPTS) $(DEFINE)
- LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX)) $(ADDLIB)
- 
--CFLAGS = -Wall $(COPTS) $(DEBUG)
-+CFLAGS += -Wall $(COPTS)
+
+ # May be changed to patch PAGE_SIZE on every platform when using dlmalloc
+ DLMALLOC_THRES=4096
+@@ -95,7 +91,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) $(DEBUG)
  LDFLAGS = -g
- 
- OBJS = src/haproxy.o src/list.o src/chtbl.o src/hashpjw.o src/base64.o \
-@@ -93,7 +93,9 @@
- all: haproxy
- 
- haproxy: $(OBJS)
--	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
-+#	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
-+	 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $> $(LIBS)
-+
- 
- .SUFFIXES: .c.o
- 
+
+ OBJS = src/haproxy.o src/sessionhash.o src/base64.o src/protocols.o \
+
diff -ruN /usr/ports/net/haproxy-devel/pkg-message.orig /home/klr/ports/haproxy-devel/pkg-message.orig
--- /usr/ports/net/haproxy-devel/pkg-message.orig	2007-08-05 20:42:52.000000000 +0100
+++ /home/klr/ports/haproxy-devel/pkg-message.orig	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 -ruN /usr/ports/net/haproxy-devel/pkg-plist /home/klr/ports/haproxy-devel/pkg-plist
--- /usr/ports/net/haproxy-devel/pkg-plist	2007-10-13 16:29:06.000000000 +0100
+++ /home/klr/ports/haproxy-devel/pkg-plist	2007-12-11 14:47:52.665516427 +0000
@@ -17,6 +17,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/ebtree
 %%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
diff -ruN /usr/ports/net/haproxy-devel/pkg-plist.orig /home/klr/ports/haproxy-devel/pkg-plist.orig
--- /usr/ports/net/haproxy-devel/pkg-plist.orig	2007-09-12 06:20:13.000000000 +0100
+++ /home/klr/ports/haproxy-devel/pkg-plist.orig	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-sbin/haproxy
-%%PORTDOCS%%%%DOCSDIR%%/architecture.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt
-%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt
-%%PORTDOCS%%%%DOCSDIR%%/tcp-splicing.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%%/internals/connection-scale.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
-%%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/todo.cttproxy
-etc/haproxy.conf-dist
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: araujo 
Responsible-Changed-When: Sun Dec 16 15:20:22 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118552 

From: Marcelo Araujo <araujobsdport@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118552: [maintainer update] Update port: net/haproxy-devel
 to 1.3.14
Date: Sun, 16 Dec 2007 13:26:57 -0200

 This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
 --------------enigA2724C739C0CD0FBA10177D6
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 Hey dear Hugo,
 
 I'm not sure with this patch, could you read this paper that has a good
 explanation about use of PCVS.
 Is more easy and fast to commit the modifications.
 
 http://sce-tindy.tecnik93.com/FreeBSD/How-to-submit-a-diff.txt
 
 Please, send the patch again!
 
 
 Best Regards.
 
 --=20
 Marcelo Araujo            (__)
 araujo@FreeBSD.org     \\\'',)
 http://www.FreeBSD.org   \/  \ ^
 Power To Server.         .\. /_)
 
 
 
 --------------enigA2724C739C0CD0FBA10177D6
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (FreeBSD)
 
 iD8DBQFHZUPHovxJd1Pkz6gRAuhSAJ4/vmWHxQPCT8mRJ9PZ1V3BenNMGQCghFms
 b1B7h/t3g6oqT8ais3zntJw=
 =LfTq
 -----END PGP SIGNATURE-----
 
 --------------enigA2724C739C0CD0FBA10177D6--
State-Changed-From-To: open->analyzed 
State-Changed-By: araujo 
State-Changed-When: Mon Dec 17 13:04:50 UTC 2007 
State-Changed-Why:  
- Patch is not correct(malformed).  - I'm waiting maintainer feedback. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=118552 
State-Changed-From-To: analyzed->closed 
State-Changed-By: araujo 
State-Changed-When: Fri Jan 4 11:02:24 UTC 2008 
State-Changed-Why:  
Hey dear, this patch not apply correct, if you have any doubt about how 
'creating patch', please look at: 
http://www.freebsd.org/doc/en_US.ISO8859-1/articles/contributing-ports/ 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118552 
>Unformatted:
