From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 14 21:00:41 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A334016A740 for ; Thu, 14 Dec 2006 21:00:41 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 716C443CBE for ; Thu, 14 Dec 2006 20:58:50 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBEL0RPE028492 for ; Thu, 14 Dec 2006 21:00:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBEL0RUm028491; Thu, 14 Dec 2006 21:00:27 GMT (envelope-from gnats) Resent-Date: Thu, 14 Dec 2006 21:00:27 GMT Resent-Message-Id: <200612142100.kBEL0RUm028491@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Beech Rintoul" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D7DBA16A656 for ; Thu, 14 Dec 2006 20:55:20 +0000 (UTC) (envelope-from beech@alaskaparadise.com) Received: from stargate.alaskaparadise.com (114-103-74-65.gci.net [65.74.103.114]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44ADF44262 for ; Thu, 14 Dec 2006 20:48:26 +0000 (GMT) (envelope-from beech@alaskaparadise.com) Received: from stargate.alaskaparadise.com (stargate.alaskaparadise.com [65.74.103.114]) by stargate.alaskaparadise.com (Postfix) with ESMTP id 6823245F8; Thu, 14 Dec 2006 11:49:49 -0900 (AKST) Message-Id: <1166129389.43157@stargate.alaskaparadise.com> Date: Thu, 14 Dec 2006 11:49:49 -0900 From: "Beech Rintoul" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: beech@alaskaparadise.com Subject: ports/106731: [PATCH] www/cherokee Upgrade to 0.5.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Dec 2006 21:00:41 -0000 >Number: 106731 >Category: ports >Synopsis: [PATCH] www/cherokee Upgrade to 0.5.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Dec 14 21:00:26 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Beech Rintoul >Release: FreeBSD 7.0-CURRENT i386 >Organization: Alaska Paradise >Environment: System: FreeBSD 7.0-CURRENT #91: Wed Dec 13 13:26:43 AKST 2006 root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE >Description: Upgrade to 0.5.6 Remove patch-cherokee-socket.h >How-To-Repeat: >Fix: diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/Makefile /usr/ports/www/cherokee/Makefile --- /usr/ports/www/cherokee.orig/Makefile Wed Nov 15 17:43:43 2006 +++ /usr/ports/www/cherokee/Makefile Wed Dec 13 21:22:22 2006 @@ -6,8 +6,8 @@ # PORTNAME= cherokee -PORTVERSION= 0.5.5 -PORTREVISION= 2 +PORTVERSION= 0.5.6 +PORTREVISION= CATEGORIES= www MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \ http://www.alaskaparadise.com/freebsd/ diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/distinfo /usr/ports/www/cherokee/distinfo --- /usr/ports/www/cherokee.orig/distinfo Wed Sep 20 02:33:33 2006 +++ /usr/ports/www/cherokee/distinfo Wed Dec 13 21:21:13 2006 @@ -1,3 +1,3 @@ -MD5 (cherokee-0.5.5.tar.gz) = fb891b3da7eb921c09a5eb93e296f5e1 -SHA256 (cherokee-0.5.5.tar.gz) = e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a -SIZE (cherokee-0.5.5.tar.gz) = 1559655 +MD5 (cherokee-0.5.6.tar.gz) = 0c5ae67c296f7e080900b23e533efd0b +SHA256 (cherokee-0.5.6.tar.gz) = d19ac8a85c252ccfe04c06ce0ec9b03d036b27d07c6db4601ce7d6b33c4e9cc8 +SIZE (cherokee-0.5.6.tar.gz) = 1392282 diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/patch-cherokee-connection.c /usr/ports/www/cherokee/files/patch-cherokee-connection.c --- /usr/ports/www/cherokee.orig/files/patch-cherokee-connection.c Wed Nov 15 17:43:44 2006 +++ /usr/ports/www/cherokee/files/patch-cherokee-connection.c Thu Dec 14 09:54:10 2006 @@ -1,30 +1,10 @@ ---- cherokee/connection.c.orig Wed Aug 30 17:12:13 2006 -+++ cherokee/connection.c Thu Nov 16 00:41:26 2006 -@@ -33,6 +33,9 @@ +--- cherokee/connection.c.orig Mon Dec 11 11:44:26 2006 ++++ cherokee/connection.c Thu Dec 14 09:50:08 2006 +@@ -32,6 +32,7 @@ + #include #include #include - -+#include +#include -+ + #ifdef HAVE_PWD_H # include - #endif -@@ -1210,7 +1213,7 @@ - } - tmp[num_len] = '\0'; - if (num_len != 0) { -- cnt->range_start = atoll (tmp); -+ cnt->range_start = strtoll(tmp, (char **)NULL, 10); - if (cnt->range_start < 0) { - return ret_error; - } -@@ -1236,7 +1239,7 @@ - num_len++; - } - tmp[num_len] = '\0'; -- cnt->range_end = atoll (tmp); -+ cnt->range_end = strtoll(tmp, (char **)NULL, 10); - if (cnt->range_end < 1){ - return ret_error; - } diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/patch-cherokee-fdpoll-kqueue.c /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c --- /usr/ports/www/cherokee.orig/files/patch-cherokee-fdpoll-kqueue.c Wed Sep 20 02:33:33 2006 +++ /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c Wed Dec 31 14:00:00 1969 @@ -1,10 +0,0 @@ ---- cherokee/fdpoll-kqueue.c.orig Wed Sep 13 21:45:31 2006 -+++ cherokee/fdpoll-kqueue.c Wed Sep 13 21:45:13 2006 -@@ -27,6 +27,7 @@ - #include "fdpoll-protected.h" - - #include -+#include - #include - #include - #include diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/patch-cherokee-handler_cgi_base.c /usr/ports/www/cherokee/files/patch-cherokee-handler_cgi_base.c --- /usr/ports/www/cherokee.orig/files/patch-cherokee-handler_cgi_base.c Wed Nov 15 17:43:44 2006 +++ /usr/ports/www/cherokee/files/patch-cherokee-handler_cgi_base.c Thu Dec 14 10:20:56 2006 @@ -1,20 +1,12 @@ ---- cherokee/handler_cgi_base.c.orig Fri Aug 18 15:21:03 2006 -+++ cherokee/handler_cgi_base.c Thu Nov 16 00:42:03 2006 -@@ -21,6 +21,8 @@ +--- cherokee/handler_cgi_base.c.orig Mon Dec 11 11:44:26 2006 ++++ cherokee/handler_cgi_base.c Thu Dec 14 10:09:38 2006 +@@ -21,7 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ +- +#include +#include - #include "common-internal.h" #include "handler_cgi_base.h" -@@ -578,7 +580,7 @@ - cherokee_buffer_t tmp = CHEROKEE_BUF_INIT; - - cherokee_buffer_add (&tmp, begin+16, end - (begin+16)); -- cgi->content_length = atoll (tmp.buf); -+ cgi->content_length = strtoll(tmp.buf, (char **)NULL, 10); - cherokee_buffer_mrproper (&tmp); - cherokee_buffer_remove_chunk (buffer, begin - buffer->buf, end2 - begin); diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/patch-cherokee-socket.c /usr/ports/www/cherokee/files/patch-cherokee-socket.c --- /usr/ports/www/cherokee.orig/files/patch-cherokee-socket.c Wed Sep 20 02:33:33 2006 +++ /usr/ports/www/cherokee/files/patch-cherokee-socket.c Thu Dec 14 10:39:08 2006 @@ -1,6 +1,6 @@ ---- cherokee/socket.c.orig Wed Sep 13 21:48:51 2006 -+++ cherokee/socket.c Wed Sep 13 22:06:35 2006 -@@ -1122,13 +1122,17 @@ +--- cherokee/socket.c.orig Thu Dec 7 09:46:29 2006 ++++ cherokee/socket.c Thu Dec 14 10:35:48 2006 +@@ -1153,13 +1153,17 @@ cherokee_socket_init_client_tls (cherokee_socket_t *socket) { #ifdef HAVE_TLS diff -ruN --exclude=CVS /usr/ports/www/cherokee.orig/files/patch-cherokee-socket.h /usr/ports/www/cherokee/files/patch-cherokee-socket.h --- /usr/ports/www/cherokee.orig/files/patch-cherokee-socket.h Sat Apr 23 03:48:02 2005 +++ /usr/ports/www/cherokee/files/patch-cherokee-socket.h Wed Dec 31 14:00:00 1969 @@ -1,19 +0,0 @@ ---- cherokee/socket.h.orig Sun Mar 6 08:09:33 2005 -+++ cherokee/socket.h Fri Apr 1 13:09:44 2005 -@@ -45,12 +45,12 @@ - # include - #endif - --#ifdef HAVE_ARPA_INET_H --# include --#endif -- - #ifdef HAVE_NETINET_IN_H - # include -+#endif -+ -+#ifdef HAVE_ARPA_INET_H -+# include - #endif - - #if defined(HAVE_GNUTLS) >Release-Note: >Audit-Trail: >Unformatted: