Attachment #76226 for bug #109923

View | Details | Raw Unified | Return to bug 109923
Collapse All | Expand All




#

PORTNAME=	libevent
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

CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
USE_GETOPT_LONG=yes
GNU_CONFIGURE=	yes
PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
USE_LDCONFIG=	yes

MAN3=	event.3 \

Lines 1-3 Link Here

(-)/home/staff/gslin/work/ports/libevent/distinfo (-3 / +3 lines)
1	MD5 (libevent-1.2a.tar.gz) = bb0b731b0c1bfa7267b8cd6192982d68	1	MD5 (libevent-1.3b.tar.gz) = 7fc864faee87dbe1ed5e34ab8787172c
2	SHA256 (libevent-1.2a.tar.gz) = 348b91b60c98bfe7992537ef4858a79e777c4910518a486056de5da0c38431c5	2	SHA256 (libevent-1.3b.tar.gz) = 200a229e1fcaf07772b454a087a7cdf4b2e8b90b8493883d4027fd70a3dbf0d1
3	SIZE (libevent-1.2a.tar.gz) = 410346	3	SIZE (libevent-1.3b.tar.gz) = 445461




#
# 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




#
# 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);
 




--- 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);
 




--- 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);
 	}
 	

Lines 2-9 Link Here

(-)/home/staff/gslin/work/ports/libevent/pkg-plist (-2 / +2 lines)
2	include/event.h	2	include/event.h
3	include/evhttp.h	3	include/evhttp.h
4	include/evdns.h	4	include/evdns.h
5	lib/libevent-1.2a.so	5	lib/libevent-%%PORTVERSION%%.so
6	lib/libevent-1.2a.so.1	6	lib/libevent-%%PORTVERSION%%.so.1
7	lib/libevent.a	7	lib/libevent.a
8	lib/libevent.la	8	lib/libevent.la
9	lib/libevent.so	9	lib/libevent.so

Return to bug 109923

Lines 6-21 Link Here

(-)/home/staff/gslin/work/ports/libevent/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= libevent	8	PORTNAME= libevent
9	PORTVERSION= 1.2a	9	PORTVERSION= 1.3b
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://monkey.org/~provos/	11	MASTER_SITES= http://monkey.org/~provos/
12		12
13	MAINTAINER= mnag@FreeBSD.org	13	MAINTAINER= mnag@FreeBSD.org
14	COMMENT= Provides an API to execute callback functions on certain events	14	COMMENT= Provides an API to execute callback functions on certain events
15		15
16	USE_AUTOTOOLS= libtool:15	16	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man
17	USE_GETOPT_LONG=yes
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
		18	PLIST_SUB+= PORTVERSION="${PORTVERSION}"
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20		20
21	MAN3= event.3 \	21	MAN3= event.3 \

Lines 1-15 Link Here

(-)/home/staff/gslin/work/ports/libevent/files/patch-buffer.c (-15 lines)
1	#
2	# Define va_copy if not exists. 4.x for exemple.
3	#
4	--- buffer.c.orig Mon Dec 4 11:34:31 2006
5	+++ buffer.c Mon Dec 4 11:35:44 2006
6	@@ -138,6 +138,9 @@
7	buffer = (char *)buf->buffer + buf->off;
8	space = buf->totallen - buf->misalign - buf->off;
9
10	+#ifndef va_copy
11	+#define va_copy(dest,src) memcpy(&dest, &src, sizeof (va_list))
12	+#endif
13	va_copy(aq, ap);
14
15	#ifdef WIN32

Lines 1-22 Link Here

(-)/home/staff/gslin/work/ports/libevent/files/patch-http.c (-22 lines)
1	#
2	# Fix build with old gcc
3	#
4	--- http.c.orig Sat Dec 2 19:30:04 2006
5	+++ http.c Mon Dec 4 11:17:38 2006
6	@@ -518,6 +518,7 @@
7	evhttp_connection_done(struct evhttp_connection *evcon)
8	{
9	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
10	+ int need_close;
11
12	/*
13	* if this is an incoming connection, we need to leave the request
14	@@ -527,7 +528,7 @@
15	TAILQ_REMOVE(&evcon->requests, req, next);
16	req->evcon = NULL;
17
18	- int need_close =
19	+ need_close =
20	evhttp_is_connection_close(req->input_headers) \|\|
21	evhttp_is_connection_close(req->output_headers);
22

Lines 1-14 Link Here

(-)/home/staff/gslin/work/ports/libevent/files/patch-test-regress.c (-14 lines)
1	--- test/regress.c.orig Wed Jun 28 22:34:07 2006
2	+++ test/regress.c Wed Jun 28 22:34:15 2006
3	@@ -480,9 +480,9 @@
4
5	void
6	test_evbuffer(void) {
7	- setup_test("Evbuffer: ");
8	-
9	struct evbuffer *evb = evbuffer_new();
10	+
11	+ setup_test("Evbuffer: ");
12
13	evbuffer_add_printf(evb, "%s/%d", "hello", 1);
14

Lines 1-67 Link Here

(-)/home/staff/gslin/work/ports/libevent/files/patch-test-regress_http.c (-67 lines)
1	--- test/regress_http.c.orig Wed Nov 29 00:22:10 2006
2	+++ test/regress_http.c Mon Dec 4 11:04:42 2006
3	@@ -125,13 +125,14 @@
4	http_readcb(struct bufferevent bev, void arg)
5	{
6	const char *what = "This is funny";
7	+ int done;
8
9	event_debug(("%s: %s\n", __func__, EVBUFFER_DATA(bev->input)));
10
11	if (evbuffer_find(bev->input, what, strlen(what)) != NULL) {
12	struct evhttp_request *req = evhttp_request_new(NULL, NULL);
13	req->kind = EVHTTP_RESPONSE;
14	- int done = evhttp_parse_lines(req, bev->input);
15	+ done = evhttp_parse_lines(req, bev->input);
16
17	if (done == 1 &&
18	evhttp_find_header(req->input_headers,
19	@@ -163,9 +164,11 @@
20	void
21	http_basic_cb(struct evhttp_request req, void arg)
22	{
23	+ struct evbuffer *evb;
24	+
25	event_debug(("%s: called\n", __func__));
26
27	- struct evbuffer *evb = evbuffer_new();
28	+ evb = evbuffer_new();
29	evbuffer_add_printf(evb, "This is funny");
30
31	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
32	@@ -380,6 +383,8 @@
33	void
34	http_post_cb(struct evhttp_request req, void arg)
35	{
36	+ struct evbuffer *evb;
37	+
38	event_debug(("%s: called\n", __func__));
39
40	/* Yes, we are expecting a post request */
41	@@ -390,7 +395,7 @@
42
43	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(POST_DATA)) {
44	fprintf(stdout, "FAILED (length: %ld vs %ld)\n",
45	- EVBUFFER_LENGTH(req->input_buffer), strlen(POST_DATA));
46	+ (long int)EVBUFFER_LENGTH(req->input_buffer), (long int)strlen(POST_DATA));
47	exit(1);
48	}
49
50	@@ -402,7 +407,7 @@
51	exit(1);
52	}
53
54	- struct evbuffer *evb = evbuffer_new();
55	+ evb = evbuffer_new();
56	evbuffer_add_printf(evb, "This is funny");
57
58	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
59	@@ -428,7 +433,7 @@
60
61	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
62	fprintf(stderr, "FAILED (length %ld vs %ld)\n",
63	- EVBUFFER_LENGTH(req->input_buffer), strlen(what));
64	+ (long int)EVBUFFER_LENGTH(req->input_buffer), (long int)strlen(what));
65	exit(1);
66	}
67