* [gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/, www-servers/spawn-fcgi/
@ 2018-10-14 10:18 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-10-14 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 0e087bd09a7b0d4737e26c876720a596ed002d28
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 08:43:27 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 10:18:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e087bd0
www-servers/spawn-fcgi: Several fixes to init.d script
- Detect crashes (#567320 by Cédric Krier)
- Use proper variable names (#657362 by Jernej Simoncic)
Closes: https://bugs.gentoo.org/567320
Closes: https://bugs.gentoo.org/657362
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3 | 116 ++++++++++++++++++++++
www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild | 33 ++++++
2 files changed, 149 insertions(+)
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3
new file mode 100644
index 00000000000..ef680aad277
--- /dev/null
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3
@@ -0,0 +1,116 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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_CHDIR}" ]; then
+ OPTIONS="${OPTIONS} -d ${FCGI_CHDIR}"
+ 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} --env ${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))"
+
+ start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
+ ${E} -- ${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/spawn-fcgi-1.6.4-r1.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
new file mode 100644
index 00000000000..92e2c3777b5
--- /dev/null
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.xz"
+
+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-r3 spawn-fcgi
+
+ docinto examples
+ dodoc doc/run-generic doc/run-php doc/run-rails
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/, www-servers/spawn-fcgi/
@ 2018-10-14 10:18 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-10-14 10:18 UTC (permalink / raw
To: gentoo-commits
commit: e8aa87af5d9e6c0b533e42f0924c13ac0cd2d412
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 08:44:07 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 10:18:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8aa87af
www-servers/spawn-fcgi: Drop old
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 | 116 ----------------------
www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild | 32 ------
www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild | 32 ------
3 files changed, 180 deletions(-)
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
deleted file mode 100644
index e7941a125a5..00000000000
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/spawn-fcgi-1.6.3-r2.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
deleted file mode 100644
index a19ec429e42..00000000000
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
deleted file mode 100644
index 4068e674e39..00000000000
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.xz"
-
-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-14 10:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-14 10:18 [gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/, www-servers/spawn-fcgi/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2018-10-14 10:18 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox