Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/xsp/, dev-dotnet/xsp/files/2.2/, dev-dotnet/xsp/files/
Date: Sat, 27 Jan 2018 18:35:20
Message-Id: 1517078087.844eae050e00a855dfc5350ca6645199cbdfc734.zlogene@gentoo
1 commit: 844eae050e00a855dfc5350ca6645199cbdfc734
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 27 18:34:47 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 27 18:34:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844eae05
7
8 dev-dotnet/xsp: remove last rited package
9
10 dev-dotnet/xsp/Manifest | 1 -
11 dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd | 82 -----------------------
12 dev-dotnet/xsp/files/2.2/mod-mono-server.confd | 33 ---------
13 dev-dotnet/xsp/files/2.2/mod-mono-server.initd | 80 ----------------------
14 dev-dotnet/xsp/files/2.2/xsp.confd | 11 ---
15 dev-dotnet/xsp/files/2.2/xsp.initd | 37 ----------
16 dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch | 35 ----------
17 dev-dotnet/xsp/metadata.xml | 12 ----
18 dev-dotnet/xsp/xsp-2.10.2-r2.ebuild | 50 --------------
19 9 files changed, 341 deletions(-)
20
21 diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest
22 deleted file mode 100644
23 index cdeb9cd0543..00000000000
24 --- a/dev-dotnet/xsp/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST xsp-2.10.2.tar.bz2 284801 BLAKE2B 707d7a3c97626ef78cd246cb00e834b71fbe92fe0c2f828476b3841639bb8fded44455eda88682754cd80a3c274f79c77008823030b0bff4f8ef4f908e8be511 SHA512 9b49e3a712e062b9a272e72609eda3cb8139127bc9780d6374a3567f51f15f38233f92252c2e4c22778b1841de66855dfe6a8cf81c97c6ebbf84f71dda0d43dd
28
29 diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd b/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
30 deleted file mode 100644
31 index 22d7ba9af42..00000000000
32 --- a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
33 +++ /dev/null
34 @@ -1,82 +0,0 @@
35 -#!/sbin/openrc-run
36 -# Copyright 1999-2015 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -depend() {
40 - use net
41 - after dotnet
42 -}
43 -
44 -start() {
45 - [ -z "$MonoServerRootDir" ] && \
46 - MonoServerRootDir="/usr/lib/xsp/test"
47 - [ -z "$MonoApplications" ] && \
48 - MonoApplications="/mono:/usr/lib/xsp/test,/:."
49 - [ -z "$UnixSocketFileName" ] && \
50 - UnixSocketFileName="/tmp/mod_mono_server"
51 - [ -z "$MonoServerAddress" ] && \
52 - MonoServerAddress=127.0.0.1
53 - [ -z "$MonoServerPort" ] && \
54 - MonoServerPort=8080
55 - [ -z "$MonoServerVersion" ] && \
56 - MonoServerVersion=1
57 -
58 - MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
59 ---applications ${MonoApplications} --nonstop"
60 -
61 - [ -n "$MonoApplicationsConfigDir" ] && \
62 - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
63 ---appconfigdir ${MonoApplicationsConfigDir}"
64 -
65 - case "$MonoServerChannel" in
66 - "tcp" )
67 - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
68 ---address ${MonoServerAddress} --port ${MonoServerPort}"
69 - ;;
70 -
71 - "unix" )
72 - [ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
73 - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
74 ---filename ${UnixSocketFileName}"
75 - ;;
76 -
77 - * )
78 - eerror "Please set a valid value for MonoServerChannel"
79 - return 1
80 - ;;
81 - esac
82 -
83 - if [ ${MonoServerVersion} -eq 1 ]; then
84 - modmonoserverpath=1.0/mod-mono-server.exe
85 - elif [ ${MonoServerVersion} -eq 2 ]; then
86 - modmonoserverpath=2.0/mod-mono-server2.exe
87 - elif [ ${MonoServerVersion} -eq 4 ]; then
88 - modmonoserverpath=4.0/mod-mono-server4.exe
89 - else
90 - eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/mod-mono-server"
91 - return 1
92 - fi
93 -
94 - export MONO_SHARED_DIR=/tmp
95 -
96 - ebegin "Starting mod-mono-server"
97 -
98 - start-stop-daemon --quiet --start \
99 - --background \
100 - --make-pidfile \
101 - --pidfile /var/run/aspnet/mod-mono-server.pid \
102 - --user aspnet \
103 - --exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
104 - -- $MONO_SERVER_OPTS
105 -
106 - eend $?
107 -}
108 -
109 -stop() {
110 - ebegin "Stopping mod-mono-server"
111 -
112 - start-stop-daemon --quiet --stop \
113 - --pidfile /var/run/aspnet/mod-mono-server.pid
114 -
115 - eend $?
116 -}
117
118 diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd b/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
119 deleted file mode 100644
120 index 6c6836b9561..00000000000
121 --- a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd
122 +++ /dev/null
123 @@ -1,33 +0,0 @@
124 -# Config file for /etc/init.d/mod-mono-server
125 -
126 -# Configuration directives for mod-mono-server.exe. For more information on
127 -# these variables, see the man page for xsp(1).
128 -
129 -# This is the document root; trailing slash is not necessary
130 -#MonoServerRootDir="/usr/lib/xsp/test"
131 -
132 -# Directory to search for files with an `.webapp' extension.
133 -#MonoApplicationsConfigDir="/usr/lib/xsp/test"
134 -
135 -# Comma separated list of directories (in the form virtual:real) for all
136 -# applications managed by the server. For example:
137 -# /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2
138 -MonoApplications="/mono:/usr/lib/xsp/test"
139 -
140 -# The communication channel used between mod-mono-server and mod_mono.
141 -# unix - A unix socket
142 -# tcp - A TCP connection
143 -MonoServerChannel="unix"
144 -
145 -# When the comm. channel is "unix", the local filename used by the socket.
146 -UnixSocketFileName="/tmp/mod_mono_server"
147 -
148 -# When the comm. channel is "tcp", IP address for the server to listen on.
149 -#MonoServerAddress=127.0.0.1
150 -
151 -# When the comm. channel is "tcp", port for the server to listen on.
152 -#MonoServerPort=8080
153 -
154 -# If you want to host .NET 2.0 applications you have to set this to 2.
155 -# Otherwise, leave it unchaged
156 -MonoServerVersion=1
157
158 diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server.initd b/dev-dotnet/xsp/files/2.2/mod-mono-server.initd
159 deleted file mode 100644
160 index fb1c44935e0..00000000000
161 --- a/dev-dotnet/xsp/files/2.2/mod-mono-server.initd
162 +++ /dev/null
163 @@ -1,80 +0,0 @@
164 -#!/sbin/openrc-run
165 -# Copyright 1999-2015 Gentoo Foundation
166 -# Distributed under the terms of the GNU General Public License v2
167 -
168 -depend() {
169 - use net
170 - after dotnet
171 -}
172 -
173 -start() {
174 - [ -z "$MonoServerRootDir" ] && \
175 - MonoServerRootDir="/usr/lib/xsp/test"
176 - [ -z "$MonoApplications" ] && \
177 - MonoApplications="/mono:/usr/lib/xsp/test,/:."
178 - [ -z "$UnixSocketFileName" ] && \
179 - UnixSocketFileName="/tmp/mod_mono_server"
180 - [ -z "$MonoServerAddress" ] && \
181 - MonoServerAddress=127.0.0.1
182 - [ -z "$MonoServerPort" ] && \
183 - MonoServerPort=8080
184 - [ -z "$MonoServerVersion" ] && \
185 - MonoServerVersion=1
186 -
187 - MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
188 ---applications ${MonoApplications} --nonstop"
189 -
190 - [ -n "$MonoApplicationsConfigDir" ] && \
191 - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
192 ---appconfigdir ${MonoApplicationsConfigDir}"
193 -
194 - case "$MonoServerChannel" in
195 - "tcp" )
196 - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
197 ---address ${MonoServerAddress} --port ${MonoServerPort}"
198 - ;;
199 -
200 - "unix" )
201 - [ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
202 - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
203 ---filename ${UnixSocketFileName}"
204 - ;;
205 -
206 - * )
207 - eerror "Please set a valid value for MonoServerChannel"
208 - return 1
209 - ;;
210 - esac
211 -
212 - if [ ${MonoServerVersion} -eq 1 ]; then
213 - modmonoserverpath=1.0/mod-mono-server.exe
214 - elif [ ${MonoServerVersion} -eq 2 ]; then
215 - modmonoserverpath=2.0/mod-mono-server2.exe
216 - else
217 - eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp"
218 - return 1
219 - fi
220 -
221 - export MONO_SHARED_DIR=/tmp
222 -
223 - ebegin "Starting mod-mono-server"
224 -
225 - start-stop-daemon --quiet --start \
226 - --background \
227 - --make-pidfile \
228 - --pidfile /var/run/aspnet/mod-mono-server.pid \
229 - --chuid aspnet \
230 - --exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \
231 - -- $MONO_SERVER_OPTS
232 -
233 - eend $?
234 -}
235 -
236 -stop() {
237 - ebegin "Stopping mod-mono-server"
238 -
239 - start-stop-daemon -o --quiet --stop \
240 - --pidfile /var/run/aspnet/mod-mono-server.pid
241 -
242 - eend $?
243 -}
244
245 diff --git a/dev-dotnet/xsp/files/2.2/xsp.confd b/dev-dotnet/xsp/files/2.2/xsp.confd
246 deleted file mode 100644
247 index e4f79aafa5e..00000000000
248 --- a/dev-dotnet/xsp/files/2.2/xsp.confd
249 +++ /dev/null
250 @@ -1,11 +0,0 @@
251 -# Config file for /etc/init.d/xsp
252 -
253 -# This is the document root; trailing slash is not necessary
254 -MonoServerRoot=/usr/lib/xsp/test
255 -
256 -# Port for the server to run on
257 -MonoServerPort=8000
258 -
259 -# If you want to host .NET 2.0 applications you have to set this to 2.
260 -# Otherwise, leave it unchanged
261 -MonoServerVersion=1
262
263 diff --git a/dev-dotnet/xsp/files/2.2/xsp.initd b/dev-dotnet/xsp/files/2.2/xsp.initd
264 deleted file mode 100644
265 index 6ac7bbf87c0..00000000000
266 --- a/dev-dotnet/xsp/files/2.2/xsp.initd
267 +++ /dev/null
268 @@ -1,37 +0,0 @@
269 -#!/sbin/openrc-run
270 -# Copyright 1999-2015 Gentoo Foundation
271 -# Distributed under the terms of the GNU General Public License v2
272 -
273 -depend() {
274 - need net
275 - after dotnet
276 -}
277 -
278 -start() {
279 - ebegin "Starting xsp"
280 -
281 - if [ ${MonoServerVersion} -eq 1 ]; then
282 - xsppath=1.0/xsp.exe
283 - elif [ ${MonoServerVersion} -eq 2 ]; then
284 - xsppath=2.0/xsp2.exe
285 - else
286 - eerror "MonoServerVersion was not properly set. Check your config file"
287 - return 1
288 - fi
289 -
290 - start-stop-daemon --quiet --start \
291 - --background \
292 - --make-pidfile \
293 - --pidfile /var/run/aspnet/xsp.pid \
294 - --chuid aspnet \
295 - --exec /usr/bin/mono /usr/lib/mono/${xsppath} -- --root ${MonoServerRoot} --port ${MonoServerPort} --nonstop
296 - eend $?
297 -}
298 -
299 -stop() {
300 - ebegin "Stopping xsp"
301 - start-stop-daemon -o --quiet --stop \
302 - --pidfile /var/run/aspnet/xsp.pid
303 - eend $?
304 -}
305 -
306
307 diff --git a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch b/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
308 deleted file mode 100644
309 index ff702d3faa5..00000000000
310 --- a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch
311 +++ /dev/null
312 @@ -1,35 +0,0 @@
313 -From d2c4a279942a4575b80618719646d0767c077e96 Mon Sep 17 00:00:00 2001
314 -From: Guillaume Pitel <guillaume.pitel@××××××.com>
315 -Date: Tue, 6 Mar 2012 17:20:24 +0100
316 -Subject: [PATCH] Added try/catch around EndRequest Record sending (Bug 3765
317 - https://bugzilla.xamarin.com/show_bug.cgi?id=3765)
318 -
319 ----
320 - src/Mono.WebServer.FastCgi/Connection.cs | 11 +++++++----
321 - 1 file changed, 7 insertions(+), 4 deletions(-)
322 -
323 -diff --git a/src/Mono.WebServer.FastCgi/Connection.cs b/src/Mono.WebServer.FastCgi/Connection.cs
324 -index 6c70824..0e9ef64 100644
325 ---- a/src/Mono.WebServer.FastCgi/Connection.cs
326 -+++ b/src/Mono.WebServer.FastCgi/Connection.cs
327 -@@ -319,10 +319,13 @@ public void Run ()
328 - {
329 - EndRequestBody body = new EndRequestBody (appStatus,
330 - protocolStatus);
331 --
332 -- if (IsConnected)
333 -- new Record (1, RecordType.EndRequest, requestID,
334 -- body.GetData ()).Send (socket);
335 -+ try {
336 -+ if (IsConnected)
337 -+ new Record (1, RecordType.EndRequest, requestID,
338 -+ body.GetData ()).Send (socket);
339 -+ } catch (System.Net.Sockets.SocketException) {
340 -+ }
341 -+
342 -
343 - int index = GetRequestIndex (requestID);
344 -
345 ---
346 -1.7.10
347 -
348
349 diff --git a/dev-dotnet/xsp/metadata.xml b/dev-dotnet/xsp/metadata.xml
350 deleted file mode 100644
351 index 8adc9cf58b1..00000000000
352 --- a/dev-dotnet/xsp/metadata.xml
353 +++ /dev/null
354 @@ -1,12 +0,0 @@
355 -<?xml version="1.0" encoding="UTF-8"?>
356 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
357 -<pkgmetadata>
358 - <maintainer type="project">
359 - <email>dotnet@g.o</email>
360 - <name>Gentoo Dotnet Project</name>
361 - </maintainer>
362 - <longdescription lang="en">
363 - XSP is a standalone web server written in C# that can be used to run
364 - your ASP.NET applications.
365 - </longdescription>
366 -</pkgmetadata>
367
368 diff --git a/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
369 deleted file mode 100644
370 index c945709f467..00000000000
371 --- a/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild
372 +++ /dev/null
373 @@ -1,50 +0,0 @@
374 -# Copyright 1999-2012 Gentoo Foundation
375 -# Distributed under the terms of the GNU General Public License v2
376 -
377 -EAPI="4"
378 -inherit eutils go-mono mono user
379 -
380 -PATCHDIR="${FILESDIR}/2.2/"
381 -
382 -DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
383 -HOMEPAGE="http://www.mono-project.com/ASP.NET"
384 -
385 -LICENSE="MIT"
386 -SLOT="0"
387 -KEYWORDS="amd64 ppc x86"
388 -
389 -IUSE=""
390 -
391 -RDEPEND="dev-db/sqlite:3"
392 -DEPEND="${RDEPEND}"
393 -
394 -MAKEOPTS="${MAKEOPTS} -j1"
395 -
396 -src_prepare() {
397 - # Added try/catch around EndRequest Record sending, bug #432750
398 - epatch "${FILESDIR}/${PN}-2.10.2-endrequest.patch"
399 -}
400 -
401 -src_configure() {
402 - default
403 -}
404 -
405 -pkg_preinst() {
406 - enewgroup aspnet
407 - # Give aspnet home dir of /tmp since it must create ~/.wapi
408 - enewuser aspnet -1 -1 /tmp aspnet
409 -}
410 -
411 -src_install() {
412 - mv_command="cp -ar" go-mono_src_install
413 - newinitd "${PATCHDIR}"/xsp.initd xsp
414 - newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
415 - newconfd "${PATCHDIR}"/xsp.confd xsp
416 - newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
417 -
418 - keepdir /var/run/aspnet
419 -}
420 -
421 -pkg_postinst() {
422 - chown aspnet:aspnet /var/run/aspnet
423 -}