ports/111327: [Patch] Upgrade libevent to 1.3b

[Phil Oleson]

>Number:         111327
>Category:       ports
>Synopsis:       [Patch] Upgrade libevent to 1.3b
>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:   Fri Apr 06 16:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Phil Oleson
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 6.2-STABLE FreeBSD 6.2-STABLE #1: Fri Mar 16 16:54:45 MDT 2007 root at nixil:/usr/src/sys/compile/nixil i386

>Description:
	Patch to upgrade libevent to 1.3b.
        Warning, I have not checked any ports depending on this update.

>How-To-Repeat:
	N/A
>Fix:
	Patch below:

--- patch-libevent-1.3 begins here ---
diff -ruN libevent.orig/Makefile libevent/Makefile
--- libevent.orig/Makefile	Fri Apr  6 09:46:08 2007
+++ libevent/Makefile	Fri Apr  6 09:56:24 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libevent
-PORTVERSION=	1.2a
+PORTVERSION=	1.3b
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
@@ -17,6 +17,8 @@
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 
 MAN3=	event.3 \
 	evdns.3
diff -ruN libevent.orig/distinfo libevent/distinfo
--- libevent.orig/distinfo	Fri Apr  6 09:46:08 2007
+++ libevent/distinfo	Fri Apr  6 09:57:13 2007
@@ -1,3 +1,3 @@
-MD5 (libevent-1.2a.tar.gz) = bb0b731b0c1bfa7267b8cd6192982d68
-SHA256 (libevent-1.2a.tar.gz) = 348b91b60c98bfe7992537ef4858a79e777c4910518a486056de5da0c38431c5
-SIZE (libevent-1.2a.tar.gz) = 410346
+MD5 (libevent-1.3b.tar.gz) = 7fc864faee87dbe1ed5e34ab8787172c
+SHA256 (libevent-1.3b.tar.gz) = 200a229e1fcaf07772b454a087a7cdf4b2e8b90b8493883d4027fd70a3dbf0d1
+SIZE (libevent-1.3b.tar.gz) = 445461
diff -ruN libevent.orig/files/patch-buffer.c libevent/files/patch-buffer.c
--- libevent.orig/files/patch-buffer.c	Fri Apr  6 09:46:08 2007
+++ libevent/files/patch-buffer.c	Wed Dec 31 17:00:00 1969
@@ -1,15 +0,0 @@
-#
-# Define va_copy if not exists. 4.x for exemple.
-#
---- buffer.c.orig	Mon Dec  4 11:34:31 2006
-+++ buffer.c	Mon Dec  4 11:35:44 2006
-@@ -138,6 +138,9 @@
- 		buffer = (char *)buf->buffer + buf->off;
- 		space = buf->totallen - buf->misalign - buf->off;
- 
-+#ifndef va_copy
-+#define	va_copy(dest,src)	memcpy(&dest, &src, sizeof (va_list))
-+#endif
- 		va_copy(aq, ap);
- 
- #ifdef WIN32
diff -ruN libevent.orig/files/patch-http.c libevent/files/patch-http.c
--- libevent.orig/files/patch-http.c	Fri Apr  6 09:46:08 2007
+++ libevent/files/patch-http.c	Wed Dec 31 17:00:00 1969
@@ -1,22 +0,0 @@
-#
-# Fix build with old gcc
-#
---- http.c.orig	Sat Dec  2 19:30:04 2006
-+++ http.c	Mon Dec  4 11:17:38 2006
-@@ -518,6 +518,7 @@
- evhttp_connection_done(struct evhttp_connection *evcon)
- {
- 	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+	int need_close;
- 
- 	/*
- 	 * if this is an incoming connection, we need to leave the request
-@@ -527,7 +528,7 @@
- 		TAILQ_REMOVE(&evcon->requests, req, next);
- 		req->evcon = NULL;
- 
--		int need_close = 
-+		need_close = 
- 		    evhttp_is_connection_close(req->input_headers) ||
- 		    evhttp_is_connection_close(req->output_headers);
- 
diff -ruN libevent.orig/files/patch-test-regress_http.c libevent/files/patch-test-regress_http.c
--- libevent.orig/files/patch-test-regress_http.c	Fri Apr  6 09:46:08 2007
+++ libevent/files/patch-test-regress_http.c	Fri Apr  6 10:02:06 2007
@@ -1,5 +1,5 @@
---- test/regress_http.c.orig	Wed Nov 29 00:22:10 2006
-+++ test/regress_http.c	Mon Dec  4 11:04:42 2006
+--- test/regress_http.c.orig	Thu Feb 15 17:49:03 2007
++++ test/regress_http.c	Fri Apr  6 09:59:50 2007
 @@ -125,13 +125,14 @@
  http_readcb(struct bufferevent *bev, void *arg)
  {
@@ -8,7 +8,7 @@
  
   	event_debug(("%s: %s\n", __func__, EVBUFFER_DATA(bev->input)));
  	
- 	if (evbuffer_find(bev->input, what, strlen(what)) != NULL) {
+ 	if (evbuffer_find(bev->input, (const unsigned char*) what, strlen(what)) != NULL) {
  		struct evhttp_request *req = evhttp_request_new(NULL, NULL);
  		req->kind = EVHTTP_RESPONSE;
 -		int done = evhttp_parse_lines(req, bev->input);
diff -ruN libevent.orig/pkg-plist libevent/pkg-plist
--- libevent.orig/pkg-plist	Fri Apr  6 09:46:08 2007
+++ libevent/pkg-plist	Fri Apr  6 09:56:39 2007
@@ -2,8 +2,8 @@
 include/event.h
 include/evhttp.h
 include/evdns.h
-lib/libevent-1.2a.so
-lib/libevent-1.2a.so.1
+lib/libevent-1.3b.so
+lib/libevent-1.3b.so.1
 lib/libevent.a
 lib/libevent.la
 lib/libevent.so
--- patch-libevent-1.3 ends here ---


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