ports/114859: [PATCH] Update net/haproxy to 1.2.17

[Xin LI]

>Number:         114859
>Category:       ports
>Synopsis:       [PATCH] Update net/haproxy to 1.2.17
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 24 12:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 6.2-RELEASE-p1 i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #1: Sat Feb 10 07:03:45 CST 2007 delphij at tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386


>Description:
	This updates haproxy to a newer release.  Maintainer (clement) cc'ed.
>How-To-Repeat:
>Fix:

--- patch-haproxy begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/haproxy/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile	3 Nov 2006 08:27:13 -0000	1.18
+++ Makefile	24 Jul 2007 12:30:17 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.2.16
-PORTREVISION=	1
+PORTVERSION=	1.2.17
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.2/src/
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/haproxy/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo	1 Nov 2006 14:42:14 -0000	1.16
+++ distinfo	24 Jul 2007 12:30:56 -0000
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.2.16.tar.gz) = f72c44bcddf868edf4000503be09a12d
-SHA256 (haproxy-1.2.16.tar.gz) = c8635aaf761f3bb74676d6cbc1ebb415cdcebebcdb46261a737a7d69c4251f2f
-SIZE (haproxy-1.2.16.tar.gz) = 197867
+MD5 (haproxy-1.2.17.tar.gz) = 45a66691aa3b22996862e3e5bac4289c
+SHA256 (haproxy-1.2.17.tar.gz) = 80971ad014444e7d7ba8d6724e2a535c81b8c0e989dc418496def5873345800d
+SIZE (haproxy-1.2.17.tar.gz) = 206219
Index: files/patch-Makefile.bsd
===================================================================
RCS file: /home/ncvs/ports/net/haproxy/files/patch-Makefile.bsd,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile.bsd
--- files/patch-Makefile.bsd	24 Sep 2006 10:54:04 -0000	1.1
+++ files/patch-Makefile.bsd	24 Jul 2007 12:38:05 -0000
@@ -1,5 +1,5 @@
---- Makefile.bsd.orig	Sun May 21 21:32:29 2006
-+++ Makefile.bsd	Sun Sep 24 10:06:30 2006
+--- ./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
  
@@ -55,20 +55,31 @@
  
  # global options
  TARGET_OPTS=$(COPTS.$(TARGET))
-@@ -75,13 +75,13 @@
+@@ -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 
++LDFLAGS+= #-g /lib/crt0.o  -lc
  
  all: haproxy
  
- haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_auth.o
+ haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o \
+ 	 src/uri_auth.o src/rbtree.o
 -	$(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 $@ $<
+ 
--- patch-haproxy ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: