From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 19 18:10:48 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A1D816A4E0 for ; Wed, 19 Jul 2006 18:10:48 +0000 (UTC) (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 D16F543D58 for ; Wed, 19 Jul 2006 18: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.4/8.13.4) with ESMTP id k6JIAKOT083864 for ; Wed, 19 Jul 2006 18:10:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6JIAKjn083863; Wed, 19 Jul 2006 18:10:20 GMT (envelope-from gnats) Resent-Date: Wed, 19 Jul 2006 18:10:20 GMT Resent-Message-Id: <200607191810.k6JIAKjn083863@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 4ED8816A4DA for ; Wed, 19 Jul 2006 18:01:46 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from nm05omta05b.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.12]) by mx1.FreeBSD.org (Postfix) with SMTP id B32EB43D45 for ; Wed, 19 Jul 2006 18:01:45 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([218.222.66.254]) by nm05mta.dion.ne.jp id <20060720030140719.MAA7.81298F0@nm05mta.dion.ne.jp>; Thu, 20 Jul 2006 03:01:40 +0900 Message-Id: <20060720030029.d3fea824.tkato432@yahoo.com> Date: Thu, 20 Jul 2006 03:00:29 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/100566: Update port: www/twhttpd to 1.01 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: Wed, 19 Jul 2006 18:10:48 -0000 >Number: 100566 >Category: ports >Synopsis: Update port: www/twhttpd to 1.01 >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: Wed Jul 19 18:10:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p19 i386 >Organization: >Environment: >Description: - Update to version 1.01 New file: files/patch-cfg_functions.c files/patch-cfg_parser.y files/patch-config.h files/patch-httplog.c files/patch-twhttpd.c files/pkg-message.in Remove file: files/patch-aa files/patch-ab files/patch-ac files/patch-ad pkg-message >How-To-Repeat: >Fix: diff -urN /usr/ports/www/twhttpd/Makefile www/twhttpd/Makefile --- /usr/ports/www/twhttpd/Makefile Sat Jun 10 14:50:28 2006 +++ www/twhttpd/Makefile Mon Jun 26 02:44:15 2006 @@ -6,23 +6,25 @@ # PORTNAME= twhttpd -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.01 CATEGORIES= www MASTER_SITES= http://www.geocities.com/samngms/twhttpd/download/ -DISTNAME= twhttpd-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Secure HTTP Proxy -GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:213 +GNU_CONFIGURE= yes +CONFIGURE_ENV= LIBS="-lmd" + +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h + @${REINPLACE_CMD} -e 's| md5\.o | |g' ${WRKSRC}/Makefile.in do-install: - @${INSTALL_PROGRAM} -o root -g wheel -m 0755 ${WRKSRC}/twhttpd ${PREFIX}/sbin/twhttpd - @${INSTALL} -o root -g wheel -m 0755 ${WRKSRC}/rm_cache ${PREFIX}/sbin/rm_cache - @${INSTALL} -o root -g wheel -m 0700 ${WRKSRC}/twhttpd.cfg ${PREFIX}/etc/twhttpd.cfg.sample + ${INSTALL_PROGRAM} -o root -g wheel -m 0755 ${WRKSRC}/twhttpd ${PREFIX}/sbin/twhttpd + ${INSTALL} -o root -g wheel -m 0755 ${WRKSRC}/rm_cache ${PREFIX}/sbin/rm_cache + ${INSTALL} -o root -g wheel -m 0700 ${WRKSRC}/twhttpd.cfg ${PREFIX}/etc/twhttpd.cfg.sample post-install: @${CAT} ${PKGMESSAGE} diff -urN /usr/ports/www/twhttpd/distinfo www/twhttpd/distinfo --- /usr/ports/www/twhttpd/distinfo Tue Jan 24 13:43:12 2006 +++ www/twhttpd/distinfo Mon Jun 26 02:35:03 2006 @@ -1,3 +1,3 @@ -MD5 (twhttpd-1.0.tar.gz) = 09b49b470e689fc1e5917b9503cea71d -SHA256 (twhttpd-1.0.tar.gz) = 181f4e52ac93db12dc7016a1596147fdcbbc2c11683572ab30a4ceb2aa990e1a -SIZE (twhttpd-1.0.tar.gz) = 99836 +MD5 (twhttpd-1.01.tar.gz) = 315b5687f74f863517370ad2fcbf296f +SHA256 (twhttpd-1.01.tar.gz) = 3924847d6ef5667c18ce2221b296e30279e382fe2d76fad06439c988709ebd85 +SIZE (twhttpd-1.01.tar.gz) = 104312 diff -urN /usr/ports/www/twhttpd/files/patch-aa www/twhttpd/files/patch-aa --- /usr/ports/www/twhttpd/files/patch-aa Fri Jan 3 16:58:23 2003 +++ www/twhttpd/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- config.h.orig Sat Aug 31 05:40:23 2002 -+++ config.h Wed Sep 25 12:01:58 2002 -@@ -31,7 +31,7 @@ - #define CURRENT_DIR "./" - #define DEFAULT_CACHE_DIR ".cache" - #define DEFAULT_COOKIE_DIR ".cookie" --#define DEFAULT_CONFIG_FILE "/etc/twhttpd.cfg" -+#define DEFAULT_CONFIG_FILE "/usr/local/etc/twhttpd.cfg" - - #define SOCKET_TIMEOUT 45 /* socket timeout value */ - #define CONNECT_TIMEOUT 15 /* connect timeout value */ diff -urN /usr/ports/www/twhttpd/files/patch-ab www/twhttpd/files/patch-ab --- /usr/ports/www/twhttpd/files/patch-ab Fri Jan 3 16:58:23 2003 +++ www/twhttpd/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ ---- httplog.c.orig Sat Dec 8 15:15:44 2001 -+++ httplog.c Wed Sep 25 12:02:28 2002 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -151,4 +152,4 @@ - } - } - } --} -+} diff -urN /usr/ports/www/twhttpd/files/patch-ac www/twhttpd/files/patch-ac --- /usr/ports/www/twhttpd/files/patch-ac Sat Oct 2 02:45:57 2004 +++ www/twhttpd/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- twhttpd.c.orig Sat Aug 31 05:16:35 2002 -+++ twhttpd.c Wed Sep 25 12:02:49 2002 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -3882,7 +3882,7 @@ - lz_flush(hd->fd, &hd->fd_lzb); - } - syslog(LOG_ERR, "Exiting Testing Server\n"); -- exit; -+ exit(0); - } - - ////////////////////////////////////////////////////////////////////// diff -urN /usr/ports/www/twhttpd/files/patch-ad www/twhttpd/files/patch-ad --- /usr/ports/www/twhttpd/files/patch-ad Fri Jan 3 16:58:23 2003 +++ www/twhttpd/files/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.in.orig Wed Sep 25 12:41:35 2002 -+++ configure.in Wed Sep 25 12:41:44 2002 -@@ -8,7 +8,7 @@ - AC_PROG_LEX - - dnl Checks for libraries. --AC_CHECK_LIB(pwdb, crypt) -+AC_CHECK_LIB(crypt, crypt) - AC_CHECK_LIB(socket, bind) - AC_CHECK_LIB(nsl, gethostbyname) - diff -urN /usr/ports/www/twhttpd/files/patch-cfg_functions.c www/twhttpd/files/patch-cfg_functions.c --- /usr/ports/www/twhttpd/files/patch-cfg_functions.c Thu Jan 1 09:00:00 1970 +++ www/twhttpd/files/patch-cfg_functions.c Mon Jun 26 02:38:29 2006 @@ -0,0 +1,15 @@ +--- cfg_functions.c.orig Tue Feb 12 23:29:15 2002 ++++ cfg_functions.c Mon Jun 26 02:38:18 2006 +@@ -29,10 +29,10 @@ + #include + #include + #include +-#include +-#include + #include ++#include + #include ++#include + + #include "y.tab.h" + #include "twhttpd.h" diff -urN /usr/ports/www/twhttpd/files/patch-cfg_parser.y www/twhttpd/files/patch-cfg_parser.y --- /usr/ports/www/twhttpd/files/patch-cfg_parser.y Thu Jan 1 09:00:00 1970 +++ www/twhttpd/files/patch-cfg_parser.y Mon Jun 26 02:41:02 2006 @@ -0,0 +1,14 @@ +--- cfg_parser.y.orig Sat Aug 31 12:41:16 2002 ++++ cfg_parser.y Mon Jun 26 02:40:51 2006 +@@ -27,10 +27,10 @@ + #include + #include + #include +-#include + #include + #include + #include ++#include + + #include "config.h" + #include "cfg_functions.h" diff -urN /usr/ports/www/twhttpd/files/patch-config.h www/twhttpd/files/patch-config.h --- /usr/ports/www/twhttpd/files/patch-config.h Thu Jan 1 09:00:00 1970 +++ www/twhttpd/files/patch-config.h Mon Jun 26 02:32:49 2006 @@ -0,0 +1,11 @@ +--- config.h.orig Sat Aug 31 05:40:23 2002 ++++ config.h Wed Sep 25 12:01:58 2002 +@@ -31,7 +31,7 @@ + #define CURRENT_DIR "./" + #define DEFAULT_CACHE_DIR ".cache" + #define DEFAULT_COOKIE_DIR ".cookie" +-#define DEFAULT_CONFIG_FILE "/etc/twhttpd.cfg" ++#define DEFAULT_CONFIG_FILE "%%PREFIX%%/etc/twhttpd.cfg" + + #define SOCKET_TIMEOUT 45 /* socket timeout value */ + #define CONNECT_TIMEOUT 15 /* connect timeout value */ diff -urN /usr/ports/www/twhttpd/files/patch-httplog.c www/twhttpd/files/patch-httplog.c --- /usr/ports/www/twhttpd/files/patch-httplog.c Thu Jan 1 09:00:00 1970 +++ www/twhttpd/files/patch-httplog.c Mon Jun 26 02:36:42 2006 @@ -0,0 +1,16 @@ +--- httplog.c.orig Sat Dec 8 23:15:44 2001 ++++ httplog.c Mon Jun 26 02:36:09 2006 +@@ -40,10 +40,11 @@ + #include + #include + #include ++#include ++#include + #include ++#include + #include +-#include +-#include + + #include "config.h" + #include "structs.h" diff -urN /usr/ports/www/twhttpd/files/patch-twhttpd.c www/twhttpd/files/patch-twhttpd.c --- /usr/ports/www/twhttpd/files/patch-twhttpd.c Thu Jan 1 09:00:00 1970 +++ www/twhttpd/files/patch-twhttpd.c Mon Jun 26 02:48:27 2006 @@ -0,0 +1,26 @@ +--- twhttpd.c.orig Tue Apr 1 13:06:08 2003 ++++ twhttpd.c Mon Jun 26 02:47:58 2006 +@@ -33,10 +33,11 @@ + #include + #include + #include +-#include +-#include +-#include ++#include + #include ++#include ++#include ++#include + #include + #include + +@@ -4014,7 +4015,7 @@ + lz_flush(hd->fd, &hd->fd_lzb); + } + syslog(LOG_ERR, "Exiting Testing Server\n"); +- exit; ++ exit(0); + } + + ////////////////////////////////////////////////////////////////////// diff -urN /usr/ports/www/twhttpd/files/pkg-message.in www/twhttpd/files/pkg-message.in --- /usr/ports/www/twhttpd/files/pkg-message.in Thu Jan 1 09:00:00 1970 +++ www/twhttpd/files/pkg-message.in Mon Jun 26 02:32:15 2006 @@ -0,0 +1,5 @@ +*************************************************************************** +twhttpd is installed in %%PREFIX%%/sbin/ +Now copy %%PREFIX%%/etc/twhttpd.cfg.sample to twhttpd.cfg, +and edit it. +*************************************************************************** diff -urN /usr/ports/www/twhttpd/pkg-message www/twhttpd/pkg-message --- /usr/ports/www/twhttpd/pkg-message Fri Jan 3 16:58:23 2003 +++ www/twhttpd/pkg-message Thu Jan 1 09:00:00 1970 @@ -1,5 +0,0 @@ -*************************************************************************** -twhttpd is installed in /usr/local/sbin/ -Now copy /usr/local/etc/twhttpd.cfg.sample to twhttpd.cfg, -and edit it. -*************************************************************************** >Release-Note: >Audit-Trail: >Unformatted: