summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Helmert III <ajak@gentoo.org>2022-09-18 16:13:44 -0500
committerJohn Helmert III <ajak@gentoo.org>2022-09-18 16:13:44 -0500
commit44bfe46214a944653ef401cc30789b44b71e1957 (patch)
treefe058aa0e3dad9dad159a363705f9469dc38a53d
parentmedia-gfx/gif2apng: treeclean (diff)
downloadgentoo-44bfe46214a944653ef401cc30789b44b71e1957.tar.gz
gentoo-44bfe46214a944653ef401cc30789b44b71e1957.tar.bz2
gentoo-44bfe46214a944653ef401cc30789b44b71e1957.zip
www-servers/thttpd: treeclean
Bug: https://bugs.gentoo.org/769758 Signed-off-by: John Helmert III <ajak@gentoo.org>
-rw-r--r--profiles/package.mask5
-rw-r--r--www-servers/thttpd/Manifest1
-rw-r--r--www-servers/thttpd/files/thttpd-renamed-htpasswd.patch108
-rw-r--r--www-servers/thttpd/files/thttpd.conf.sample38
-rw-r--r--www-servers/thttpd/files/thttpd.confd.135
-rw-r--r--www-servers/thttpd/files/thttpd.init.134
-rw-r--r--www-servers/thttpd/files/thttpd.logrotate12
-rw-r--r--www-servers/thttpd/metadata.xml11
-rw-r--r--www-servers/thttpd/thttpd-2.27.1-r2.ebuild67
-rw-r--r--www-servers/thttpd/thttpd-9999.ebuild67
10 files changed, 0 insertions, 378 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 16d712f82da..f9e634cbe18 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -320,11 +320,6 @@ dev-util/bnfc
# See: <https://github.com/martijnbastiaan/doctest-parallel/issues/45>
dev-haskell/doctest-parallel
-# John Helmert III <ajak@gentoo.org> (2022-08-16)
-# Vulnerable, unmaintained upstream, maintainer says it's time for it to
-# go. Removal in 30 days, bug #769758
-www-servers/thttpd
-
# John Helmert III <ajak@gentoo.org> (2022-08-14)
# Vulnerable, unmaintained in Gentoo, EAPI6. Removal in 30 days,
# bug #772209
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
deleted file mode 100644
index 04584dbe634..00000000000
--- a/www-servers/thttpd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST thttpd-2.27.1.tar.gz 96430 BLAKE2B a3b24c0345f65ddb5b6d3b1db2e2fbcad5ec3f664eb86ebfbe6eb28e50b56476f9a1467300b9ec8a2735a97fc9620a396005f3545a7760979284dd8609681e0d SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24
diff --git a/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch b/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch
deleted file mode 100644
index 31e68429dbd..00000000000
--- a/www-servers/thttpd/files/thttpd-renamed-htpasswd.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2c2dfae..e028a0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -42,12 +42,6 @@ if test "x${WEBDIR}" = "x" ; then
- WEBDIR='/usr/local/www'
- fi
-
--AC_ARG_VAR(WEBGROUP, [The group that the web server will run as])
--
--if test "x${WEBGROUP}" = "x" ; then
-- WEBGROUP='thttpd'
--fi
--
- AC_CONFIG_FILES([Makefile
- docs/Makefile
- extras/Makefile
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 303c25f..2823290 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1 +1 @@
--dist_man_MANS = htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8
-+dist_man_MANS = th_htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8
-diff --git a/docs/htpasswd.1 b/docs/htpasswd.1
-deleted file mode 100644
-index 1124b02..0000000
---- a/docs/htpasswd.1
-+++ /dev/null
-@@ -1,16 +0,0 @@
--.TH htpasswd 1 "05 May 1998"
--.SH NAME
--htpasswd - manipulate HTTP-server password files
--.SH SYNOPSIS
--.B htpasswd
--.RB [ -c ]
--.I passwordfile
--.I username
--.SH DESCRIPTION
--.PP
--Sets a user's password in an httpd-style password file.
--The -c flag creates a new file.
--.SH AUTHOR
--Rob McCool.
--Modified 29aug97 by Jef Poskanzer to accept new password on stdin,
--if stdin is a pipe or file. This is necessary for use from CGI.
-diff --git a/docs/th_htpasswd.1 b/docs/th_htpasswd.1
-new file mode 100644
-index 0000000..f524af9
---- /dev/null
-+++ b/docs/th_htpasswd.1
-@@ -0,0 +1,16 @@
-+.TH th_htpasswd 1 "05 May 1998"
-+.SH NAME
-+th_htpasswd - manipulate HTTP-server password files
-+.SH SYNOPSIS
-+.B th_htpasswd
-+.RB [ -c ]
-+.I passwordfile
-+.I username
-+.SH DESCRIPTION
-+.PP
-+Sets a user's password in an httpd-style password file.
-+The -c flag creates a new file.
-+.SH AUTHOR
-+Rob McCool.
-+Modified 29aug97 by Jef Poskanzer to accept new password on stdin,
-+if stdin is a pipe or file. This is necessary for use from CGI.
-diff --git a/docs/thttpd.8 b/docs/thttpd.8
-index a0fd334..78af884 100644
---- a/docs/thttpd.8
-+++ b/docs/thttpd.8
-@@ -270,7 +270,7 @@ called .htpasswd by default.
- This file is formatted as the familiar colon-separated
- username/encrypted-password pair, records delimited by newlines.
- The protection does not carry over to subdirectories.
--The utility program htpasswd(1) is included to help create and
-+The utility program th_htpasswd(1) is included to help create and
- modify .htpasswd files.
- .PP
- Relevant thttpd.h option: AUTH_FILE
-@@ -562,7 +562,7 @@ This is a little tricky to set up correctly, for instance if you are using
- chroot() then the log file must be within the chroot tree, but it's
- definitely doable.
- .SH "SEE ALSO"
--redirect(8), ssi(8), makeweb(1), htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
-+redirect(8), ssi(8), makeweb(1), th_htpasswd(1), syslogtocern(8), weblog_parse(1), http_get(1)
- .SH THANKS
- .PP
- Many thanks to contributors, reviewers, testers:
-diff --git a/extras/Makefile.am b/extras/Makefile.am
-index b1f3b4d..ffd19d7 100644
---- a/extras/Makefile.am
-+++ b/extras/Makefile.am
-@@ -1,11 +1,7 @@
- AM_CPPFLAGS = -DWEBDIR='"$(WEBDIR)"'
-
--sbin_PROGRAMS = makeweb htpasswd
-+sbin_PROGRAMS = makeweb th_htpasswd
- makeweb_SOURCES = makeweb.c
--htpasswd_SOURCES = htpasswd.c
-+th_htpasswd_SOURCES = th_htpasswd.c
-
- dist_sbin_SCRIPTS = syslogtocern
--
--install-exec-hook:
-- chgrp $(WEBGROUP) $(DESTDIR)$(sbindir)/makeweb
-- chmod 2751 $(DESTDIR)$(sbindir)/makeweb
diff --git a/www-servers/thttpd/files/thttpd.conf.sample b/www-servers/thttpd/files/thttpd.conf.sample
deleted file mode 100644
index 462bd0c198d..00000000000
--- a/www-servers/thttpd/files/thttpd.conf.sample
+++ /dev/null
@@ -1,38 +0,0 @@
-## /etc/thttpd.conf
-##
-## do not leave empty lines in here!
-## format is: key=value
-##
-## run in debug-mode?
-#debug
-##
-## what interface to bind to?
-## (default is binding to any interface)
-#host=www.example.org
-port=80
-user=thttpd
-##
-## CGI:
-## ? match a single char
-## * matches any string excluding "/"
-## ** matches any string including "/"
-## separate multiple patterns with "|"
-#cgipat=**.sh|**.cgi
-##
-## chroot:
-chroot
-#nochroot
-##
-logfile=/var/log/thttpd.log
-pidfile=/var/run/thttpd.pid
-##
-charset=iso-8859-1
-##
-## control the caching: (in secs)
-#maxage 60
-##
-## virtual hosting:
-#vhost
-##
-## cache-control: send this "max-age" in all HTTP-responses:
-#max-age=0
diff --git a/www-servers/thttpd/files/thttpd.confd.1 b/www-servers/thttpd/files/thttpd.confd.1
deleted file mode 100644
index b5f630e7ecc..00000000000
--- a/www-servers/thttpd/files/thttpd.confd.1
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-## Config file for /etc/init.d/thttpd
-
-## the startup-dir of thttpd is the docroot, so we specify it here
-## and the init-script does a "cd" prior to startup:
-THTTPD_DOCROOT="/var/www/localhost"
-
-## There are 2 ways to configure thttpd:
-## 1) specify all params on the cmd-line
-## 2) use a config-file (and start with "-C <conf-file>")
-
-## For additional thttpd instances, run:
-# ln -s /etc/init.d/thttpd /etc/init.d/thttpd.$NAME
-# cp /etc/conf.d/thttpd /etc/conf.d/thttpd.$NAME
-
-## Note: 1) and 2) can be mixed but
-## the init-script set PID (option -i) to
-## /var/run/thttpd.$NAME.run
-## and logfile (option -l) to
-## /var/log/thttpd.$NAME.log
-##
-## We choose 1) here -- if you have a more complicated setup read
-## thttpd(8) for details on 2).
-
-THTTPD_OPTS="-p 80 -u thttpd -r"
-
-## For a more complex setup (e.g. cgi-support) use an external configfile:
-## comment the THTTPD_OPTS line above und use the one below.
-#THTTPD_OPTS="-C /etc/thttpd/thttpd.conf"
-
-## If you know what you are doing you can add cgi-support with the line below;
-## but you _should_ use the extern-configfile version!
-#THTTPD_OPTS="$THTTPD_OPTS -c **.cgi|**.sh"
diff --git a/www-servers/thttpd/files/thttpd.init.1 b/www-servers/thttpd/files/thttpd.init.1
deleted file mode 100644
index 3b7756eae19..00000000000
--- a/www-servers/thttpd/files/thttpd.init.1
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v3 or later
-
-depend() {
- need net
- use dns logger netmount
- after sshd
-}
-
-checkconfig() {
- if [ ! -d "$THTTPD_DOCROOT" ]; then
- eend 1 "THTTPD_DOCROOT not set correctly in /etc/conf.d/${SVCNAME}"
- fi
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
-
- checkconfig || return 1
-
- start-stop-daemon --quiet --start --exec /usr/sbin/thttpd \
- --pidfile /var/run/${SVCNAME}.pid --chdir "$THTTPD_DOCROOT" -- \
- -i /var/run/${SVCNAME}.pid \
- -l /var/log/${SVCNAME}.log \
- ${THTTPD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --quiet --stop --pidfile /var/run/${SVCNAME}.pid
- eend $?
-}
diff --git a/www-servers/thttpd/files/thttpd.logrotate b/www-servers/thttpd/files/thttpd.logrotate
deleted file mode 100644
index 7e75c813524..00000000000
--- a/www-servers/thttpd/files/thttpd.logrotate
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/thttpd.log {
- daily
- rotate 5
- compress
- delaycompress
- missingok
- notifempty
- sharedscripts
- postrotate
- kill -HUP `cat /var/run/thttpd.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
diff --git a/www-servers/thttpd/metadata.xml b/www-servers/thttpd/metadata.xml
deleted file mode 100644
index a10f670bebb..00000000000
--- a/www-servers/thttpd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
- <upstream>
- <remote-id type="github">blueness/sthttpd</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/www-servers/thttpd/thttpd-2.27.1-r2.ebuild b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
deleted file mode 100644
index bab74ced788..00000000000
--- a/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} = 9999* ]]
-then
- EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
- inherit git-r3
-else
- MY_P="s${P}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/blueness/sthttpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-RDEPEND="
- acct-group/thttpd
- acct-user/thttpd
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-
-WEBROOT="/var/www/localhost"
-
-src_prepare() {
- eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
- mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
- eapply_user
- eautoreconf -f -i
-}
-
-src_configure() {
- econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/thttpd.init.1 thttpd
- newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/thttpd.logrotate" thttpd
-
- insinto /etc/thttpd
- doins "${FILESDIR}"/thttpd.conf.sample
-
- # move htdocs to docdir, bug #429632
- docompress -x /usr/share/doc/"${PF}"/htdocs.dist
- mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
- mkdir "${ED}"/${WEBROOT}/htdocs || die
-
- keepdir ${WEBROOT}/htdocs
-
- chown root:thttpd "${ED}/usr/sbin/makeweb" || die
- chmod 2751 "${ED}/usr/sbin/makeweb" || die
- chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
-}
diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
deleted file mode 100644
index d26b6c0b54f..00000000000
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} = 9999* ]]
-then
- EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
- inherit git-r3
-else
- MY_P="s${P}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/blueness/sthttpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-RDEPEND="
- acct-group/thttpd
- acct-user/thttpd
- virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-
-WEBROOT="/var/www/localhost"
-
-src_prepare() {
- eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
- mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
- eapply_user
- eautoreconf -f -i
-}
-
-src_configure() {
- econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/thttpd.init.1 thttpd
- newconfd "${FILESDIR}"/thttpd.confd.1 thttpd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/thttpd.logrotate" thttpd
-
- insinto /etc/thttpd
- doins "${FILESDIR}"/thttpd.conf.sample
-
- # move htdocs to docdir, bug #429632
- docompress -x /usr/share/doc/"${PF}"/htdocs.dist
- mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
- mkdir "${ED}"/${WEBROOT}/htdocs || die
-
- keepdir ${WEBROOT}/htdocs
-
- chown root:thttpd "${ED}/usr/sbin/makeweb" || die
- chmod 2751 "${ED}/usr/sbin/makeweb" || die
- chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
-}