Merge updates from master

This commit is contained in:
Repository QA checks
2015-08-14 05:14:41 -04:00
18 changed files with 72 additions and 66 deletions
-2
View File
@@ -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
-51
View File
@@ -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
}
@@ -19,14 +19,14 @@ 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
>=www-servers/xsp-2
dev-util/ctags
sys-apps/dbus[X]
subversion? ( dev-vcs/subversion )
+2 -2
View File
@@ -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
+2 -2
View File
@@ -6,9 +6,9 @@
# New entries go on top.
# Heather Cynede <cynede@gentoo.org> (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 <kensington@gentoo.org> (12 Aug 2015)
# Requires unreleased dependency
+1
View File
@@ -0,0 +1 @@
DIST xsp-2014.12.zip 632555 SHA256 1d115e3fe0bbcb3957be20e670e086ebddff3acaa5f641a9c143ea46d12e055c SHA512 a9d298079cfae4bacac1575f04e58c3106f532c1f283cc243a8a6560561c0a6b535320d1d3e925c7383bd1f7510f31f115d8e85506e31623c175d7f3f606ab91 WHIRLPOOL a5e06f72f51717682d80f6ac6554320db72a05d6d6c40439196073d118706607f99bf810d82e8cc68cf9e54bd0f7d176cc882fa74babb8d78308cbe7c4d9d8cc
@@ -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
+10
View File
@@ -0,0 +1,10 @@
<web-application>
<name>Root</name>
<vpath>/</vpath>
<path>/usr/lib64/xsp/test</path>
<!-- vhost and port are ignored in xsp.exe -->
<vhost>my.host.name</vhost>
<vport>8084</vport>
<!-- <enabled> is true by default -->
<!-- <enabled>false</enabled> -->
</web-application>
+1
View File
@@ -0,0 +1 @@
@@ -6,4 +6,7 @@
XSP is a standalone web server written in C# that can be used to run
your ASP.NET applications.
</longdescription>
<use>
<flag name='developer'>creates .mdb files for either Release and Debug</flag>
</use>
</pkgmetadata>
@@ -4,23 +4,26 @@
EAPI="5"
USE_DOTNET="net35 net40 net45"
PATCHDIR="${FILESDIR}/2.2/"
inherit base eutils dotnet user autotools autotools-utils
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"
SRC_URI="https://github.com/Heather/xsp/archive/2014.11.tar.gz"
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"
IUSE="doc test developer"
RDEPEND="dev-db/sqlite:3"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${P}
src_prepare() {
epatch "${FILESDIR}/aclocal-fix.patch"
@@ -43,15 +46,26 @@ src_configure() {
use doc || myeconfargs+=("--disable-docs")
eautomake --gnu --add-missing --force --copy #nowarn
autotools-utils_src_configure
./configure || die
}
METAFILETOBUILD=xsp.sln
src_compile() {
autotools-utils_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() {
@@ -61,5 +75,20 @@ src_install() {
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
}