* [gentoo-commits] repo/gentoo:master commit in: www-servers/xsp/files/2.2/, acct-group/aspnet/, www-servers/xsp/files/systemd/, ...
@ 2025-02-02 17:27 Maciej Barć
0 siblings, 0 replies; only message in thread
From: Maciej Barć @ 2025-02-02 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 4a418e08e35532850239d0a0af48d99669313008
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 17:16:28 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 17:27:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a418e08
www-servers/xsp: treeclean
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
acct-group/aspnet/aspnet-0-r2.ebuild | 8 --
acct-group/aspnet/metadata.xml | 5 --
acct-user/aspnet/aspnet-0-r2.ebuild | 13 ----
acct-user/aspnet/metadata.xml | 5 --
profiles/package.mask | 9 ---
www-servers/xsp/Manifest | 1 -
www-servers/xsp/files/2.2/mod-mono-server-r1.initd | 82 -------------------
www-servers/xsp/files/2.2/mod-mono-server.confd | 33 --------
www-servers/xsp/files/2.2/xsp.confd | 11 ---
www-servers/xsp/files/2.2/xsp.initd | 37 ---------
www-servers/xsp/files/aclocal-fix.patch | 13 ----
www-servers/xsp/files/systemd/mono-xsp4.service | 15 ----
www-servers/xsp/files/systemd/mono.webapp | 10 ---
www-servers/xsp/metadata.xml | 14 ----
www-servers/xsp/xsp-4.7.1-r1.ebuild | 91 ----------------------
www-servers/xsp/xsp-4.7.1-r2.ebuild | 78 -------------------
16 files changed, 425 deletions(-)
diff --git a/acct-group/aspnet/aspnet-0-r2.ebuild b/acct-group/aspnet/aspnet-0-r2.ebuild
deleted file mode 100644
index 251b49c23f49..000000000000
--- a/acct-group/aspnet/aspnet-0-r2.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=216
diff --git a/acct-group/aspnet/metadata.xml b/acct-group/aspnet/metadata.xml
deleted file mode 100644
index b6f7dd3aac4d..000000000000
--- a/acct-group/aspnet/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/acct-user/aspnet/aspnet-0-r2.ebuild b/acct-user/aspnet/aspnet-0-r2.ebuild
deleted file mode 100644
index 308a7f8b6aa6..000000000000
--- a/acct-user/aspnet/aspnet-0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for the www-servers/xsp dotnet server"
-
-ACCT_USER_ID=216
-ACCT_USER_GROUPS=( aspnet )
-
-acct-user_add_deps
diff --git a/acct-user/aspnet/metadata.xml b/acct-user/aspnet/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/acct-user/aspnet/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 337352ac1a0a..edc1a358b43e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -282,15 +282,6 @@ media-plugins/gst-plugins-kate
# Removal on 2025-03-03 unless upstream fixes the issue
net-im/whatsie
-# Maciej Barć <xgqt@gentoo.org> (2025-01-02)
-# Upstream dead, repo archived (https://github.com/mono/xsp). Uses deprecated
-# "dotnet" eclass. Depends on old mono. As a replacement one can use official
-# .NET 6.0-9.0 ASP.NET instead.
-# Removal on 2025-02-02
-acct-group/aspnet
-acct-user/aspnet
-www-servers/xsp
-
# Nowa Ammerlaan <nowa@gentoo.org> (2025-01-01)
# Broken with Qt6 and in wayland sessions. Archived upstream. Has been on life
# support for several years already.
diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
deleted file mode 100644
index 02afb57cad8a..000000000000
--- a/www-servers/xsp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xsp-4.7.1.tar.gz 307143 BLAKE2B f8a3a09d644d567728e6462df553ff52fdbd17e974dc25aeebd011e7b6c22ef76be69cc49acfd1cdd9edbd30728ce6b7ef5f33ecda50653db219863b17442b36 SHA512 f106b073bc17ae8fafcffdf2f0db7284f36b62b648fd79321a0de7f5ed15085a9116deccf464e72b3e6f5daf8d65d0a6a3d55c1b275546a4762fa3236bd58e2b
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
deleted file mode 100644
index 22d7ba9af428..000000000000
--- a/www-servers/xsp/files/2.2/mod-mono-server-r1.initd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index 6c6836b9561b..000000000000
--- a/www-servers/xsp/files/2.2/mod-mono-server.confd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Config file for /etc/init.d/mod-mono-server
-
-# 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/xsp.confd b/www-servers/xsp/files/2.2/xsp.confd
deleted file mode 100644
index e4f79aafa5e5..000000000000
--- a/www-servers/xsp/files/2.2/xsp.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for /etc/init.d/xsp
-
-# 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
deleted file mode 100644
index 6ac7bbf87c0b..000000000000
--- a/www-servers/xsp/files/2.2/xsp.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index 3e96f8f42a4c..000000000000
--- a/www-servers/xsp/files/aclocal-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -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
deleted file mode 100644
index 3e5f60291953..000000000000
--- a/www-servers/xsp/files/systemd/mono-xsp4.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[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
deleted file mode 100644
index 3f611b1e2374..000000000000
--- a/www-servers/xsp/files/systemd/mono.webapp
+++ /dev/null
@@ -1,10 +0,0 @@
-<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>
diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml
deleted file mode 100644
index cda34a1c0dff..000000000000
--- a/www-servers/xsp/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="developer">creates .mdb files for either Release and Debug</flag>
- <flag name="net35">use .NET 3.5 Framework</flag>
- <flag name="net40">use .NET 4.0 Framework</flag>
- <flag name="net45">use .NET 4.5 Framework</flag>
- </use>
- <upstream>
- <remote-id type="github">mono/xsp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/www-servers/xsp/xsp-4.7.1-r1.ebuild b/www-servers/xsp/xsp-4.7.1-r1.ebuild
deleted file mode 100644
index 4154434c600a..000000000000
--- a/www-servers/xsp/xsp-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_DOTNET="net35 net40 net45"
-inherit autotools dotnet systemd
-
-DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
-HOMEPAGE="https://www.mono-project.com/ASP.NET"
-SRC_URI="https://github.com/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="developer doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-db/sqlite:3"
-RDEPEND="
- ${DEPEND}
- acct-group/aspnet
- acct-user/aspnet
-"
-
-PATCHES=(
- "${FILESDIR}/aclocal-fix.patch"
-)
-
-METAFILETOBUILD=xsp.sln
-
-src_prepare() {
- default
-
- eaclocal -I build/m4/shamrock -I build/m4/shave ${ACLOCAL_FLAGS}
- if test -z "${NO_LIBTOOLIZE}" ; then
- _elibtoolize --force --copy
- fi
-
- eautoconf
- eautomake --gnu --add-missing --force --copy
-}
-
-src_configure() {
- local myeconfargs=(
- "--enable-maintainer-mode"
- )
-
- use test && myeconfargs+=( "--with_unit_tests" )
- use doc || myeconfargs+=( "--disable-docs" )
-
- econf "${myeconfargs[@]}"
-}
-
-#src_compile() {
-# exbuild xsp.sln
-#
-# if use developer ; then
-# exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
-# else
-# exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
-# fi
-#}
-
-src_install() {
- default
-
- local PATCHDIR="${FILESDIR}/2.2/"
-
- 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
-
- # 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
-}
diff --git a/www-servers/xsp/xsp-4.7.1-r2.ebuild b/www-servers/xsp/xsp-4.7.1-r2.ebuild
deleted file mode 100644
index 8a89773c5328..000000000000
--- a/www-servers/xsp/xsp-4.7.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_DOTNET="net35 net40 net45"
-inherit autotools dotnet systemd
-
-DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
-HOMEPAGE="https://www.mono-project.com/ASP.NET/"
-SRC_URI="https://github.com/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-db/sqlite:3"
-RDEPEND="
- ${DEPEND}
- acct-group/aspnet
- acct-user/aspnet
-"
-
-PATCHES=(
- "${FILESDIR}/aclocal-fix.patch"
-)
-
-METAFILETOBUILD=xsp.sln
-
-src_prepare() {
- default
-
- eaclocal -I build/m4/shamrock -I build/m4/shave ${ACLOCAL_FLAGS}
- if test -z "${NO_LIBTOOLIZE}" ; then
- _elibtoolize --force --copy
- fi
-
- eautoconf
- eautomake --gnu --add-missing --force --copy
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-maintainer-mode
- $(use_with test unit-tests)
- $(use_enable doc docs)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- local PATCHDIR="${FILESDIR}/2.2/"
-
- 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
-
- # 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
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-02-02 17:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-02 17:27 [gentoo-commits] repo/gentoo:master commit in: www-servers/xsp/files/2.2/, acct-group/aspnet/, www-servers/xsp/files/systemd/, Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox