summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-dotnet')
-rw-r--r--dev-dotnet/xsp/ChangeLog8
-rw-r--r--dev-dotnet/xsp/Manifest10
-rw-r--r--dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd83
-rw-r--r--dev-dotnet/xsp/xsp-2.10.2-r1.ebuild46
4 files changed, 142 insertions, 5 deletions
diff --git a/dev-dotnet/xsp/ChangeLog b/dev-dotnet/xsp/ChangeLog
index ff36ce9eda1a..4d51d0f2ffb5 100644
--- a/dev-dotnet/xsp/ChangeLog
+++ b/dev-dotnet/xsp/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-dotnet/xsp
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.101 2012/01/22 11:19:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.102 2012/01/22 12:54:29 pacho Exp $
+
+*xsp-2.10.2-r1 (22 Jan 2012)
+
+ 22 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+ +files/2.2/mod-mono-server-r1.initd, +xsp-2.10.2-r1.ebuild:
+ Fix mod-mono-server init.d to support MonoServerVersion=4, bug #388669.
22 Jan 2012; Pacho Ramos <pacho@gentoo.org> -xsp-2.10.ebuild:
Drop old.
diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest
index c25c6ade08cd..802163d504e4 100644
--- a/dev-dotnet/xsp/Manifest
+++ b/dev-dotnet/xsp/Manifest
@@ -1,18 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX 2.2/mod-mono-server-r1.initd 2071 RMD160 7b2330ea22027d00a7f492199abb9342c02ba371 SHA1 94d80c449b9d09d83d8bdb1acd2869ca95744538 SHA256 516fe0e99e498a62e3cb367870c4c7d4c15791bfcc2f5e6c070d8f6140e4800f
AUX 2.2/mod-mono-server.confd 1284 RMD160 be383a31de615d9fb4be33383185df05a96e0ef0 SHA1 a0c9e8febd357f8f72857015d05ec3a5be840be6 SHA256 afece05a71e3a13127ecc40c0f6948dd19adf72feb093c4027d77d3e79a0b335
AUX 2.2/mod-mono-server.initd 1975 RMD160 84b618038ecf30199bd4b34ad5178e69aa56abc4 SHA1 a217c507da40be04d5aba403d3b4cd5e46f9bf46 SHA256 b9d34b7c3adf2b2bc72ceb0ae736c11ef0bfe0c8d8fead0ba5fc32df2249f038
AUX 2.2/xsp.confd 364 RMD160 785c4723784120143b9da2187659798236decf2f SHA1 5e0a0656d56133d32fef1b25cd031e8396d49fc2 SHA256 002d95fea743bbf18bbff3fb4af5397cf775519afaf1493384b28125c0efdc38
AUX 2.2/xsp.initd 853 RMD160 930379dbef86236d009df77e01be586d3a9b0ba6 SHA1 f4ef6043d753e06b461fd3a4970015b044e4052e SHA256 8957b8c23d369effa5b15936e9a6728cbbe2db81e03329b67df7c44c7b81f8fd
DIST xsp-2.10.2.tar.bz2 284801 RMD160 9d1097b3d841f48764480d144dc8aff0b8011ce2 SHA1 cab9218c56bb9f6e1a8e8e56c3b97ac2eac27bec SHA256 f4657f724167244d9baedf94e1d5747b8f1f53c339c7a11897154c1eb1289d4e
+EBUILD xsp-2.10.2-r1.ebuild 1037 RMD160 90de8e6251bb2c8c078f3510e0d041fe69dd5cbd SHA1 4af68974b7e7e3800905b592708c3892b8f148b2 SHA256 73ad0227dab20892f59e325fd518934c19bc0ac6186d01775111476616d20679
EBUILD xsp-2.10.2.ebuild 1030 RMD160 04bd5629d05799bd8bfae7957c2d9c55125f8afb SHA1 90dc36dfc74e1bf53d7b796e0775166978e9128f SHA256 b1df199e38e6e25070e717c4be9b2856e23a2929d2da1272fcc4f6b81d3b2ca7
-MISC ChangeLog 16741 RMD160 56fb75bea3ef78eb6ab52db9c8fec37191489296 SHA1 8d98547de598df9afb8dd3879d893f263860d6c3 SHA256 6954679b734ec998ea896860033212d3f275b2248c13ad2105f9ae38ed064420
+MISC ChangeLog 16954 RMD160 7cd493285bfeae2396392d0b7c77c47f9e8516a3 SHA1 69cf35205cc03079f541d8fbada67bca94770be2 SHA256 2b914da12f9e34e06e37e1bc9039156649b0c4d0200f79d29ebc04eaa368c78d
MISC metadata.xml 309 RMD160 05700031027d9bc650179164f50cf2805e53bb43 SHA1 5bb2b3be36d0e45710b9c02c217c97a76dfc77c1 SHA256 1a04b4ee014e693577e1a05accf4670bf3d4461e5b5ded22dfe285fa929e0369
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk8b8NAACgkQCaWpQKGI+9TV7wCfVNBXhxQo6M9btoGf2nitlNbI
-0VcAn1a979IuWiR25YS6XolATJ5uMpev
-=6EQh
+iEYEARECAAYFAk8cBwsACgkQCaWpQKGI+9SF1wCfbwp/FQj4jIMpqKgSLpnYLaFI
+DgcAn3kmx+jlJ0G0IvtM9B3eXN4l1DQU
+=UHx7
-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..9e466461da80
--- /dev/null
+++ b/dev-dotnet/xsp/files/2.2/mod-mono-server-r1.initd
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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/xsp-2.10.2-r1.ebuild b/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild
new file mode 100644
index 000000000000..98ea509d8c71
--- /dev/null
+++ b/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-2.10.2-r1.ebuild,v 1.1 2012/01/22 12:54:29 pacho Exp $
+
+EAPI="4"
+inherit go-mono mono
+
+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_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
+}