Attachment 76226 Details for Bug 109923 – libevent-1.3b.patch

[patch] libevent-1.3b.patch

libevent-1.3b.patch (text/plain), 6.32 KB, created by gslin on 2007-03-05 14:30:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gslin

Created: 2007-03-05 14:30:04 UTC

Size: 6.32 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/libevent/Makefile /home/staff/gslin/work/ports/libevent/Makefile
>--- /usr/ports/devel/libevent/Makefile	Fri Feb  2 04:36:36 2007
>+++ /home/staff/gslin/work/ports/libevent/Makefile	Mon Mar  5 22:16:08 2007
>@@ -6,16 +6,16 @@
> #
> 
> PORTNAME=	libevent
>-PORTVERSION=	1.2a
>+PORTVERSION=	1.3b
> CATEGORIES=	devel
> MASTER_SITES=	http://monkey.org/~provos/
> 
> MAINTAINER=	mnag@FreeBSD.org
> COMMENT=	Provides an API to execute callback functions on certain events
> 
>-USE_AUTOTOOLS=	libtool:15
>-USE_GETOPT_LONG=yes
>+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
> GNU_CONFIGURE=	yes
>+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
> USE_LDCONFIG=	yes
> 
> MAN3=	event.3 \
>diff -ruN --exclude=CVS /usr/ports/devel/libevent/distinfo /home/staff/gslin/work/ports/libevent/distinfo
>--- /usr/ports/devel/libevent/distinfo	Tue Dec  5 03:14:19 2006
>+++ /home/staff/gslin/work/ports/libevent/distinfo	Mon Mar  5 22:05:38 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 --exclude=CVS /usr/ports/devel/libevent/files/patch-buffer.c /home/staff/gslin/work/ports/libevent/files/patch-buffer.c
>--- /usr/ports/devel/libevent/files/patch-buffer.c	Mon Dec  4 21:46:14 2006
>+++ /home/staff/gslin/work/ports/libevent/files/patch-buffer.c	Thu Jan  1 08:00:00 1970
>@@ -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 --exclude=CVS /usr/ports/devel/libevent/files/patch-http.c /home/staff/gslin/work/ports/libevent/files/patch-http.c
>--- /usr/ports/devel/libevent/files/patch-http.c	Tue Dec  5 03:14:19 2006
>+++ /home/staff/gslin/work/ports/libevent/files/patch-http.c	Thu Jan  1 08:00:00 1970
>@@ -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 --exclude=CVS /usr/ports/devel/libevent/files/patch-test-regress.c /home/staff/gslin/work/ports/libevent/files/patch-test-regress.c
>--- /usr/ports/devel/libevent/files/patch-test-regress.c	Wed Jun 28 22:42:27 2006
>+++ /home/staff/gslin/work/ports/libevent/files/patch-test-regress.c	Thu Jan  1 08:00:00 1970
>@@ -1,14 +0,0 @@
>---- test/regress.c.orig	Wed Jun 28 22:34:07 2006
>-+++ test/regress.c	Wed Jun 28 22:34:15 2006
>-@@ -480,9 +480,9 @@
>- 
>- void
>- test_evbuffer(void) {
>--	setup_test("Evbuffer: ");
>--
>- 	struct evbuffer *evb = evbuffer_new();
>-+
>-+	setup_test("Evbuffer: ");
>- 
>- 	evbuffer_add_printf(evb, "%s/%d", "hello", 1);
>- 
>diff -ruN --exclude=CVS /usr/ports/devel/libevent/files/patch-test-regress_http.c /home/staff/gslin/work/ports/libevent/files/patch-test-regress_http.c
>--- /usr/ports/devel/libevent/files/patch-test-regress_http.c	Tue Dec  5 03:14:19 2006
>+++ /home/staff/gslin/work/ports/libevent/files/patch-test-regress_http.c	Thu Jan  1 08:00:00 1970
>@@ -1,67 +0,0 @@
>---- test/regress_http.c.orig	Wed Nov 29 00:22:10 2006
>-+++ test/regress_http.c	Mon Dec  4 11:04:42 2006
>-@@ -125,13 +125,14 @@
>- http_readcb(struct bufferevent *bev, void *arg)
>- {
>- 	const char *what = "This is funny";
>-+	int done;
>- 
>-  	event_debug(("%s: %s\n", __func__, EVBUFFER_DATA(bev->input)));
>- 	
>- 	if (evbuffer_find(bev->input, 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);
>-+		done = evhttp_parse_lines(req, bev->input);
>- 
>- 		if (done == 1 &&
>- 		    evhttp_find_header(req->input_headers,
>-@@ -163,9 +164,11 @@
>- void
>- http_basic_cb(struct evhttp_request *req, void *arg)
>- {
>-+	struct evbuffer *evb;
>-+
>- 	event_debug(("%s: called\n", __func__));
>- 
>--	struct evbuffer *evb = evbuffer_new();
>-+	evb = evbuffer_new();
>- 	evbuffer_add_printf(evb, "This is funny");
>- 
>- 	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
>-@@ -380,6 +383,8 @@
>- void
>- http_post_cb(struct evhttp_request *req, void *arg)
>- {
>-+	struct evbuffer *evb;
>-+
>- 	event_debug(("%s: called\n", __func__));
>- 
>- 	/* Yes, we are expecting a post request */
>-@@ -390,7 +395,7 @@
>- 
>- 	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(POST_DATA)) {
>- 		fprintf(stdout, "FAILED (length: %ld vs %ld)\n",
>--		    EVBUFFER_LENGTH(req->input_buffer), strlen(POST_DATA));
>-+		    (long int)EVBUFFER_LENGTH(req->input_buffer), (long int)strlen(POST_DATA));
>- 		exit(1);
>- 	}
>- 
>-@@ -402,7 +407,7 @@
>- 		exit(1);
>- 	}
>- 	
>--	struct evbuffer *evb = evbuffer_new();
>-+	evb = evbuffer_new();
>- 	evbuffer_add_printf(evb, "This is funny");
>- 
>- 	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
>-@@ -428,7 +433,7 @@
>- 
>- 	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
>- 		fprintf(stderr, "FAILED (length %ld vs %ld)\n",
>--		    EVBUFFER_LENGTH(req->input_buffer), strlen(what));
>-+		    (long int)EVBUFFER_LENGTH(req->input_buffer), (long int)strlen(what));
>- 		exit(1);
>- 	}
>- 	
>diff -ruN --exclude=CVS /usr/ports/devel/libevent/pkg-plist /home/staff/gslin/work/ports/libevent/pkg-plist
>--- /usr/ports/devel/libevent/pkg-plist	Wed Dec  6 03:13:24 2006
>+++ /home/staff/gslin/work/ports/libevent/pkg-plist	Mon Mar  5 22:15:49 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-%%PORTVERSION%%.so
>+lib/libevent-%%PORTVERSION%%.so.1
> lib/libevent.a
> lib/libevent.la
> lib/libevent.so

Actions: View | Diff

Attachments on bug 109923: 76226