From owner-freebsd-ports Sat Mar 16 15:50:28 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1EF5937B405 for ; Sat, 16 Mar 2002 15:50:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2GNo2h92260; Sat, 16 Mar 2002 15:50:02 -0800 (PST) (envelope-from gnats) Received: from vaio.alexdupre.com (212-41-211-209.adsl.galactica.it [212.41.211.209]) by hub.freebsd.org (Postfix) with ESMTP id 9E83A37B400 for ; Sat, 16 Mar 2002 15:42:23 -0800 (PST) Received: (from alex@localhost) by vaio.alexdupre.com (8.11.6/8.11.6) id g2GNhvA00203; Sun, 17 Mar 2002 00:43:57 +0100 (CET) (envelope-from alex) Message-Id: <200203162343.g2GNhvA00203@vaio.alexdupre.com> Date: Sun, 17 Mar 2002 00:43:57 +0100 (CET) From: Alex Dupre Reply-To: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/35990: [Maintainer Update Port] Boa Web Server (to 0.94.12rc4) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 35990 >Category: ports >Synopsis: [Maintainer Update Port] Boa Web Server (to 0.94.12rc4) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Mar 16 15:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.5-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD vaio.alexdupre.com 4.5-ALEXDUPRE FreeBSD 4.5-ALEXDUPRE #0: Sun Mar 10 23:48:11 CET 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386 >Description: Updated www/boa to 0.94.12rc4 release. >How-To-Repeat: >Fix: --- boa.diff begins here --- diff -ruN boa.orig/Makefile boa/Makefile --- boa.orig/Makefile Sat Mar 16 15:40:00 2002 +++ boa/Makefile Sat Mar 16 15:40:31 2002 @@ -6,7 +6,7 @@ # PORTNAME= boa -PORTVERSION= 0.94.12.r3 +PORTVERSION= 0.94.12.r4 CATEGORIES= www MASTER_SITES= http://www.boa.org/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} diff -ruN boa.orig/distinfo boa/distinfo --- boa.orig/distinfo Sat Mar 16 15:40:00 2002 +++ boa/distinfo Sat Mar 16 15:40:54 2002 @@ -1 +1 @@ -MD5 (boa-0.94.12rc3.tar.gz) = 7c0ac77a108f40c09d0341e2dc437cd4 +MD5 (boa-0.94.12rc4.tar.gz) = 84234c8e5726ac979c97bae60d93ef73 diff -ruN boa.orig/files/patch-ab boa/files/patch-ab --- boa.orig/files/patch-ab Sat Mar 16 15:39:59 2002 +++ boa/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- defines.h.orig Thu Nov 1 23:37:46 2001 -+++ defines.h Sun Feb 17 13:40:30 2002 -@@ -27,7 +27,7 @@ - /***** Change this, or use -c on the command line to specify it *****/ - - #ifndef SERVER_ROOT --#define SERVER_ROOT "/etc/boa" -+#define SERVER_ROOT "%%PREFIX%%/etc" - #endif - - /***** Various stuff that you may want to tweak, but probably shouldn't *****/ -@@ -44,7 +44,7 @@ - #define REQUEST_TIMEOUT 60 - - #define CGI_MIME_TYPE "application/x-httpd-cgi" --#define DEFAULT_PATH "/bin:/usr/bin:/usr/local/bin" -+#define DEFAULT_PATH "/bin:/usr/bin:%%PREFIX%%/bin" - - /***** CHANGE ANYTHING BELOW THIS LINE AT YOUR OWN PERIL *****/ - /***** You will probably introduce buffer overruns unless you know diff -ruN boa.orig/files/patch-boa.conf boa/files/patch-boa.conf --- boa.orig/files/patch-boa.conf Sat Mar 16 15:39:59 2002 +++ boa/files/patch-boa.conf Sat Mar 16 15:55:01 2002 @@ -1,5 +1,5 @@ ---- ../boa.conf.orig Wed Mar 6 23:50:40 2002 -+++ ../boa.conf Wed Mar 6 23:52:39 2002 +--- ../boa.conf.orig Sat Mar 16 06:38:51 2002 ++++ ../boa.conf Sat Mar 16 15:54:19 2002 @@ -108,7 +108,7 @@ # DocumentRoot: The root directory of the HTML documents. # Comment out to disable server non user files. @@ -18,7 +18,16 @@ # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker # has been commented out, the the on-the-fly indexing of Boa can be used -@@ -183,5 +183,5 @@ +@@ -161,7 +161,7 @@ + + # CGIPath: The value of the $PATH environment variable given to CGI progs. + +-CGIPath /bin:/usr/bin:/usr/local/bin ++CGIPath /bin:/usr/bin:%%PREFIX%%/bin + + # AddType: adds types without editing mime.types + # Example: AddType type extension [extension ...] +@@ -187,5 +187,5 @@ # ScriptAlias: Maps a virtual path to a directory for serving scripts # Example: ScriptAlias /htbin/ /www/htbin/ diff -ruN boa.orig/files/patch-src::defines.h boa/files/patch-src::defines.h --- boa.orig/files/patch-src::defines.h Thu Jan 1 01:00:00 1970 +++ boa/files/patch-src::defines.h Sat Mar 16 15:50:33 2002 @@ -0,0 +1,11 @@ +--- defines.h.orig Sat Mar 16 15:46:21 2002 ++++ defines.h Sat Mar 16 15:50:30 2002 +@@ -27,7 +27,7 @@ + /***** Change this, or use -c on the command line to specify it *****/ + + #ifndef SERVER_ROOT +-#define SERVER_ROOT "/etc/boa" ++#define SERVER_ROOT "%%PREFIX%%/etc" + #endif + + /***** Change this via the CGIPath configuration value in boa.conf *****/ --- boa.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message