From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 28 10:10:31 2005 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE23716A424 for ; Sun, 28 Aug 2005 10:10:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 125B343D6D for ; Sun, 28 Aug 2005 10:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7SAALMR028506 for ; Sun, 28 Aug 2005 10:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7SAAL1A028505; Sun, 28 Aug 2005 10:10:21 GMT (envelope-from gnats) Resent-Date: Sun, 28 Aug 2005 10:10:21 GMT Resent-Message-Id: <200508281010.j7SAAL1A028505@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, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CCF716A41F for ; Sun, 28 Aug 2005 10:04:25 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from hfep05.dion.ne.jp (hfep05.dion.ne.jp [203.181.105.71]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E35743D49 for ; Sun, 28 Aug 2005 10:04:24 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.136.159]) by hfep05.dion.ne.jp with SMTP id <20050828100419951.EHJZ@hfep05.dion.ne.jp> for ; Sun, 28 Aug 2005 19:04:19 +0900 Message-Id: <20050828190101.6cb495ff.tkato432@yahoo.com> Date: Sun, 28 Aug 2005 19:01:01 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/85390: Update port: www/cherokee to 0.4.25 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: Sun, 28 Aug 2005 10:10:31 -0000 >Number: 85390 >Category: ports >Synopsis: Update port: www/cherokee to 0.4.25 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 28 10:10:21 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p11 i386 >Organization: >Environment: >Description: - Update to version 0.4.25 New file: files/patch-cherokee-socket.c files/patch-cherokee-util.h >How-To-Repeat: >Fix: diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile --- /usr/ports/www/cherokee/Makefile Tue Jul 12 21:15:14 2005 +++ www/cherokee/Makefile Thu Aug 4 18:39:36 2005 @@ -6,7 +6,7 @@ # PORTNAME= cherokee -PORTVERSION= 0.4.24 +PORTVERSION= 0.4.25 CATEGORIES= www MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION} @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www INSTALLS_SHLIB= yes -MAN1= cget.1 cherokee-config.1 cherokee.1 +MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1 CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo --- /usr/ports/www/cherokee/distinfo Tue Jul 12 21:15:14 2005 +++ www/cherokee/distinfo Thu Aug 4 18:38:50 2005 @@ -1,2 +1,2 @@ -MD5 (cherokee-0.4.24.tar.gz) = dc51a96e46835fd2644048b12255bb81 -SIZE (cherokee-0.4.24.tar.gz) = 1402157 +MD5 (cherokee-0.4.25.tar.gz) = 1d6c1a6e9a83ca0b881f45f946e3f3c6 +SIZE (cherokee-0.4.25.tar.gz) = 1419364 diff -urN /usr/ports/www/cherokee/files/patch-cherokee-socket.c www/cherokee/files/patch-cherokee-socket.c --- /usr/ports/www/cherokee/files/patch-cherokee-socket.c Thu Jan 1 09:00:00 1970 +++ www/cherokee/files/patch-cherokee-socket.c Thu Aug 4 21:17:47 2005 @@ -0,0 +1,27 @@ +--- cherokee/socket.c.orig Tue Aug 2 05:32:12 2005 ++++ cherokee/socket.c Thu Aug 4 21:17:27 2005 +@@ -1052,15 +1052,20 @@ + cherokee_socket_init_client_tls (cherokee_socket_t *socket) + { + #ifdef HAVE_TLS +- int re; +- +- socket->is_tls = TLS; +- + # ifdef HAVE_GNUTLS ++ + const int kx_priority[] = {GNUTLS_KX_ANON_DH, 0}; + + gnutls_anon_client_credentials anoncred; ++ ++# endif ++ ++ int re; + ++ socket->is_tls = TLS; ++ ++# ifdef HAVE_GNUTLS ++ + /* Acredentials + */ + gnutls_anon_allocate_client_credentials(&anoncred); diff -urN /usr/ports/www/cherokee/files/patch-cherokee-util.h www/cherokee/files/patch-cherokee-util.h --- /usr/ports/www/cherokee/files/patch-cherokee-util.h Thu Jan 1 09:00:00 1970 +++ www/cherokee/files/patch-cherokee-util.h Thu Aug 4 21:05:25 2005 @@ -0,0 +1,23 @@ +--- cherokee/util.h.orig Mon Aug 1 21:47:22 2005 ++++ cherokee/util.h Thu Aug 4 21:05:15 2005 +@@ -33,7 +33,19 @@ + #include + #include + #include +-#include ++#include ++ ++#ifdef HAVE_SYS_SOCKET_H ++# include ++#endif ++ ++#ifdef HAVE_ARPA_INET_H ++# include ++#endif ++ ++#ifdef HAVE_NETINET_IN_H ++# include ++#endif + + + CHEROKEE_BEGIN_DECLS diff -urN /usr/ports/www/cherokee/pkg-plist www/cherokee/pkg-plist --- /usr/ports/www/cherokee/pkg-plist Tue Jul 12 21:15:14 2005 +++ www/cherokee/pkg-plist Thu Aug 4 21:15:05 2005 @@ -1,10 +1,12 @@ bin/cget bin/cherokee-config bin/cherokee-panic +bin/cherokee_logrotate etc/cherokee/advanced.conf etc/cherokee/cherokee.conf etc/cherokee/icons.conf etc/cherokee/mime.conf +etc/cherokee/mods-available/admin etc/cherokee/mods-available/ssl etc/cherokee/sites-available/default etc/cherokee/sites-available/example.com @@ -29,6 +31,7 @@ include/cherokee/mime.h include/cherokee/module.h include/cherokee/module_loader.h +include/cherokee/resolv_cache.h include/cherokee/server.h include/cherokee/table.h include/cherokee/url.h @@ -93,7 +96,7 @@ %%DATADIR%%/icons/unknown.png %%DATADIR%%/mime_types.txt %%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html -%%PORTDOCS%%%%DOCSDIR%%/CGI_Executing.html +%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html %%PORTDOCS%%%%DOCSDIR%%/Cget.html %%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html %%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html >Release-Note: >Audit-Trail: >Unformatted: