Fix for bug #34141

6 files changed, 125 insertions, 14 deletions

diff --git a/net-www/boa/ChangeLog b/net-www/boa/ChangeLog
index 26df244caa7e..b790ed68a5f4 100644
--- a/net-www/boa/ChangeLog
+++ b/net-www/boa/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/boa
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/boa/ChangeLog,v 1.12 2004/01/20 20:45:06 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/boa/ChangeLog,v 1.13 2004/04/23 09:02:21 stuart Exp $
+
+*boa-0.94.13-r1 (23 Apr 2004)
+
+  23 Apr 2004; Stuart Herbert <stuart@gentoo.org> boa-0.94.13-r1.ebuild,
+  files/boa.rc6:
+  Added support for changing Boa's ServerRoot on startup, thanks to Kurt V.
+  Hindenburg <khindenburg@cherrynebula.net>. See bug #34141 for details.
+  
+  Also changed default DocumentRoot to be /var/www/localhost/htdocs, as per GLEP
+  #11.
 
   20 Jan 2004; <tuxus@gentoo.org> boa-0.94.13.ebuild:
   Added ~mips to KEYWORDS.
diff --git a/net-www/boa/Manifest b/net-www/boa/Manifest
index b078a50ecc4c..4eb7453ed79b 100644
--- a/net-www/boa/Manifest
+++ b/net-www/boa/Manifest
@@ -1,9 +1,12 @@
+MD5 ef55ff2dc087ddcdb0f96cd773a4cd68 boa-0.94.12.ebuild 1576
+MD5 8a663ef6cbdd1cb82cace3bdc5d1b6e5 boa-0.94.13.ebuild 1661
+MD5 42ada761a45ff1f4b6b0852beb0a8578 ChangeLog 2172
+MD5 2a78bb58fef11ab967dcf02bcc39b6dc boa-0.94.13-r1.ebuild 1876
 MD5 90c0c0ec7d80f10caafd016c5c9ecb49 files/boa-0.94.13-gcc3.patch 547
-MD5 9279ee115c07e4862812ff608e2d3593 files/boa.conf 7148
-MD5 5f36555809645d050355df968baa3941 files/boa.rc6 675
+MD5 bdd0d0ae5038b87a0827ddb97cdbf212 files/boa.conf 7168
 MD5 3f6d2bad0652220e834c786c6cb2b0ea files/digest-boa-0.94.12 63
 MD5 98776c2beacab938c843c24830ed81ab files/digest-boa-0.94.13 63
+MD5 a323916901857a0cb3a04ab36a6470f1 files/boa.rc6 900
 MD5 3e9e1f39e91126bfb472bf3fcdc7fae4 files/mime.types 5488
-MD5 00b2ac189e8c4b374badfb76906fbfbb ChangeLog 1809
-MD5 ef55ff2dc087ddcdb0f96cd773a4cd68 boa-0.94.12.ebuild 1576
-MD5 8a663ef6cbdd1cb82cace3bdc5d1b6e5 boa-0.94.13.ebuild 1661
+MD5 bbe2d6d519c762b0fdf3046f655fea02 files/boa.conf.d 121
+MD5 98776c2beacab938c843c24830ed81ab files/digest-boa-0.94.13-r1 63
diff --git a/net-www/boa/boa-0.94.13-r1.ebuild b/net-www/boa/boa-0.94.13-r1.ebuild
new file mode 100644
index 000000000000..2d78d21ac612
--- /dev/null
+++ b/net-www/boa/boa-0.94.13-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/boa/boa-0.94.13-r1.ebuild,v 1.1 2004/04/23 09:02:21 stuart Exp $
+
+DESCRIPTION="Boa - A very small and very fast http daemon"
+SRC_URI="http://www.boa.org/${P}.tar.gz"
+HOMEPAGE="http://www.boa.org/"
+
+KEYWORDS="~x86 ~sparc ~mips"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tetex"
+
+DEPEND="virtual/glibc
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/texinfo
+	tetex? ( app-text/tetex )"
+
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc3.patch || die
+}
+
+src_compile() {
+	cd src
+	econf
+	emake || die
+	cd ../docs
+	make boa.html boa.info || die
+
+	# SLH - 2004/04/23
+	# commented out - this doesn't appear to work, and I'm not tetex
+	# expert, so I don't know how to fix it
+	#
+	# use tetex && make boa.dvi
+}
+
+src_install() {
+	# make prefix=${D}/usr install
+	dosbin src/boa || die
+	doman docs/boa.8 || die
+	dodoc docs/boa.html || die
+	dodoc docs/boa_banner.png || die
+	doinfo docs/boa.info || die
+#	if [ "`use tetex`" ]; then
+#		dodoc docs/boa.dvi || die
+#	fi
+
+	dodir /var/log/boa || die
+	dodir /var/www/localhost/htdocs || die
+	dodir /var/www/localhost/cgi-bin || die
+	dodir /var/www/localhost/icons || die
+
+	insinto /etc/conf.d
+	doins ${FILESDIR}/boa.conf.d
+
+	exeinto /usr/lib/boa
+	doexe src/boa_indexer || die
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/boa.rc6 boa || die
+
+	insinto /etc/boa
+	insopts -m700
+	insopts -m600
+	doins ${FILESDIR}/boa.conf || die
+	doins ${FILESDIR}/mime.types || die
+
+	# make DESTDIR=${D} install || die
+}
+
+pkg_prerm() {
+	if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/boa ] ; then
+		/etc/init.d/boa stop
+	fi
+	return # dont fail
+}
+
+pkg_preinst() {
+	if [ "$ROOT" = "/" ] && [ -e /dev/shm/.init.d/started/boa ] ; then
+		/etc/init.d/boa stop
+	fi
+	return # dont fail
+}
diff --git a/net-www/boa/files/boa.conf b/net-www/boa/files/boa.conf
index f6f1259acb7c..94641c82d6d0 100644
--- a/net-www/boa/files/boa.conf
+++ b/net-www/boa/files/boa.conf
@@ -10,7 +10,7 @@
 # these directives mimic those of NCSA httpd 1.3; I saw no reason to 
 # introduce gratuitous differences.
 
-# $Id: boa.conf,v 1.3 2002/06/06 02:47:05 jnelson Exp $
+# $Id: boa.conf,v 1.4 2004/04/23 09:02:21 stuart Exp $
 
 # The "ServerRoot" is not in this configuration file.  It can be compiled
 # into the server (see defines.h) or specified on the command line with
@@ -108,7 +108,7 @@ AccessLog /var/log/boa/access_log
 # DocumentRoot: The root directory of the HTML documents.
 # Comment out to disable server non user files.
 
-DocumentRoot /home/httpd/htdocs
+DocumentRoot /var/www/localhost/htdocs
 
 # UserDir: The name of the directory which is appended onto a user's home
 # directory if a ~user request is recieved.
@@ -178,10 +178,10 @@ DefaultType text/plain
 # Example: Alias /path1/bar /path2/foo
 
 Alias /doc /usr/share/doc
-Alias /icons /home/httpd/icons
+Alias /icons /var/www/localhost/icons
 
 # ScriptAlias: Maps a virtual path to a directory for serving scripts
 # Example: ScriptAlias /htbin/ /www/htbin/
 
-ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
+ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
 
diff --git a/net-www/boa/files/boa.rc6 b/net-www/boa/files/boa.rc6
index 960a30913bda..d9f114367f04 100644
--- a/net-www/boa/files/boa.rc6
+++ b/net-www/boa/files/boa.rc6
@@ -1,15 +1,24 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/boa/files/boa.rc6,v 1.4 2004/03/06 03:54:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/boa/files/boa.rc6,v 1.5 2004/04/23 09:02:21 stuart Exp $
+
+# NB: Standard config is in /etc/boa/boa.conf
+# NB: Arguments to pass to boa are in /etc/conf.d/boa
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /etc/boa/boa.conf ] ; then
-		eerror "You need an /etc/boa/boa.conf to run Boa"
+	if [ -e /etc/conf.d/boa ]; then
+		SR=`echo ${BOA_OPTS} | awk '{ FS = " " } { print $2 }'`
+	else
+		SR=/etc/boa
+	fi
+
+	if [ ! -e ${SR}/boa.conf ] ; then
+		eerror "You need a ${SR}/boa.conf to run Boa"
 		eerror "There is a sample file in /usr/share/docs/boa"
 		return 1
 	fi
@@ -18,7 +27,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting Boa"
-	start-stop-daemon --quiet --start --exec /usr/sbin/boa
+	start-stop-daemon --quiet --start --exec /usr/sbin/boa -- ${BOA_OPTS}
 	eend $?
 }
 
diff --git a/net-www/boa/files/digest-boa-0.94.13-r1 b/net-www/boa/files/digest-boa-0.94.13-r1
new file mode 100644
index 000000000000..5041f01b668c
--- /dev/null
+++ b/net-www/boa/files/digest-boa-0.94.13-r1
@@ -0,0 +1 @@
+MD5 c8d6f46f9aa60909f171529068813fe0 boa-0.94.13.tar.gz 122066