From phil@home.nixil.net Tue Oct 31 12:23:01 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 427B316A407 for ; Tue, 31 Oct 2006 12:23:01 +0000 (UTC) (envelope-from phil@home.nixil.net) Received: from home.nixil.net (c-24-10-219-57.hsd1.ut.comcast.net [24.10.219.57]) by mx1.FreeBSD.org (Postfix) with ESMTP id A965F43D55 for ; Tue, 31 Oct 2006 12:23:00 +0000 (GMT) (envelope-from phil@home.nixil.net) Received: from home.nixil.net (localhost [127.0.0.1]) by home.nixil.net (8.13.8/8.13.8) with ESMTP id k9VCMwTL028492 for ; Tue, 31 Oct 2006 05:22:59 -0700 (MST) (envelope-from phil@home.nixil.net) Received: (from root@localhost) by home.nixil.net (8.13.8/8.13.8/Submit) id k9VCMwOw028491; Tue, 31 Oct 2006 05:22:58 -0700 (MST) (envelope-from phil) Message-Id: <200610311222.k9VCMwOw028491@home.nixil.net> Date: Tue, 31 Oct 2006 05:22:58 -0700 (MST) From: oz@nixil.net Reply-To: oz@nixil.net To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [PATCH] devel/libevent - upgrade to real 1.2 release X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 104963 >Category: ports >Synopsis: [PATCH] devel/libevent - upgrade to real 1.2 release >Confidential: no >Severity: non-critical >Priority: medium >Responsible: clsung >State: closed >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 31 12:30:19 GMT 2006 >Closed-Date: Mon Nov 06 04:04:16 GMT 2006 >Last-Modified: Mon Nov 6 04:10:22 GMT 2006 >Originator: Phil Oleson >Release: FreeBSD 5.5-STABLE i386 >Organization: N/A >Environment: System: FreeBSD home.nixil.net 5.5-STABLE FreeBSD 5.5-STABLE #4: Fri Oct 27 03:31:36 MDT 2006 root@home.nixil.net:/usr/obj/usr/src/sys/home i386 >Description: Upgrade libevent to the real 1.2 release rather then the pre-prelease that it was updated to previously. Converted MLINKS to a more manageable format. >How-To-Repeat: N/A >Fix: patch to update libevent to the official 1.2 release. --- patch-libevent begins here --- diff -ruN libevent.orig/Makefile libevent/Makefile --- libevent.orig/Makefile Mon Aug 14 16:55:11 2006 +++ libevent/Makefile Tue Oct 31 05:15:41 2006 @@ -7,6 +7,7 @@ PORTNAME= libevent PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://monkey.org/~provos/ @@ -18,22 +19,72 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}" -MAN3= event.3 -MLINKS= event.3 event_init.3 event.3 event_dispatch.3 event.3 event_loop.3 \ - event.3 event_loopexit.3 event.3 event_set.3 event.3 event_add.3 \ - event.3 event_del.3 event.3 event_once.3 event.3 event_pending.3 \ - event.3 event_initialized.3 event.3 event_priority_init.3 \ - event.3 event_priority_set.3 event.3 evtimer_set.3 event.3 evtimer_add.3 \ - event.3 evtimer_del.3 event.3 evtimer_pending.3 event.3 evtimer_initialized.3 \ - event.3 signal_set.3 event.3 signal_add.3 event.3 signal_del.3 \ - event.3 signal_pending.3 event.3 signal_initialized.3 event.3 bufferevent_new.3 \ - event.3 bufferevent_free.3 event.3 bufferevent_write.3 \ - event.3 bufferevent_write_buffer.3 event.3 bufferevent_read.3 \ - event.3 bufferevent_enable.3 event.3 bufferevent_disable.3 \ - event.3 bufferevent_settimeout.3 event.3 evbuffer_new.3 \ - event.3 evbuffer_free.3 event.3 evbuffer_add.3 event.3 evbuffer_add_buffer.3 \ - event.3 evbuffer_add_printf.3 event.3 evbuffer_drain.3 \ - event.3 evbuffer_write.3 event.3 evbuffer_read.3 event.3 evbuffer_find.3 +MAN3= event.3 \ + evdns.3 +MLINKS= event.3 event_init.3 \ + - event_dispatch.3 \ + - event_loop.3 \ + - event_loopexit.3 \ + - event_set.3 \ + - event_base_dispatch.3 \ + - event_base_loop.3 \ + - event_base_loopexit.3 \ + - event_base_set.3 \ + - event_add.3 \ + - event_del.3 \ + - event_once.3 \ + - event_pending.3 \ + - event_initialized.3 \ + - event_priority_init.3 \ + - event_priority_set.3 \ + - evtimer_set.3 \ + - evtimer_add.3 \ + - evtimer_del.3 \ + - evtimer_pending.3 \ + - evtimer_initialized.3 \ + - signal_set.3 \ + - signal_add.3 \ + - signal_del.3 \ + - signal_pending.3 \ + - signal_initialized.3 \ + - bufferevent_new.3 \ + - bufferevent_free.3 \ + - bufferevent_write.3 \ + - bufferevent_write_buffer.3 \ + - bufferevent_read.3 \ + - bufferevent_enable.3 \ + - bufferevent_disable.3 \ + - bufferevent_settimeout.3 \ + - bufferevent_base_set.3 \ + - evbuffer_new.3 \ + - evbuffer_free.3 \ + - evbuffer_add.3 \ + - evbuffer_add_buffer.3 \ + - evbuffer_add_printf.3 \ + - evbuffer_add_vprintf.3 \ + - evbuffer_drain.3 \ + - evbuffer_write.3 \ + - evbuffer_read.3 \ + - evbuffer_find.3 \ + - evbuffer_readline.3 \ + - evhttp_start.3 \ + - evhttp_free.3 \ + evdns.3 evdns_init.3 \ + - evdns_shutdown.3 \ + - evdns_err_to_string.3 \ + - evdns_nameserver_add.3 \ + - evdns_count_nameservers.3 \ + - evdns_clear_nameservers_and_suspend.3 \ + - evdns_resume.3 \ + - evdns_nameserver_ip_add.3 \ + - evdns_resolve_ipv4.3 \ + - evdns_resolve_reverse.3 \ + - evdns_resolv_conf_parse.3 \ + - evdns_search_clear.3 \ + - evdns_search_add.3 \ + - evdns_search_ndots_set.3 \ + - evdns_set_log_fn.3 \ + - evdns_config_windows_nameservers.3 post-patch: @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in diff -ruN libevent.orig/distinfo libevent/distinfo --- libevent.orig/distinfo Wed Jun 28 08:42:27 2006 +++ libevent/distinfo Tue Oct 31 04:50:15 2006 @@ -1,3 +1,3 @@ -MD5 (libevent-1.2.tar.gz) = d907af94851d0528e627192bd8a822cb -SHA256 (libevent-1.2.tar.gz) = 3046935f826d9070b019addfdfeff6579fa6061227be3d59fa8014b594ff6d51 -SIZE (libevent-1.2.tar.gz) = 367338 +MD5 (libevent-1.2.tar.gz) = 3b7de04a7fa0ac2d96f714f720161c3f +SHA256 (libevent-1.2.tar.gz) = 2a6a840c00d5f8061d6c1b9811671d89c01a34f69214828bf745dbc6937caea4 +SIZE (libevent-1.2.tar.gz) = 413811 diff -ruN libevent.orig/files/patch-http.c libevent/files/patch-http.c --- libevent.orig/files/patch-http.c Wed Dec 31 17:00:00 1969 +++ libevent/files/patch-http.c Tue Oct 31 04:12:44 2006 @@ -0,0 +1,11 @@ +--- http.c.orig Sat Aug 12 11:41:36 2006 ++++ http.c Tue Oct 31 04:12:27 2006 +@@ -207,7 +207,7 @@ + evhttp_find_header(req->output_headers, "Content-Length") == NULL){ + char size[12]; + snprintf(size, sizeof(size), "%ld", +- EVBUFFER_LENGTH(req->output_buffer)); ++ (long int)EVBUFFER_LENGTH(req->output_buffer)); + evhttp_add_header(req->output_headers, "Content-Length", size); + } + } 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 Wed Dec 31 17:00:00 1969 +++ libevent/files/patch-test-regress_http.c Tue Oct 31 04:14:14 2006 @@ -0,0 +1,20 @@ +--- test/regress_http.c.orig Sun Oct 15 15:51:59 2006 ++++ test/regress_http.c Tue Oct 31 04:13:45 2006 +@@ -365,7 +365,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); + } + +@@ -403,7 +403,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 libevent.orig/pkg-plist libevent/pkg-plist --- libevent.orig/pkg-plist Wed Jun 28 08:42:27 2006 +++ libevent/pkg-plist Tue Oct 31 05:03:24 2006 @@ -1,5 +1,7 @@ bin/event_rpcgen.py include/event.h +include/evhttp.h +include/evdns.h lib/libevent-%%PORTVERSION%%.so lib/libevent-%%PORTVERSION%%.so.1 lib/libevent.a --- patch-libevent ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->clsung Responsible-Changed-By: clsung Responsible-Changed-When: Tue Oct 31 12:41:28 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=104963 State-Changed-From-To: open->closed State-Changed-By: clsung State-Changed-When: Mon Nov 6 04:04:15 UTC 2006 State-Changed-Why: Committed. Thank You. http://www.freebsd.org/cgi/query-pr.cgi?pr=104963 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/104963: commit references a PR Date: Mon, 6 Nov 2006 04:04:13 +0000 (UTC) clsung 2006-11-06 04:04:07 UTC FreeBSD ports repository Modified files: devel/libevent Makefile distinfo pkg-plist Added files: devel/libevent/files patch-http.c patch-test-regress_http.c Log: - Update to real 1.2 release PR: ports/104963 Submitted by: oz_AT_nixil dot net Revision Changes Path 1.25 +67 -16 ports/devel/libevent/Makefile 1.15 +3 -3 ports/devel/libevent/distinfo 1.1 +11 -0 ports/devel/libevent/files/patch-http.c (new) 1.1 +20 -0 ports/devel/libevent/files/patch-test-regress_http.c (new) 1.5 +2 -0 ports/devel/libevent/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: