From a71c80a07cc0b3436790058e091161ecf6de9450 Mon Sep 17 00:00:00 2001 From: Heather Cynede Date: Fri, 14 Aug 2015 12:34:40 +0400 Subject: [PATCH 1/5] dev-util/monodevelop mono-docbrowser is not ready, remove doc flag --- dev-util/monodevelop/monodevelop-5.9.5.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild b/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild index a22347892d4a6..2e06b6f477418 100644 --- a/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild +++ b/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild @@ -19,13 +19,13 @@ SRC_URI="https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+subversion +git doc +gnome qtcurve" +IUSE="+subversion +git +gnome qtcurve" +#TODO: doc use flag and mono-docbrowser RDEPEND=">=dev-lang/mono-3.2.8 >=dev-dotnet/nuget-2.8.3 gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) >=dev-dotnet/gtk-sharp-2.12.21:2 - doc? ( dev-util/mono-docbrowser ) >=dev-dotnet/xsp-2 dev-util/ctags sys-apps/dbus[X] From 602f5eb7286cc14768856f2e84e45cf1c0d2e30e Mon Sep 17 00:00:00 2001 From: Heather Cynede Date: Fri, 14 Aug 2015 12:47:26 +0400 Subject: [PATCH 2/5] mono doc problem is still not being fixed in futured versions --- profiles/base/package.use.mask | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 7dbd486d216ff..a192f8532f557 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,9 +6,9 @@ # New entries go on top. # Heather Cynede (13 Aug 2015) -# mono 3.12.1 currently fails with doc most likely because of xattr +# mono currently fails with doc most likely because of xattr # Gentoo bug: 554484 -~dev-lang/mono-3.12.1 doc +>=dev-lang/mono-3.12.1 doc # Michael Palimaka (12 Aug 2015) # Requires unreleased dependency From 3305d2cf6f82eb15f3beda4039ea4629c633a3dd Mon Sep 17 00:00:00 2001 From: Heather Cynede Date: Fri, 14 Aug 2015 12:52:21 +0400 Subject: [PATCH 3/5] eclass/gtk-sharp-module gmcs is derpecated and dropped, use mcs --- eclass/gtk-sharp-module.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass index 5479fd0abc010..3919f84e22a7a 100644 --- a/eclass/gtk-sharp-module.eclass +++ b/eclass/gtk-sharp-module.eclass @@ -522,13 +522,13 @@ gtk-sharp-module_src_configure() { # @FUNCTION: gtk-sharp-module_src_compile # @DESCRIPTION: # Calls emake in the subdir of the module. -# Sets CSC=/usr/bin/gmcs. Deletes top_srcdir Makefiles to prevent recursing in +# Sets CSC=/usr/bin/mcs. Deletes top_srcdir Makefiles to prevent recursing in # case we missed some dll references. # Is exported. gtk-sharp-module_src_compile() { rm -f "${S}"/Makefile* &> /dev/null cd "${S}/${GTK_SHARP_MODULE_DIR}" - emake CSC=/usr/bin/gmcs || die "emake failed" + emake CSC=/usr/bin/mcs || die "emake failed" } # @FUNCTION: gtk-sharp-module_src_install From bd550428cf2ab0ab5cbff764d5b83456a508146b Mon Sep 17 00:00:00 2001 From: Heather Cynede Date: Fri, 14 Aug 2015 12:59:41 +0400 Subject: [PATCH 4/5] dev-dotnet/xsp -> www-servers/xsp --- .../monodevelop/monodevelop-5.9.5.5.ebuild | 2 +- www-servers/xsp/Manifest | 1 + .../xsp/files/2.2/mod-mono-server-r1.initd | 83 ++++++++++++++++ .../xsp/files/2.2/mod-mono-server.confd | 34 +++++++ .../xsp/files/2.2/mod-mono-server.initd | 81 ++++++++++++++++ www-servers/xsp/files/2.2/xsp.confd | 12 +++ www-servers/xsp/files/2.2/xsp.initd | 38 ++++++++ www-servers/xsp/files/aclocal-fix.patch | 13 +++ .../xsp/files/systemd/mono-xsp4.service | 15 +++ www-servers/xsp/files/systemd/mono.webapp | 10 ++ www-servers/xsp/files/systemd/readme.txt | 1 + .../xsp/files/xsp-2.10.2-endrequest.patch | 35 +++++++ www-servers/xsp/metadata.xml | 12 +++ .../xsp/xsp-2014.12-r2014120900.ebuild | 94 +++++++++++++++++++ 14 files changed, 430 insertions(+), 1 deletion(-) create mode 100644 www-servers/xsp/Manifest create mode 100644 www-servers/xsp/files/2.2/mod-mono-server-r1.initd create mode 100644 www-servers/xsp/files/2.2/mod-mono-server.confd create mode 100644 www-servers/xsp/files/2.2/mod-mono-server.initd create mode 100644 www-servers/xsp/files/2.2/xsp.confd create mode 100644 www-servers/xsp/files/2.2/xsp.initd create mode 100644 www-servers/xsp/files/aclocal-fix.patch create mode 100644 www-servers/xsp/files/systemd/mono-xsp4.service create mode 100644 www-servers/xsp/files/systemd/mono.webapp create mode 100644 www-servers/xsp/files/systemd/readme.txt create mode 100644 www-servers/xsp/files/xsp-2.10.2-endrequest.patch create mode 100644 www-servers/xsp/metadata.xml create mode 100644 www-servers/xsp/xsp-2014.12-r2014120900.ebuild diff --git a/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild b/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild index 2e06b6f477418..a9aa4141556f8 100644 --- a/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild +++ b/dev-util/monodevelop/monodevelop-5.9.5.5.ebuild @@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/mono-3.2.8 >=dev-dotnet/nuget-2.8.3 gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) >=dev-dotnet/gtk-sharp-2.12.21:2 - >=dev-dotnet/xsp-2 + >=www-servers/xsp-2 dev-util/ctags sys-apps/dbus[X] subversion? ( dev-vcs/subversion ) diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest new file mode 100644 index 0000000000000..43adebae8babd --- /dev/null +++ b/www-servers/xsp/Manifest @@ -0,0 +1 @@ +DIST xsp-2014.12.zip 632555 SHA256 1d115e3fe0bbcb3957be20e670e086ebddff3acaa5f641a9c143ea46d12e055c SHA512 a9d298079cfae4bacac1575f04e58c3106f532c1f283cc243a8a6560561c0a6b535320d1d3e925c7383bd1f7510f31f115d8e85506e31623c175d7f3f606ab91 WHIRLPOOL a5e06f72f51717682d80f6ac6554320db72a05d6d6c40439196073d118706607f99bf810d82e8cc68cf9e54bd0f7d176cc882fa74babb8d78308cbe7c4d9d8cc diff --git a/www-servers/xsp/files/2.2/mod-mono-server-r1.initd b/www-servers/xsp/files/2.2/mod-mono-server-r1.initd new file mode 100644 index 0000000000000..6ce6a60bcec2a --- /dev/null +++ b/www-servers/xsp/files/2.2/mod-mono-server-r1.initd @@ -0,0 +1,83 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: mod-mono-server-r1.initd,v 1.1 2012/01/22 12:54:29 pacho Exp $ + +depend() { + use net + after dotnet +} + +start() { + [ -z "$MonoServerRootDir" ] && \ + MonoServerRootDir="/usr/lib/xsp/test" + [ -z "$MonoApplications" ] && \ + MonoApplications="/mono:/usr/lib/xsp/test,/:." + [ -z "$UnixSocketFileName" ] && \ + UnixSocketFileName="/tmp/mod_mono_server" + [ -z "$MonoServerAddress" ] && \ + MonoServerAddress=127.0.0.1 + [ -z "$MonoServerPort" ] && \ + MonoServerPort=8080 + [ -z "$MonoServerVersion" ] && \ + MonoServerVersion=1 + + MONO_SERVER_OPTS="--root ${MonoServerRootDir} \ +--applications ${MonoApplications} --nonstop" + + [ -n "$MonoApplicationsConfigDir" ] && \ + MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ +--appconfigdir ${MonoApplicationsConfigDir}" + + case "$MonoServerChannel" in + "tcp" ) + MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ +--address ${MonoServerAddress} --port ${MonoServerPort}" + ;; + + "unix" ) + [ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName + MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ +--filename ${UnixSocketFileName}" + ;; + + * ) + eerror "Please set a valid value for MonoServerChannel" + return 1 + ;; + esac + + if [ ${MonoServerVersion} -eq 1 ]; then + modmonoserverpath=1.0/mod-mono-server.exe + elif [ ${MonoServerVersion} -eq 2 ]; then + modmonoserverpath=2.0/mod-mono-server2.exe + elif [ ${MonoServerVersion} -eq 4 ]; then + modmonoserverpath=4.0/mod-mono-server4.exe + else + eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/mod-mono-server" + return 1 + fi + + export MONO_SHARED_DIR=/tmp + + ebegin "Starting mod-mono-server" + + start-stop-daemon --quiet --start \ + --background \ + --make-pidfile \ + --pidfile /var/run/aspnet/mod-mono-server.pid \ + --user aspnet \ + --exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \ + -- $MONO_SERVER_OPTS + + eend $? +} + +stop() { + ebegin "Stopping mod-mono-server" + + start-stop-daemon --quiet --stop \ + --pidfile /var/run/aspnet/mod-mono-server.pid + + eend $? +} diff --git a/www-servers/xsp/files/2.2/mod-mono-server.confd b/www-servers/xsp/files/2.2/mod-mono-server.confd new file mode 100644 index 0000000000000..7cefdbea49b4b --- /dev/null +++ b/www-servers/xsp/files/2.2/mod-mono-server.confd @@ -0,0 +1,34 @@ +# Config file for /etc/init.d/mod-mono-server +# $Id: mod-mono-server.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ + +# Configuration directives for mod-mono-server.exe. For more information on +# these variables, see the man page for xsp(1). + +# This is the document root; trailing slash is not necessary +#MonoServerRootDir="/usr/lib/xsp/test" + +# Directory to search for files with an `.webapp' extension. +#MonoApplicationsConfigDir="/usr/lib/xsp/test" + +# Comma separated list of directories (in the form virtual:real) for all +# applications managed by the server. For example: +# /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2 +MonoApplications="/mono:/usr/lib/xsp/test" + +# The communication channel used between mod-mono-server and mod_mono. +# unix - A unix socket +# tcp - A TCP connection +MonoServerChannel="unix" + +# When the comm. channel is "unix", the local filename used by the socket. +UnixSocketFileName="/tmp/mod_mono_server" + +# When the comm. channel is "tcp", IP address for the server to listen on. +#MonoServerAddress=127.0.0.1 + +# When the comm. channel is "tcp", port for the server to listen on. +#MonoServerPort=8080 + +# If you want to host .NET 2.0 applications you have to set this to 2. +# Otherwise, leave it unchaged +MonoServerVersion=1 diff --git a/www-servers/xsp/files/2.2/mod-mono-server.initd b/www-servers/xsp/files/2.2/mod-mono-server.initd new file mode 100644 index 0000000000000..49119e5af4970 --- /dev/null +++ b/www-servers/xsp/files/2.2/mod-mono-server.initd @@ -0,0 +1,81 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: mod-mono-server.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ + +depend() { + use net + after dotnet +} + +start() { + [ -z "$MonoServerRootDir" ] && \ + MonoServerRootDir="/usr/lib/xsp/test" + [ -z "$MonoApplications" ] && \ + MonoApplications="/mono:/usr/lib/xsp/test,/:." + [ -z "$UnixSocketFileName" ] && \ + UnixSocketFileName="/tmp/mod_mono_server" + [ -z "$MonoServerAddress" ] && \ + MonoServerAddress=127.0.0.1 + [ -z "$MonoServerPort" ] && \ + MonoServerPort=8080 + [ -z "$MonoServerVersion" ] && \ + MonoServerVersion=1 + + MONO_SERVER_OPTS="--root ${MonoServerRootDir} \ +--applications ${MonoApplications} --nonstop" + + [ -n "$MonoApplicationsConfigDir" ] && \ + MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ +--appconfigdir ${MonoApplicationsConfigDir}" + + case "$MonoServerChannel" in + "tcp" ) + MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ +--address ${MonoServerAddress} --port ${MonoServerPort}" + ;; + + "unix" ) + [ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName + MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ +--filename ${UnixSocketFileName}" + ;; + + * ) + eerror "Please set a valid value for MonoServerChannel" + return 1 + ;; + esac + + if [ ${MonoServerVersion} -eq 1 ]; then + modmonoserverpath=1.0/mod-mono-server.exe + elif [ ${MonoServerVersion} -eq 2 ]; then + modmonoserverpath=2.0/mod-mono-server2.exe + else + eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp" + return 1 + fi + + export MONO_SHARED_DIR=/tmp + + ebegin "Starting mod-mono-server" + + start-stop-daemon --quiet --start \ + --background \ + --make-pidfile \ + --pidfile /var/run/aspnet/mod-mono-server.pid \ + --chuid aspnet \ + --exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \ + -- $MONO_SERVER_OPTS + + eend $? +} + +stop() { + ebegin "Stopping mod-mono-server" + + start-stop-daemon -o --quiet --stop \ + --pidfile /var/run/aspnet/mod-mono-server.pid + + eend $? +} diff --git a/www-servers/xsp/files/2.2/xsp.confd b/www-servers/xsp/files/2.2/xsp.confd new file mode 100644 index 0000000000000..45a79a52bb63b --- /dev/null +++ b/www-servers/xsp/files/2.2/xsp.confd @@ -0,0 +1,12 @@ +# Config file for /etc/init.d/xsp +# $Id: xsp.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ + +# This is the document root; trailing slash is not necessary +MonoServerRoot=/usr/lib/xsp/test + +# Port for the server to run on +MonoServerPort=8000 + +# If you want to host .NET 2.0 applications you have to set this to 2. +# Otherwise, leave it unchanged +MonoServerVersion=1 diff --git a/www-servers/xsp/files/2.2/xsp.initd b/www-servers/xsp/files/2.2/xsp.initd new file mode 100644 index 0000000000000..0432bca7d36e2 --- /dev/null +++ b/www-servers/xsp/files/2.2/xsp.initd @@ -0,0 +1,38 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: xsp.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ + +depend() { + need net + after dotnet +} + +start() { + ebegin "Starting xsp" + + if [ ${MonoServerVersion} -eq 1 ]; then + xsppath=1.0/xsp.exe + elif [ ${MonoServerVersion} -eq 2 ]; then + xsppath=2.0/xsp2.exe + else + eerror "MonoServerVersion was not properly set. Check your config file" + return 1 + fi + + start-stop-daemon --quiet --start \ + --background \ + --make-pidfile \ + --pidfile /var/run/aspnet/xsp.pid \ + --chuid aspnet \ + --exec /usr/bin/mono /usr/lib/mono/${xsppath} -- --root ${MonoServerRoot} --port ${MonoServerPort} --nonstop + eend $? +} + +stop() { + ebegin "Stopping xsp" + start-stop-daemon -o --quiet --stop \ + --pidfile /var/run/aspnet/xsp.pid + eend $? +} + diff --git a/www-servers/xsp/files/aclocal-fix.patch b/www-servers/xsp/files/aclocal-fix.patch new file mode 100644 index 0000000000000..49a00050fe8dc --- /dev/null +++ b/www-servers/xsp/files/aclocal-fix.patch @@ -0,0 +1,13 @@ +--- Makefile_old.am 2013-07-30 09:11:50.033962122 +0400 ++++ Makefile.am 2013-07-30 09:12:20.843574793 +0400 +@@ -1,10 +1,2 @@ + SUBDIRS=build man src test tools scripts packaging lib + ACLOCAL_AMFLAGS += -I build/m4 +- +-if UNITTESTS +-SUBDIRS += unittests +-endif +- +-if BUILD_DOCS +-SUBDIRS += docs +-endif diff --git a/www-servers/xsp/files/systemd/mono-xsp4.service b/www-servers/xsp/files/systemd/mono-xsp4.service new file mode 100644 index 0000000000000..3e5f602919537 --- /dev/null +++ b/www-servers/xsp/files/systemd/mono-xsp4.service @@ -0,0 +1,15 @@ +[Unit] +Description=XSP 4.0 WebServer +Wants=network.target +ConditionFileNotEmpty=/etc/xsp4/mono.webapp +ConditionDirectoryNotEmpty=/etc/xsp4/conf.d + +[Service] +Type=simple +User=aspnet +Group=aspnet +ExecStart=/usr/bin/xsp4 --port 8084 --address 0.0.0.0 --appconfigdir /etc/xsp4 --nonstop +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/www-servers/xsp/files/systemd/mono.webapp b/www-servers/xsp/files/systemd/mono.webapp new file mode 100644 index 0000000000000..3f611b1e23740 --- /dev/null +++ b/www-servers/xsp/files/systemd/mono.webapp @@ -0,0 +1,10 @@ + + Root + / + /usr/lib64/xsp/test + + my.host.name + 8084 + + + diff --git a/www-servers/xsp/files/systemd/readme.txt b/www-servers/xsp/files/systemd/readme.txt new file mode 100644 index 0000000000000..8b137891791fe --- /dev/null +++ b/www-servers/xsp/files/systemd/readme.txt @@ -0,0 +1 @@ + diff --git a/www-servers/xsp/files/xsp-2.10.2-endrequest.patch b/www-servers/xsp/files/xsp-2.10.2-endrequest.patch new file mode 100644 index 0000000000000..ff702d3faa599 --- /dev/null +++ b/www-servers/xsp/files/xsp-2.10.2-endrequest.patch @@ -0,0 +1,35 @@ +From d2c4a279942a4575b80618719646d0767c077e96 Mon Sep 17 00:00:00 2001 +From: Guillaume Pitel +Date: Tue, 6 Mar 2012 17:20:24 +0100 +Subject: [PATCH] Added try/catch around EndRequest Record sending (Bug 3765 + https://bugzilla.xamarin.com/show_bug.cgi?id=3765) + +--- + src/Mono.WebServer.FastCgi/Connection.cs | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/Mono.WebServer.FastCgi/Connection.cs b/src/Mono.WebServer.FastCgi/Connection.cs +index 6c70824..0e9ef64 100644 +--- a/src/Mono.WebServer.FastCgi/Connection.cs ++++ b/src/Mono.WebServer.FastCgi/Connection.cs +@@ -319,10 +319,13 @@ public void Run () + { + EndRequestBody body = new EndRequestBody (appStatus, + protocolStatus); +- +- if (IsConnected) +- new Record (1, RecordType.EndRequest, requestID, +- body.GetData ()).Send (socket); ++ try { ++ if (IsConnected) ++ new Record (1, RecordType.EndRequest, requestID, ++ body.GetData ()).Send (socket); ++ } catch (System.Net.Sockets.SocketException) { ++ } ++ + + int index = GetRequestIndex (requestID); + +-- +1.7.10 + diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml new file mode 100644 index 0000000000000..4a252355a3b05 --- /dev/null +++ b/www-servers/xsp/metadata.xml @@ -0,0 +1,12 @@ + + + + dotnet + + XSP is a standalone web server written in C# that can be used to run + your ASP.NET applications. + + + creates .mdb files for either Release and Debug + + diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild new file mode 100644 index 0000000000000..cb38e334fadba --- /dev/null +++ b/www-servers/xsp/xsp-2014.12-r2014120900.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +USE_DOTNET="net35 net40 net45" +PATCHDIR="${FILESDIR}/2.2/" + +inherit base eutils systemd dotnet user autotools autotools-utils + +DESCRIPTION="XSP is a small web server that can host ASP.NET pages" +HOMEPAGE="http://www.mono-project.com/ASP.NET" + +EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768" +SRC_URI="http://github.com/mono/xsp/archive/${EGIT_COMMIT}.zip -> ${P}.zip" +S="${WORKDIR}/xsp-${EGIT_COMMIT}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc test developer" + +RDEPEND="dev-db/sqlite:3" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/aclocal-fix.patch" + + if [ -z "$LIBTOOL" ]; then + LIBTOOL=`which glibtool 2>/dev/null` + if [ ! -x "$LIBTOOL" ]; then + LIBTOOL=`which libtool` + fi + fi + eaclocal -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS + if test -z "$NO_LIBTOOLIZE"; then + ${LIBTOOL}ize --force --copy + fi + eautoconf +} + +src_configure() { + myeconfargs=("--enable-maintainer-mode") + use test && myeconfargs+=("--with_unit_tests") + use doc || myeconfargs+=("--disable-docs") + eautomake --gnu --add-missing --force --copy #nowarn + autotools-utils_src_configure + ./configure || die +} + +METAFILETOBUILD=xsp.sln + +src_compile() { + exbuild xsp.sln + if use developer; then + exbuild /p:DebugSymbols=True ${METAFILETOBUILD} + else + exbuild /p:DebugSymbols=False ${METAFILETOBUILD} + fi +} + +pkg_preinst() { + enewgroup aspnet + enewuser aspnet -1 -1 /tmp aspnet + + # enewuser www-data + # www-data - is from debian, i think it's the same as aspnet here +} + +src_install() { + mv_command="cp -ar" autotools-utils_src_install + newinitd "${PATCHDIR}"/xsp.initd xsp + newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server + newconfd "${PATCHDIR}"/xsp.confd xsp + newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server + + insinto /etc/xsp4 + doins "${FILESDIR}"/systemd/mono.webapp + insinto /etc/xsp4/conf.d + doins "${FILESDIR}"/systemd/readme.txt + # mono-xsp4.service was original name from + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5 + # I think that using the same commands as in debian + # systemctl start mono-xsp4.service + # systemctl start mono-xsp4 + # is better than to have shorter command + # systemctl start xsp + # + # insinto /usr/lib/systemd/system + systemd_dounit "${FILESDIR}"/systemd/mono-xsp4.service + + keepdir /var/run/aspnet +} From 2adc6eed699c97db44656816a65bf000b5555bee Mon Sep 17 00:00:00 2001 From: Heather Cynede Date: Fri, 14 Aug 2015 13:01:10 +0400 Subject: [PATCH 5/5] www-servers/xsp replaced by www-servers/xsp --- dev-dotnet/xsp/Manifest | 2 - .../xsp/files/2.2/mod-mono-server-r1.initd | 83 ------------------- .../xsp/files/2.2/mod-mono-server.confd | 34 -------- .../xsp/files/2.2/mod-mono-server.initd | 81 ------------------ dev-dotnet/xsp/files/2.2/xsp.confd | 12 --- dev-dotnet/xsp/files/2.2/xsp.initd | 38 --------- dev-dotnet/xsp/files/aclocal-fix.patch | 13 --- .../xsp/files/xsp-2.10.2-endrequest.patch | 35 -------- dev-dotnet/xsp/metadata.xml | 9 -- dev-dotnet/xsp/xsp-2.10.2-r2.ebuild | 51 ------------ dev-dotnet/xsp/xsp-2014.11.ebuild | 65 --------------- 11 files changed, 423 deletions(-) delete mode 100644 dev-dotnet/xsp/Manifest delete mode 100644 dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd delete mode 100644 dev-dotnet/xsp/files/2.2/mod-mono-server.confd delete mode 100644 dev-dotnet/xsp/files/2.2/mod-mono-server.initd delete mode 100644 dev-dotnet/xsp/files/2.2/xsp.confd delete mode 100644 dev-dotnet/xsp/files/2.2/xsp.initd delete mode 100644 dev-dotnet/xsp/files/aclocal-fix.patch delete mode 100644 dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch delete mode 100644 dev-dotnet/xsp/metadata.xml delete mode 100644 dev-dotnet/xsp/xsp-2.10.2-r2.ebuild delete mode 100644 dev-dotnet/xsp/xsp-2014.11.ebuild diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest deleted file mode 100644 index fdfa0372f10e9..0000000000000 --- a/dev-dotnet/xsp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST 2014.11.tar.gz 308009 SHA256 6378f0167dc09aaf8f48874b4f9ece3d41d375b168f0cb86a1b2cf52ee937376 SHA512 68e127e1d33da6f7fdcbf2586a48b2da32b1931558e637f10ba6b86cd7e6bf4ad67fc47cfa68703eb65964c270616a04da3eb9f2df14974ecdaa7b979f7fc9b6 WHIRLPOOL 143540614e0c7e509257d3391b06af231acd8732c5528134e4cc6c76a7812531e8f8c6b6059993e1dcd5fcc7516ed44accf44e8e1e4e8917f77ee65dde459815 -DIST xsp-2.10.2.tar.bz2 284801 SHA256 f4657f724167244d9baedf94e1d5747b8f1f53c339c7a11897154c1eb1289d4e SHA512 9b49e3a712e062b9a272e72609eda3cb8139127bc9780d6374a3567f51f15f38233f92252c2e4c22778b1841de66855dfe6a8cf81c97c6ebbf84f71dda0d43dd WHIRLPOOL fce613fedf164f7cd4cf0bae622884a4f7b6747e249d965c4ea23997586371b6a588ad96d66bcc5c6e74f98b76de3f374cd676de164ba1f3a889e4b00b8b6dcc 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 deleted file mode 100644 index 6ce6a60bcec2a..0000000000000 --- a/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd +++ /dev/null @@ -1,83 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: mod-mono-server-r1.initd,v 1.1 2012/01/22 12:54:29 pacho Exp $ - -depend() { - use net - after dotnet -} - -start() { - [ -z "$MonoServerRootDir" ] && \ - MonoServerRootDir="/usr/lib/xsp/test" - [ -z "$MonoApplications" ] && \ - MonoApplications="/mono:/usr/lib/xsp/test,/:." - [ -z "$UnixSocketFileName" ] && \ - UnixSocketFileName="/tmp/mod_mono_server" - [ -z "$MonoServerAddress" ] && \ - MonoServerAddress=127.0.0.1 - [ -z "$MonoServerPort" ] && \ - MonoServerPort=8080 - [ -z "$MonoServerVersion" ] && \ - MonoServerVersion=1 - - MONO_SERVER_OPTS="--root ${MonoServerRootDir} \ ---applications ${MonoApplications} --nonstop" - - [ -n "$MonoApplicationsConfigDir" ] && \ - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ ---appconfigdir ${MonoApplicationsConfigDir}" - - case "$MonoServerChannel" in - "tcp" ) - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ ---address ${MonoServerAddress} --port ${MonoServerPort}" - ;; - - "unix" ) - [ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ ---filename ${UnixSocketFileName}" - ;; - - * ) - eerror "Please set a valid value for MonoServerChannel" - return 1 - ;; - esac - - if [ ${MonoServerVersion} -eq 1 ]; then - modmonoserverpath=1.0/mod-mono-server.exe - elif [ ${MonoServerVersion} -eq 2 ]; then - modmonoserverpath=2.0/mod-mono-server2.exe - elif [ ${MonoServerVersion} -eq 4 ]; then - modmonoserverpath=4.0/mod-mono-server4.exe - else - eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/mod-mono-server" - return 1 - fi - - export MONO_SHARED_DIR=/tmp - - ebegin "Starting mod-mono-server" - - start-stop-daemon --quiet --start \ - --background \ - --make-pidfile \ - --pidfile /var/run/aspnet/mod-mono-server.pid \ - --user aspnet \ - --exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \ - -- $MONO_SERVER_OPTS - - eend $? -} - -stop() { - ebegin "Stopping mod-mono-server" - - start-stop-daemon --quiet --stop \ - --pidfile /var/run/aspnet/mod-mono-server.pid - - eend $? -} diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd b/dev-dotnet/xsp/files/2.2/mod-mono-server.confd deleted file mode 100644 index 7cefdbea49b4b..0000000000000 --- a/dev-dotnet/xsp/files/2.2/mod-mono-server.confd +++ /dev/null @@ -1,34 +0,0 @@ -# Config file for /etc/init.d/mod-mono-server -# $Id: mod-mono-server.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ - -# Configuration directives for mod-mono-server.exe. For more information on -# these variables, see the man page for xsp(1). - -# This is the document root; trailing slash is not necessary -#MonoServerRootDir="/usr/lib/xsp/test" - -# Directory to search for files with an `.webapp' extension. -#MonoApplicationsConfigDir="/usr/lib/xsp/test" - -# Comma separated list of directories (in the form virtual:real) for all -# applications managed by the server. For example: -# /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2 -MonoApplications="/mono:/usr/lib/xsp/test" - -# The communication channel used between mod-mono-server and mod_mono. -# unix - A unix socket -# tcp - A TCP connection -MonoServerChannel="unix" - -# When the comm. channel is "unix", the local filename used by the socket. -UnixSocketFileName="/tmp/mod_mono_server" - -# When the comm. channel is "tcp", IP address for the server to listen on. -#MonoServerAddress=127.0.0.1 - -# When the comm. channel is "tcp", port for the server to listen on. -#MonoServerPort=8080 - -# If you want to host .NET 2.0 applications you have to set this to 2. -# Otherwise, leave it unchaged -MonoServerVersion=1 diff --git a/dev-dotnet/xsp/files/2.2/mod-mono-server.initd b/dev-dotnet/xsp/files/2.2/mod-mono-server.initd deleted file mode 100644 index 49119e5af4970..0000000000000 --- a/dev-dotnet/xsp/files/2.2/mod-mono-server.initd +++ /dev/null @@ -1,81 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: mod-mono-server.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ - -depend() { - use net - after dotnet -} - -start() { - [ -z "$MonoServerRootDir" ] && \ - MonoServerRootDir="/usr/lib/xsp/test" - [ -z "$MonoApplications" ] && \ - MonoApplications="/mono:/usr/lib/xsp/test,/:." - [ -z "$UnixSocketFileName" ] && \ - UnixSocketFileName="/tmp/mod_mono_server" - [ -z "$MonoServerAddress" ] && \ - MonoServerAddress=127.0.0.1 - [ -z "$MonoServerPort" ] && \ - MonoServerPort=8080 - [ -z "$MonoServerVersion" ] && \ - MonoServerVersion=1 - - MONO_SERVER_OPTS="--root ${MonoServerRootDir} \ ---applications ${MonoApplications} --nonstop" - - [ -n "$MonoApplicationsConfigDir" ] && \ - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ ---appconfigdir ${MonoApplicationsConfigDir}" - - case "$MonoServerChannel" in - "tcp" ) - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ ---address ${MonoServerAddress} --port ${MonoServerPort}" - ;; - - "unix" ) - [ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName - MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \ ---filename ${UnixSocketFileName}" - ;; - - * ) - eerror "Please set a valid value for MonoServerChannel" - return 1 - ;; - esac - - if [ ${MonoServerVersion} -eq 1 ]; then - modmonoserverpath=1.0/mod-mono-server.exe - elif [ ${MonoServerVersion} -eq 2 ]; then - modmonoserverpath=2.0/mod-mono-server2.exe - else - eerror "MonoServerVersion was not properly set. Check your /etc/conf.d/xsp" - return 1 - fi - - export MONO_SHARED_DIR=/tmp - - ebegin "Starting mod-mono-server" - - start-stop-daemon --quiet --start \ - --background \ - --make-pidfile \ - --pidfile /var/run/aspnet/mod-mono-server.pid \ - --chuid aspnet \ - --exec /usr/bin/mono /usr/lib/mono/${modmonoserverpath} \ - -- $MONO_SERVER_OPTS - - eend $? -} - -stop() { - ebegin "Stopping mod-mono-server" - - start-stop-daemon -o --quiet --stop \ - --pidfile /var/run/aspnet/mod-mono-server.pid - - eend $? -} diff --git a/dev-dotnet/xsp/files/2.2/xsp.confd b/dev-dotnet/xsp/files/2.2/xsp.confd deleted file mode 100644 index 45a79a52bb63b..0000000000000 --- a/dev-dotnet/xsp/files/2.2/xsp.confd +++ /dev/null @@ -1,12 +0,0 @@ -# Config file for /etc/init.d/xsp -# $Id: xsp.confd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ - -# This is the document root; trailing slash is not necessary -MonoServerRoot=/usr/lib/xsp/test - -# Port for the server to run on -MonoServerPort=8000 - -# If you want to host .NET 2.0 applications you have to set this to 2. -# Otherwise, leave it unchanged -MonoServerVersion=1 diff --git a/dev-dotnet/xsp/files/2.2/xsp.initd b/dev-dotnet/xsp/files/2.2/xsp.initd deleted file mode 100644 index 0432bca7d36e2..0000000000000 --- a/dev-dotnet/xsp/files/2.2/xsp.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: xsp.initd,v 1.1 2009/01/18 17:44:04 loki_val Exp $ - -depend() { - need net - after dotnet -} - -start() { - ebegin "Starting xsp" - - if [ ${MonoServerVersion} -eq 1 ]; then - xsppath=1.0/xsp.exe - elif [ ${MonoServerVersion} -eq 2 ]; then - xsppath=2.0/xsp2.exe - else - eerror "MonoServerVersion was not properly set. Check your config file" - return 1 - fi - - start-stop-daemon --quiet --start \ - --background \ - --make-pidfile \ - --pidfile /var/run/aspnet/xsp.pid \ - --chuid aspnet \ - --exec /usr/bin/mono /usr/lib/mono/${xsppath} -- --root ${MonoServerRoot} --port ${MonoServerPort} --nonstop - eend $? -} - -stop() { - ebegin "Stopping xsp" - start-stop-daemon -o --quiet --stop \ - --pidfile /var/run/aspnet/xsp.pid - eend $? -} - diff --git a/dev-dotnet/xsp/files/aclocal-fix.patch b/dev-dotnet/xsp/files/aclocal-fix.patch deleted file mode 100644 index 49a00050fe8dc..0000000000000 --- a/dev-dotnet/xsp/files/aclocal-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile_old.am 2013-07-30 09:11:50.033962122 +0400 -+++ Makefile.am 2013-07-30 09:12:20.843574793 +0400 -@@ -1,10 +1,2 @@ - SUBDIRS=build man src test tools scripts packaging lib - ACLOCAL_AMFLAGS += -I build/m4 -- --if UNITTESTS --SUBDIRS += unittests --endif -- --if BUILD_DOCS --SUBDIRS += docs --endif diff --git a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch b/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch deleted file mode 100644 index ff702d3faa599..0000000000000 --- a/dev-dotnet/xsp/files/xsp-2.10.2-endrequest.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d2c4a279942a4575b80618719646d0767c077e96 Mon Sep 17 00:00:00 2001 -From: Guillaume Pitel -Date: Tue, 6 Mar 2012 17:20:24 +0100 -Subject: [PATCH] Added try/catch around EndRequest Record sending (Bug 3765 - https://bugzilla.xamarin.com/show_bug.cgi?id=3765) - ---- - src/Mono.WebServer.FastCgi/Connection.cs | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/Mono.WebServer.FastCgi/Connection.cs b/src/Mono.WebServer.FastCgi/Connection.cs -index 6c70824..0e9ef64 100644 ---- a/src/Mono.WebServer.FastCgi/Connection.cs -+++ b/src/Mono.WebServer.FastCgi/Connection.cs -@@ -319,10 +319,13 @@ public void Run () - { - EndRequestBody body = new EndRequestBody (appStatus, - protocolStatus); -- -- if (IsConnected) -- new Record (1, RecordType.EndRequest, requestID, -- body.GetData ()).Send (socket); -+ try { -+ if (IsConnected) -+ new Record (1, RecordType.EndRequest, requestID, -+ body.GetData ()).Send (socket); -+ } catch (System.Net.Sockets.SocketException) { -+ } -+ - - int index = GetRequestIndex (requestID); - --- -1.7.10 - diff --git a/dev-dotnet/xsp/metadata.xml b/dev-dotnet/xsp/metadata.xml deleted file mode 100644 index c264edab779b6..0000000000000 --- a/dev-dotnet/xsp/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - dotnet - - XSP is a standalone web server written in C# that can be used to run - your ASP.NET applications. - - diff --git a/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild deleted file mode 100644 index dcf35279a6728..0000000000000 --- a/dev-dotnet/xsp/xsp-2.10.2-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit eutils go-mono mono user - -PATCHDIR="${FILESDIR}/2.2/" - -DESCRIPTION="XSP is a small web server that can host ASP.NET pages" -HOMEPAGE="http://www.mono-project.com/ASP.NET" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -IUSE="" - -RDEPEND="dev-db/sqlite:3" -DEPEND="${RDEPEND}" - -MAKEOPTS="${MAKEOPTS} -j1" - -src_prepare() { - # Added try/catch around EndRequest Record sending, bug #432750 - epatch "${FILESDIR}/${PN}-2.10.2-endrequest.patch" -} - -src_configure() { - default -} - -pkg_preinst() { - enewgroup aspnet - # Give aspnet home dir of /tmp since it must create ~/.wapi - enewuser aspnet -1 -1 /tmp aspnet -} - -src_install() { - mv_command="cp -ar" go-mono_src_install - newinitd "${PATCHDIR}"/xsp.initd xsp - newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server - newconfd "${PATCHDIR}"/xsp.confd xsp - newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server - - keepdir /var/run/aspnet -} - -pkg_postinst() { - chown aspnet:aspnet /var/run/aspnet -} diff --git a/dev-dotnet/xsp/xsp-2014.11.ebuild b/dev-dotnet/xsp/xsp-2014.11.ebuild deleted file mode 100644 index c1b957baebb06..0000000000000 --- a/dev-dotnet/xsp/xsp-2014.11.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PATCHDIR="${FILESDIR}/2.2/" - -inherit base eutils dotnet user autotools autotools-utils - -DESCRIPTION="XSP is a small web server that can host ASP.NET pages" -HOMEPAGE="http://www.mono-project.com/ASP.NET" -SRC_URI="https://github.com/Heather/xsp/archive/2014.11.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc test" - -RDEPEND="dev-db/sqlite:3" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${P} - -src_prepare() { - epatch "${FILESDIR}/aclocal-fix.patch" - - if [ -z "$LIBTOOL" ]; then - LIBTOOL=`which glibtool 2>/dev/null` - if [ ! -x "$LIBTOOL" ]; then - LIBTOOL=`which libtool` - fi - fi - eaclocal -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS - if test -z "$NO_LIBTOOLIZE"; then - ${LIBTOOL}ize --force --copy - fi - eautoconf -} - -src_configure() { - myeconfargs=("--enable-maintainer-mode") - use test && myeconfargs+=("--with_unit_tests") - use doc || myeconfargs+=("--disable-docs") - eautomake --gnu --add-missing --force --copy #nowarn - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile -} - -pkg_preinst() { - enewgroup aspnet - enewuser aspnet -1 -1 /tmp aspnet -} - -src_install() { - mv_command="cp -ar" autotools-utils_src_install - newinitd "${PATCHDIR}"/xsp.initd xsp - newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server - newconfd "${PATCHDIR}"/xsp.confd xsp - newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server - - keepdir /var/run/aspnet -}