Version bump for bugs 76575 and 81776.

(Portage version: 2.0.51.16)

8 files changed, 266 insertions, 12 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 9e33b4e322c8..fbd5f1857dd7 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.9 2005/01/07 07:56:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.10 2005/02/14 11:39:01 ka0ttic Exp $
+
+*lighttpd-1.3.10 (14 Feb 2005)
+
+  14 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/lighttpd-1.3.10-php.diff, +files/lighttpd-1.3.10.initd,
+  +files/spawn-fcgi.confd, +files/spawn-fcgi.initd, +lighttpd-1.3.10.ebuild:
+  Version bump for bugs 76575 and 81776.
 
   07 Jan 2005; Sven Wegener <swegener@gentoo.org> lighttpd-1.3.5.ebuild:
   Added missing -1 to enewuser. Closes bug #76989.
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 8f300b27523d..b98aa0d0f602 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,24 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4750f33210e9131c3697e0b093b27325 lighttpd-1.3.5.ebuild 2345
+MD5 d4541e2693233a9d40452df6d5b7a3c1 lighttpd-1.3.10.ebuild 2608
 MD5 06f884c7ab1b91b0e2910d79fb4f9c74 lighttpd-1.1.8.ebuild 1923
 MD5 276acf7b725ea3cc31e0ff3ad79d24eb lighttpd-1.1.8-r1.ebuild 1926
-MD5 22d0504310c30e079a9af6e62dc6f570 ChangeLog 3113
+MD5 20b23438cd0e6cbd5ed1bedab2e68859 ChangeLog 3378
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 4084d21b36bf6a0dc9349fa75ccacde9 lighttpd-1.2.2.ebuild 2046
+MD5 ab2bed13480734fe74336f1c8a30e316 files/spawn-fcgi.confd 1080
+MD5 c3c5907995893b889971fe38d4e30c0a files/spawn-fcgi.initd 1388
 MD5 32569e20d3ecdd51ac0534cc85d52354 files/lighttpd-1.2.2-php.diff 1184
+MD5 9e987b4543fabfb0eb96ded95a113088 files/lighttpd-1.3.10.initd 655
 MD5 dcfa5883c3433b49204b6b4de25a9a3c files/lighttpd-1.2.2.initd 800
+MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10 67
+MD5 91e4a4594c8cc136d7acf8f161e3840e files/lighttpd-1.3.10-php.diff 1356
 MD5 0b20460d5762811ccb8312c2666107e6 files/lighttpd.initd 635
 MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8 66
 MD5 0d9277bbfb98755640329afa81c8bee2 files/digest-lighttpd-1.2.2 66
 MD5 0cf0d92da4da90a9fc4f1b9a58b4eb1e files/digest-lighttpd-1.3.5 66
 MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301
 MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB3kCiI1lqEGTUzyQRAu/CAJ9O9ECyhyX8HXJQ9m2uL6mbD6s/dgCgzlM1
-Tg4+OFFoah9n2uDG6mxgDFw=
-=2WKw
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.10 b/www-servers/lighttpd/files/digest-lighttpd-1.3.10
new file mode 100644
index 000000000000..2084989a4e2c
--- /dev/null
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.10
@@ -0,0 +1 @@
+MD5 28623eff50653a9b104ddb20fe65aaf1 lighttpd-1.3.10.tar.gz 667324
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff
new file mode 100644
index 000000000000..f2ec6c0ecefc
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff
@@ -0,0 +1,47 @@
+diff -urN lighttpd-1.3.10.orig/doc/lighttpd.1 lighttpd-1.3.10/doc/lighttpd.1
+--- lighttpd-1.3.10.orig/doc/lighttpd.1	2005-02-06 23:58:57.661234800 -0500
++++ lighttpd-1.3.10/doc/lighttpd.1	2005-02-06 23:59:30.758203296 -0500
+@@ -5,7 +5,7 @@
+ lighttpd -D -f <configfile>
+ .SH DESCRIPTION
+ .SH FILES
+-/etc/lighttpd/lighttpd.conf
++/etc/lighttpd.conf
+ .SH CONFORMING TO
+ HTTP/1.0
+ HTTP/1.0
+diff -urN lighttpd-1.3.10.orig/doc/lighttpd.conf lighttpd-1.3.10/doc/lighttpd.conf
+--- lighttpd-1.3.10.orig/doc/lighttpd.conf	2005-02-06 23:58:57.661234800 -0500
++++ lighttpd-1.3.10/doc/lighttpd.conf	2005-02-07 00:00:50.500080688 -0500
+@@ -19,7 +19,7 @@
+ #				"mod_auth", 
+ #                               "mod_status", 
+ #				"mod_setenv",
+-#				"mod_fastcgi",
++				"mod_fastcgi",
+ #				"mod_proxy",
+ #				"mod_simple_vhost",
+ #				"mod_evhost",
+@@ -186,14 +186,14 @@
+ 
+ #### fastcgi module
+ ## read fastcgi.txt for more info
+-#fastcgi.server              = ( ".php" =>
+-#				( "localhost" => 
+-#				  ( 
+-#				    "socket" => "/tmp/php-fastcgi.socket",
+-#				    "bin-path" => "/usr/local/bin/php"
+-#				  )
+-#				)
+-#			      )
++fastcgi.server              = ( ".php" =>
++				( "localhost" => 
++				  ( 
++				    "host" => "127.0.0.1",
++				    "port" => 1026
++				  )
++				)
++			      )
+ 
+ #### CGI module
+ #cgi.assign                  = ( ".pl"  => "/usr/bin/perl",
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10.initd b/www-servers/lighttpd/files/lighttpd-1.3.10.initd
new file mode 100644
index 000000000000..1f946fca2cde
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.3.10.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd-1.3.10.initd,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $
+
+PID_FILE="/var/run/lighttpd.pid"
+LIGHTTPD_BIN="/usr/sbin/lighttpd"
+LIGHTTPD_CONF="/etc/lighttpd.conf"
+
+depend() {
+	need net
+	use mysql logger spawn-fcgi
+	after sshd
+}
+			
+start() {
+	ebegin "Starting lighttpd"
+	start-stop-daemon --start --quiet --exec ${LIGHTTPD_BIN} -- \
+		-f ${LIGHTTPD_CONF}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping lighttpd"
+	start-stop-daemon --stop --quiet --exec ${LIGHTTPD_BIN}
+	eend $?
+}
diff --git a/www-servers/lighttpd/files/spawn-fcgi.confd b/www-servers/lighttpd/files/spawn-fcgi.confd
new file mode 100644
index 000000000000..2a88806ae0d4
--- /dev/null
+++ b/www-servers/lighttpd/files/spawn-fcgi.confd
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/spawn-fcgi.confd,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $
+
+# Configuration file for the FCGI-Part of /etc/init.d/lighttpd
+
+## Set this to "yes" to enable SPAWNFCGI
+ENABLE_SPAWNFCGI="yes"
+
+## ABSOLUTE path to the spawn-fcgi binary
+SPAWNFCGI="/usr/bin/spawn-fcgi"
+
+## ABSOLUTE path to the PHP binary
+FCGIPROGRAM="/usr/bin/php-cgi"
+
+## bind to tcp-port on localhost
+FCGIPORT="1026"
+
+## number of PHP childs to spawn
+PHP_FCGI_CHILDREN=5
+
+## number of request server by a single php-process until is will be restarted
+PHP_FCGI_MAX_REQUESTS=1000
+
+## IP adresses where PHP should access server connections from
+FCGI_WEB_SERVER_ADDRS="127.0.0.1"
+
+# allowed environment variables sperated by spaces
+ALLOWED_ENV="PATH USER"
+# do NOT change line below
+ALLOWED_ENV="$ALLOWED_ENV PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS"
+
+## if this script is run as root switch to the following user
+USERID=lighttpd
+GROUPID=lighttpd
diff --git a/www-servers/lighttpd/files/spawn-fcgi.initd b/www-servers/lighttpd/files/spawn-fcgi.initd
new file mode 100644
index 000000000000..2f93285ddb6b
--- /dev/null
+++ b/www-servers/lighttpd/files/spawn-fcgi.initd
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/spawn-fcgi.initd,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $
+
+SPAWNFCGI_PID="/var/run/spawn-fcgi.pid"
+
+depend() {
+        need net
+}
+
+start() {
+        local my_end
+
+        ebegin "Starting spawn-fcgi"
+        export PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS
+
+        EX="${SPAWNFCGI} -p ${FCGIPORT} -f ${FCGIPROGRAM} -u ${USERID} \
+                -g ${GROUPID} -C ${PHP_FCGI_CHILDREN}"
+
+        # copy the allowed environment variables
+        unset E
+        for i in ${ALLOWED_ENV}; do
+                E="${E} ${i}=${!i}"
+        done
+
+        # clean environment and set up a new one
+        env - ${E} ${EX} 2>${SPAWNFCGI_PID}
+        my_end=$?
+        if [ "$my_end" != "0" ]; then
+                [ -f ${SPAWNFCGI_PID} ] && rm -f ${SPAWNFCGI_PID}
+                eend $my_end
+        fi
+
+        #extract parent-process-id and write it back to the file
+        FCGI_PPID=`cat ${SPAWNFCGI_PID} | cut -d':' -f4`
+        echo ${FCGI_PPID} > ${SPAWNFCGI_PID}
+        eend 0
+}
+
+stop() {
+        ebegin "Stopping spawn-fcgi"
+        kill `cat ${SPAWNFCGI_PID}`
+		[[ $? -ne 0 ]] && eend $?
+        if [ -w ${SPAWNFCGI_PID} ]; then
+                rm ${SPAWNFCGI_PID};
+        fi
+        eend 0
+}
diff --git a/www-servers/lighttpd/lighttpd-1.3.10.ebuild b/www-servers/lighttpd/lighttpd-1.3.10.ebuild
new file mode 100644
index 000000000000..02f1ce50e22c
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.3.10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10.ebuild,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $
+
+inherit eutils confutils
+
+DESCRIPTION="lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE="mysql ssl php modchat modcache modlocalizer xattr ldap"
+RDEPEND="virtual/libc
+		>=dev-libs/libpcre-3.1
+		>=sys-libs/zlib-1.1
+		>=dev-libs/localizer-0.3.3
+		mysql? ( >=dev-db/mysql-4.0.0 )
+		ssl? ( >=dev-libs/openssl-0.9.7 )
+		php? (
+			>=dev-php/php-cgi-4.3.0
+			!net-www/spawn-fcgi
+		)"
+
+LIGHTTPD_DIR="/var/www/localhost/htdocs/"
+LOG_DIR="/var/log/lighttpd/"
+
+pkg_setup() {
+	enewgroup lighttpd
+	enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.1.8-gentoo.diff
+	use php && epatch ${FILESDIR}/${P}-php.diff
+}
+
+src_compile() {
+	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
+
+	#                       extension		USE flag		shared?
+	# -----------------------------------------------------------------
+	enable_extension_enable mod-chat 		modchat			0
+	enable_extension_enable mod-cache		modcache		0
+	enable_extension_enable mod-localizer		modlocalizer		0
+	enable_extension_enable attr			xattr			0
+	enable_extension_enable ldap			ldap			0
+	enable_extension_enable openssl			ssl			0
+	enable_extension_enable mysql			mysql			0
+	# -----------------------------------------------------------------
+	#                       extension		USE flag		shared?
+
+	econf ${my_conf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc
+	doins doc/lighttpd.conf || die "doins failed"
+
+	newinitd ${FILESDIR}/${P}.initd ${PN}
+
+	if use php ; then
+		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi
+		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi
+	fi
+
+	keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed"
+	fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed"
+
+	dodoc README COPYING
+	cd doc
+	dodoc *.txt *.sh *.ps.gz
+	newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed"
+}
+
+pkg_postinst () {
+	echo
+	einfo "lighttpd.conf has moved from /etc/conf.d to /etc"
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo
+		einfo "spawn-fcgi is now included with lighttpd"
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+	echo
+}