www-servers/spawn-fcgi: Move from /var/run to /run

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 189 insertions, 10 deletions

diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog
index 69a2a531bb99..349368a75de6 100644
--- a/www-servers/spawn-fcgi/ChangeLog
+++ b/www-servers/spawn-fcgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/spawn-fcgi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.41 2013/07/22 23:41:02 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.42 2014/05/12 06:57:31 jlec Exp $
+
+*spawn-fcgi-1.6.3-r2 (12 May 2014)
+
+  12 May 2014; Justin Lecher <jlec@gentoo.org> +spawn-fcgi-1.6.3-r2.ebuild,
+  +files/spawn-fcgi.initd-r2, metadata.xml:
+  Move from /var/run to /run
 
   22 Jul 2013; Manuel Rüger <mrueg@gentoo.org> metadata.xml:
   Taking up maintainership
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index 2598d0a95390..763ad9b2b619 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,6 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX spawn-fcgi.confd 2359 SHA256 562d5f9da68a3f8be53fe4432e8bcde8e2b3297e25b848c46485dfba2b8168ca SHA512 8ca129440dc930122ae0673fb4336f7338bc941c4c2b0e4086a72e56181a25136db7c18b523f5a6a99a393bde53b4f01fc528067186cdc61c484c0cad641366a WHIRLPOOL 928525a66bc66132ce956b6b441a1fcccbe65228c96e0b6cc2ce38f4bad80653457393fb075f4871c412b49b22e725a6faa322747df5a83d09e7cc850f9f26b3
 AUX spawn-fcgi.initd-r1 3211 SHA256 29ef18e5170ec8a738260326e0948d2a72cb9c467affcf1a4f9cc298feae6134 SHA512 4a5596dc26fbbde2738ef838fe1cb5eb2b764a07059e4d99040ef508c7107a0a0b38756d4249c64044355d266c796570b9b829d0b6b49c587d322c51cf27888f WHIRLPOOL 8131086dfb6f7c3ebaa9725f04bf2a62821efcbf087f4ebfd6624f8e1f0e593764bb3cff0d0441d746d798fce95f2be462bffb506b9f5194db15f68fa2e7cff3
+AUX spawn-fcgi.initd-r2 3202 SHA256 d99cba1f93bc8c7b54fd763281260f0765b63b6d2fc980bed1246c9397b13d2e SHA512 5030efb495f19e833d4a53e99e860fac51ebfc43f3b59916bab1bee103e188dd0cf1a383fb3282101eb97279ead8054fa7ffb28ac2eaa34e94780e4125a87e06 WHIRLPOOL b16b819c57dfdc19010b664dd094c7fc2f396c2c15a9667fbb30a387841415471cdd1659129158f84cebe83c6292b6e38d71ea125e1e1d362fefe2a27ba83cf7
 DIST spawn-fcgi-1.6.3.tar.bz2 77607 SHA256 e6721dc0fa59bb00e05f160406815d53c95e81ac28f7e52fbd36497584f846cd SHA512 136a198cbcda0d3ae4e445eac2ccdcc5483801514ce77542c630d615a7a19a68864b9d7d79733adb16347ba64c833afbf2a18df82937107a6bc8467f630b03b4 WHIRLPOOL c424426e39f5151de29491b6e0900a546fcf7fb31a7b226c7246a79a5af62357d7dfddc9179aceb02d993fa09529e973794f70ece961336bb760763663080176
 EBUILD spawn-fcgi-1.6.3-r1.ebuild 905 SHA256 a3717916f5f5e8ee3a7448e5bf26e3796607be4a232b317fe8b49f9534b0f04a SHA512 1964188ba59529095710c5fa1c216ecaf3bdead44a89ec54e57f0bb355499bce295ba78eae59a2a5ef5793907417005a620794ef9f292b3802260d2f26217856 WHIRLPOOL 165f1093ecc42675e313a44f159178088a208c76b86721b14277e5c9ebb62ef94970e068e654289432511fa21673a34d959807fa60f073e71372a0af8e753d31
-MISC ChangeLog 5574 SHA256 1c165a0bde75389b2bcf97a173fe587617295b2a4e6a6ebf5a2cdbe2469b4a1e SHA512 264ff52c06e13c171e2e448b19f4f7342f4af6621f663d375ab5d52f10e0844f1d844ca84af77e3a99202a4dfd45f1fdaa201dc1e4e68fe0ad8da1248bd16226 WHIRLPOOL 7ff2473d3fd00b70bd9a0eeec1005c601228686542ebbf0a1f1c71efe351fae8d4c964a949cbe6ae73233bb85de9fbd8452058236adfc265c1e9af137a9f9e3b
-MISC metadata.xml 520 SHA256 8a0f75614d955a471f80dba2da3c95ad2544fc2a950dce4afad2e6ec318e0e3f SHA512 eaa9c9e57c4ed3f0bf24a5c20eadf98a8e33b1096a2a938df77df0260de5b2733c4caecaea33530d3e32805286c8fe5a2bb18cd2249f2a968d89cd6c9bde3586 WHIRLPOOL cfa64d68f7afd4807c704acd0bc2b65ac8f032db7f7a98f6e5241e7cc9fbcd190e867f01082c393464e898c55bc673a0a2c3d4dacc01e9ae3946ab5bb188bca0
+EBUILD spawn-fcgi-1.6.3-r2.ebuild 878 SHA256 3c62bf21fe2578dbab9c947c3c44d589868c4994aeb2d4bce0f99a20cdf6a296 SHA512 e2f626491840c75711fc0c753e2866b5662a3ffc72c1c040460823b4a77b24a3944b4818fefca31f3ec427eeab1d663ed90c4ffc4c915f6b0b95d7f5f123739a WHIRLPOOL cc518eb729da782f9f462a4f7f34a8d3e6b57b11d90b516dad428babe502d1af7b0c1c4d48d33446c7a437f5c6b600da507c5fb495e457173c68bb6a12a6fd02
+MISC ChangeLog 5759 SHA256 85a1379a20665c90258f7671bbd1727d55281684412cdacac8f58c71971b085a SHA512 08f0dc29bd678b48eb8664701298da1c0cab2c0644eee79d2b68da8ce7690024f265689423b24c34721d34c23c0b8ad969580253acdf66a5df718649ada0088f WHIRLPOOL 5a3e99b23bdf166b3753bb4b7af081a92b629ed67550a10f835816e49f86a7647b137af784a0d2e24849d7e1f34073aa9f4792f6beb9e6faa22fb7dedf2b9883
+MISC metadata.xml 526 SHA256 13857ac096092428b4623aad1e973304351217d270c8ffc7cc9920fef5f688a1 SHA512 5281dbb07db4e0bf3bb7570f8433afa1cdc3f4a213478920021f75c7305471b4f0b39e19f449a9460efbfdb7c4c193546d696edd30f0f1c1fd1950146e9f38a3 WHIRLPOOL 6702961430440580b7486d4398e4a349b3e0517ccd86f08d8376c32a09de4cd4e31c5380829f388bb742ef1591634fdb040595ca8df90dd83f4cdd9f15fd00f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCgBmBQJTcHDaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirjG0P/AozRGEUU+/fvkhOiyF0XLlp
+iUPaSPvMVP05nt0FDZK/61MdmXMyJfCDBf3l1i2jrq3/IrQkU/w70jRN3/G61smo
+4JOduG6Ge5nc6uPUTmArL59xhxXI1g92n/QWuj8HYHYfYcYzzsMWwwE1v5RCRkes
+yXSIoaluSPT4Bfiayzr7SSNoxpgRIFhZ5rKgXvUCtDRdzVgQ8IjbtUbboSH3KNwV
+PiemFHy00teu1NXuVFUyvys2eR0CdYKRN+V1x9eUq4iRC+kDCQ/mfbIRF/zHyGkc
+KFoo0Z6/4ko3cvnzVZFmWxT0pL1aoPtgq4aMyiyNdLyGW1DgmoXS/qxdwraASqEi
+2hUxCoQo7/yaE5ASWeA9gIaSxzjXNm1Mhn4HvhCY1S+Rzi4GKfp/O9VFynrbSp0s
+mP198nhouHLVZXRR6KQDL3BRenwEoxhathUwOLyZRCCh/abrQESyyVTHmNDWy6QS
+adnY9DrB30aLz07CYBVoLCwJeTla340ofVrV8USscurRdHbTVoeK+iGXqe7RH7bx
+aXxbozudxL8ax4Waqq/+1Pl0opobID3Qt5msF4QOPa082Q0N9mBPsd1p4aZUToyS
+FyC2DZ4scTWnUWtsgfHqmzpldZbqUxB51ZjwBQagUfE7xDOdUwWG5qZJHq5p2/1x
+3oqSonFICQC3/e86TiM9
+=VOaC
+-----END PGP SIGNATURE-----
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
new file mode 100644
index 000000000000..ca54cd2aae76
--- /dev/null
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
@@ -0,0 +1,117 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2,v 1.1 2014/05/12 06:57:31 jlec Exp $
+
+PROGNAME=${SVCNAME#*.}
+SPAWNFCGI=/usr/bin/spawn-fcgi
+PIDPATH=/run/spawn-fcgi
+PIDFILE=${PIDPATH}/${PROGNAME}
+
+depend() {
+	need net
+}
+
+start() {
+	local X E OPTIONS i RETVAL FCGI_PROGRAM_EXEC
+	FCGI_PROGRAM_EXEC=$(echo ${FCGI_PROGRAM} | awk "{print \$1}")
+
+	if [ "${SVCNAME}" = "spawn-fcgi" ]; then
+		eerror "You are not supposed to run this script directly. Create a symlink"
+		eerror "for the FastCGI application you want to run as well as a copy of the"
+		eerror "configuration file and modify it appropriately like so..."
+		eerror
+		eerror "  ln -s spawn-fcgi /etc/init.d/spawn-fcgi.trac"
+		eerror "  cp /etc/conf.d/spawn-fcgi /etc/conf.d/spawn-fcgi.trac"
+		eerror "  `basename "${EDITOR}"` /etc/conf.d/spawn-fcgi.trac"
+		eerror
+		return 1
+	fi
+
+	if [ ! -z "${FCGI_SOCKET}" ] && [ ! -z "${FCGI_PORT}" ]; then
+		eerror "Only one of the two may be defined:"
+		eerror "  FCGI_SOCKET=${FCGI_SOCKET}"
+		eerror "  FCGI_PORT=${FCGI_PORT}"
+		return 1
+	fi
+
+	if [ -z "${FCGI_PROGRAM}" ]; then
+		eerror "You need to specify which \$FCGI_PROGRAM"
+		eerror "you want to start."
+		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
+		return 1
+	fi
+
+	if [ ! -x "${FCGI_PROGRAM_EXEC}" ]; then
+		eerror "The file specified as \$FCGI_PROGRAM"
+		eerror "does not exist or is not executable."
+		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
+		return 1
+	fi
+
+	if [ -z "${FCGI_ADDRESS}" ]; then
+		FCGI_ADDRESS=127.0.0.1
+	fi
+
+	if [ -z "${FCGI_CHILDREN}" ]; then
+		FCGI_CHILDREN=1
+	fi
+
+	if [ -n "${FCGI_CHROOT}" ]; then
+		OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
+	fi
+
+	if [ -n "${FCGI_DIR}" ]; then
+		OPTIONS="${OPTIONS} -d ${FCGI_DIR}"
+	fi
+
+	if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then
+		OPTIONS="${OPTIONS} -u ${FCGI_USER}"
+	fi
+
+	if [ -n "${FCGI_GROUP}" ] && [ "${FCGI_GROUP}" != "root" ]; then
+		OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
+	fi
+
+	if [ -n "${FCGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${FCGI_EXTRA_OPTIONS}"
+	fi
+
+	unset E
+	for i in ${ALLOWED_ENV}; do
+		local j
+		eval j=$(echo \$"$i")
+		[ -n "${j}" ] && E="${E} ${i}=${j}"
+	done
+
+	ebegin "Starting FastCGI application ${PROGNAME}"
+	checkpath -q -d -m 700 /run/spawn-fcgi
+	X=0
+	while [ $X -lt ${FCGI_CHILDREN} ]; do
+		X=$(($X+1))
+		local P SOCKET_OPTION INET_OPTION
+		P=${PIDFILE}-${X}.pid
+		[ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
+		[ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
+
+		env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
+			--name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
+			-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
+		RETVAL=$?
+
+		# Stop on error. Don't want to spawn a mess!
+		[ "${RETVAL}" != "0" ] && break
+	done
+	eend ${RETVAL}
+}
+
+stop() {
+	local X RETVAL=0
+
+	ebegin "Stopping FastCGI application ${PROGNAME}"
+	for X in ${PIDFILE}-[0-9]*.pid ; do
+		start-stop-daemon --stop --pidfile ${X} || \
+			{ RETVAL=$? && break ; }
+	done
+	eend ${RETVAL}
+}
diff --git a/www-servers/spawn-fcgi/metadata.xml b/www-servers/spawn-fcgi/metadata.xml
index 39c9309eaf36..e2ecfb081079 100644
--- a/www-servers/spawn-fcgi/metadata.xml
+++ b/www-servers/spawn-fcgi/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
-	<longdescription lang="en">spawn-fcgi is used to spawn FastCGI applications
+  <maintainer>
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <longdescription lang="en">spawn-fcgi is used to spawn FastCGI applications
 
   Features
   --------
@@ -15,4 +15,3 @@
   - supports daemontools supervise
 	</longdescription>
 </pkgmetadata>
-
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
new file mode 100644
index 000000000000..14f5313ae035
--- /dev/null
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild,v 1.1 2014/05/12 06:57:31 jlec Exp $
+
+EAPI=5
+
+DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
+HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND=""
+RDEPEND="
+	!<=www-servers/lighttpd-1.4.20
+	!<=www-servers/cherokee-0.98.1"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
+	newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
+
+	docinto examples
+	dodoc doc/run-generic doc/run-php doc/run-rails
+}