main/lighttpd: spawn-fcgi was removed in 1.4.23

3 files changed, 1 insertions, 103 deletions

diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index e2f93f26d..423a4beb2 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=lighttpd
 pkgver=1.4.35
 _streamver=2.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 arch="all"
@@ -19,8 +19,6 @@ source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.ta
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
-	spawn-fcgi.confd
-	spawn-fcgi.initd
 	lighttpd.conf
 	mime-types.conf
 	mod_cgi.conf
@@ -100,12 +98,6 @@ package() {
 	install -D -m644 "$srcdir"/lighttpd.logrotate \
 		"$pkgdir"/etc/logrotate.d/lighttpd
 	
-	# spawn-fcgi
-	install -D -m755 "$srcdir"/spawn-fcgi.initd \
-		"$pkgdir"/etc/init.d/spawn-fcgi
-	install -D -m644 "$srcdir"/spawn-fcgi.confd \
-		"$pkgdir"/etc/conf.d/spawn-fcgi
-
 	# config files
 	for i in lighttpd.conf mime-types.conf mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf; do
 		install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i
@@ -145,8 +137,6 @@ ac37885c881a058194405232e7737a7a  lighttpd-1.4.18_mod_h264_streaming-2.2.0.tar.g
 aa1f130f66607615143b2b497c55b177  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
 ad091c9157134890499f26d170352c9f  lighttpd.logrotate
-1d925aed297ec4541fb230dd19e11bc1  spawn-fcgi.confd
-2f177ba0a35fd1c683edef3453c20bc8  spawn-fcgi.initd
 268bf5dd2c370ee5e119246775ac5640  lighttpd.conf
 fef397e7bcf1b741dea211a555e1803c  mime-types.conf
 9c1407e95f62ed22da66c4ef5f69c3b5  mod_cgi.conf
@@ -157,8 +147,6 @@ sha256sums="4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7  li
 14a769551522d7c05319db2efd6b03962638413e4a3d58a0ee5f3f4760d33f16  lighttpd.initd
 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87  lighttpd.confd
 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c  lighttpd.logrotate
-bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768  spawn-fcgi.confd
-69d626c51195813b0fa3694c1ccc587d05044bd7c865965f6d8d5365e403bf8b  spawn-fcgi.initd
 7dad7aca511f77cb0a4562e5b3280772b56570bd778d35493494a6118e5841e4  lighttpd.conf
 575231104d51fa1882c47021ab0aa00d615401059a6748d64453cb39aafba537  mime-types.conf
 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf  mod_cgi.conf
@@ -169,8 +157,6 @@ sha512sums="13f8562fb735964fe7ef1b127a15c43907f34be70b6bd2dd4ba61b59275d7c2a8d9a
 3d92f1f2fab79d12570e445d0bfba1c3b53898c6eeb323ec2171a289417c01039746f722c5e00bac36ea7fc433e3e7422b64f8952ad780b3d68e010ef3d8bf61  lighttpd.initd
 93a05dddab14ba6355a0345f1da2fe900c8b55fed8f98506295dc12d96c7cef803c4aca77f016b8acea7bbde485be1e09a57d31fdca6f91023fbeb4db9a90a8b  lighttpd.confd
 e1284fe9ab4b9a53c21b40a5ac3e77e66343e187321b8a2f7464db64747f3a99f7e17a9e7c0e298db84a24fa1286cfe344dbff182eddd9de5c0605f5397a6972  lighttpd.logrotate
-d2a45db667bc60837978496ac29c85b6beb814f66a4229b0d867a2ec86803705ad0384f58c704623fdb2b4265ad49aa3b85af2ab91f064e5428adf5ea08337c2  spawn-fcgi.confd
-c3a107e35eec7ac242a983cc8fe977addc51737e750baef6479b522e82b2eb23624284d687cfb1679bfcef5ef6c62a8275f0907400b28f8b4aa01624c06358d7  spawn-fcgi.initd
 c945a9d5d8ab8404344e4a8a0018bf940071ff8ca9b611e686d328a26b50f25cecc72d3a0a2ff9f7ee9e91339692e8794ea46b3d6f1529c8d977ea226872d041  lighttpd.conf
 e35a0eba52a335982823060cb58781778bf8a9d2f71fdbb1ec9a6b228699b7194ebdc7d98fa0b490beead1348794b6398d3de0450ba1444a4994aefe93465072  mime-types.conf
 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5  mod_cgi.conf
diff --git a/main/lighttpd/spawn-fcgi.confd b/main/lighttpd/spawn-fcgi.confd
deleted file mode 100644
index 2a88806ae..000000000
--- a/main/lighttpd/spawn-fcgi.confd
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/main/lighttpd/spawn-fcgi.initd b/main/lighttpd/spawn-fcgi.initd
deleted file mode 100644
index a4023a2c2..000000000
--- a/main/lighttpd/spawn-fcgi.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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.2 2007/04/02 12:46:08 uberlord Exp $
-
-SPAWNFCGI_PID="/var/run/spawn-fcgi.pid"
-
-depend() {
-        need net
-	after firewall
-}
-
-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
-                eval "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"
-        if ! kill `cat ${SPAWNFCGI_PID}` ; then
-	    eend $?
-	    return 1
-	fi
-        if [ -w ${SPAWNFCGI_PID} ]; then
-                rm ${SPAWNFCGI_PID}
-        fi
-        eend 0
-}
-