Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/, www-servers/spawn-fcgi/
Date: Sun, 14 Oct 2018 10:19:03
Message-Id: 1539512285.e8aa87af5d9e6c0b533e42f0924c13ac0cd2d412.pacho@gentoo
1 commit: e8aa87af5d9e6c0b533e42f0924c13ac0cd2d412
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 14 08:44:07 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 14 10:18:05 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8aa87af
7
8 www-servers/spawn-fcgi: Drop old
9
10 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 | 116 ----------------------
14 www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild | 32 ------
15 www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild | 32 ------
16 3 files changed, 180 deletions(-)
17
18 diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
19 deleted file mode 100644
20 index e7941a125a5..00000000000
21 --- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
22 +++ /dev/null
23 @@ -1,116 +0,0 @@
24 -#!/sbin/openrc-run
25 -# Copyright 1999-2014 Gentoo Foundation
26 -# Distributed under the terms of the GNU General Public License v2
27 -
28 -PROGNAME=${SVCNAME#*.}
29 -SPAWNFCGI=/usr/bin/spawn-fcgi
30 -PIDPATH=/run/spawn-fcgi
31 -PIDFILE=${PIDPATH}/${PROGNAME}
32 -
33 -depend() {
34 - need net
35 -}
36 -
37 -start() {
38 - local X E OPTIONS i RETVAL FCGI_PROGRAM_EXEC
39 - FCGI_PROGRAM_EXEC=$(echo ${FCGI_PROGRAM} | awk "{print \$1}")
40 -
41 - if [ "${SVCNAME}" = "spawn-fcgi" ]; then
42 - eerror "You are not supposed to run this script directly. Create a symlink"
43 - eerror "for the FastCGI application you want to run as well as a copy of the"
44 - eerror "configuration file and modify it appropriately like so..."
45 - eerror
46 - eerror " ln -s spawn-fcgi /etc/init.d/spawn-fcgi.trac"
47 - eerror " cp /etc/conf.d/spawn-fcgi /etc/conf.d/spawn-fcgi.trac"
48 - eerror " `basename "${EDITOR}"` /etc/conf.d/spawn-fcgi.trac"
49 - eerror
50 - return 1
51 - fi
52 -
53 - if [ ! -z "${FCGI_SOCKET}" ] && [ ! -z "${FCGI_PORT}" ]; then
54 - eerror "Only one of the two may be defined:"
55 - eerror " FCGI_SOCKET=${FCGI_SOCKET}"
56 - eerror " FCGI_PORT=${FCGI_PORT}"
57 - return 1
58 - fi
59 -
60 - if [ -z "${FCGI_PROGRAM}" ]; then
61 - eerror "You need to specify which \$FCGI_PROGRAM"
62 - eerror "you want to start."
63 - eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
64 - return 1
65 - fi
66 -
67 - if [ ! -x "${FCGI_PROGRAM_EXEC}" ]; then
68 - eerror "The file specified as \$FCGI_PROGRAM"
69 - eerror "does not exist or is not executable."
70 - eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
71 - return 1
72 - fi
73 -
74 - if [ -z "${FCGI_ADDRESS}" ]; then
75 - FCGI_ADDRESS=127.0.0.1
76 - fi
77 -
78 - if [ -z "${FCGI_CHILDREN}" ]; then
79 - FCGI_CHILDREN=1
80 - fi
81 -
82 - if [ -n "${FCGI_CHROOT}" ]; then
83 - OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
84 - fi
85 -
86 - if [ -n "${FCGI_DIR}" ]; then
87 - OPTIONS="${OPTIONS} -d ${FCGI_DIR}"
88 - fi
89 -
90 - if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then
91 - OPTIONS="${OPTIONS} -u ${FCGI_USER}"
92 - fi
93 -
94 - if [ -n "${FCGI_GROUP}" ] && [ "${FCGI_GROUP}" != "root" ]; then
95 - OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
96 - fi
97 -
98 - if [ -n "${FCGI_EXTRA_OPTIONS}" ]; then
99 - OPTIONS="${OPTIONS} ${FCGI_EXTRA_OPTIONS}"
100 - fi
101 -
102 - unset E
103 - for i in ${ALLOWED_ENV}; do
104 - local j
105 - eval j=$(echo \$"$i")
106 - [ -n "${j}" ] && E="${E} ${i}=${j}"
107 - done
108 -
109 - ebegin "Starting FastCGI application ${PROGNAME}"
110 - checkpath -q -d -m 700 /run/spawn-fcgi
111 - X=0
112 - while [ $X -lt ${FCGI_CHILDREN} ]; do
113 - X=$(($X+1))
114 - local P SOCKET_OPTION INET_OPTION
115 - P=${PIDFILE}-${X}.pid
116 - [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
117 - [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
118 -
119 - env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
120 - --name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
121 - -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
122 - RETVAL=$?
123 -
124 - # Stop on error. Don't want to spawn a mess!
125 - [ "${RETVAL}" != "0" ] && break
126 - done
127 - eend ${RETVAL}
128 -}
129 -
130 -stop() {
131 - local X RETVAL=0
132 -
133 - ebegin "Stopping FastCGI application ${PROGNAME}"
134 - for X in ${PIDFILE}-[0-9]*.pid ; do
135 - start-stop-daemon --stop --pidfile ${X} || \
136 - { RETVAL=$? && break ; }
137 - done
138 - eend ${RETVAL}
139 -}
140
141 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
142 deleted file mode 100644
143 index a19ec429e42..00000000000
144 --- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
145 +++ /dev/null
146 @@ -1,32 +0,0 @@
147 -# Copyright 1999-2014 Gentoo Foundation
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=5
151 -
152 -DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
153 -HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
154 -SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
155 -
156 -LICENSE="BSD GPL-2"
157 -SLOT="0"
158 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
159 -IUSE="ipv6"
160 -
161 -DEPEND=""
162 -RDEPEND="
163 - !<=www-servers/lighttpd-1.4.20
164 - !<=www-servers/cherokee-0.98.1"
165 -
166 -src_configure() {
167 - econf $(use_enable ipv6)
168 -}
169 -
170 -src_install() {
171 - default
172 -
173 - newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
174 - newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
175 -
176 - docinto examples
177 - dodoc doc/run-generic doc/run-php doc/run-rails
178 -}
179
180 diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
181 deleted file mode 100644
182 index 4068e674e39..00000000000
183 --- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
184 +++ /dev/null
185 @@ -1,32 +0,0 @@
186 -# Copyright 1999-2014 Gentoo Foundation
187 -# Distributed under the terms of the GNU General Public License v2
188 -
189 -EAPI=5
190 -
191 -DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
192 -HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
193 -SRC_URI="http://www.lighttpd.net/download/${P}.tar.xz"
194 -
195 -LICENSE="BSD GPL-2"
196 -SLOT="0"
197 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
198 -IUSE="ipv6"
199 -
200 -DEPEND=""
201 -RDEPEND="
202 - !<=www-servers/lighttpd-1.4.20
203 - !<=www-servers/cherokee-0.98.1"
204 -
205 -src_configure() {
206 - econf $(use_enable ipv6)
207 -}
208 -
209 -src_install() {
210 - default
211 -
212 - newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
213 - newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
214 -
215 - docinto examples
216 - dodoc doc/run-generic doc/run-php doc/run-rails
217 -}