From f39c6dab71f5188f95650d367ece1df4f263e474 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Sep 2022 23:20:40 +0100 Subject: gentoo auto-resync : 18:09:2022 - 23:20:40 --- www-servers/thttpd/Manifest | 9 -- .../thttpd/files/thttpd-renamed-htpasswd.patch | 108 --------------------- www-servers/thttpd/files/thttpd.conf.sample | 38 -------- www-servers/thttpd/files/thttpd.confd.1 | 35 ------- www-servers/thttpd/files/thttpd.init.1 | 34 ------- www-servers/thttpd/files/thttpd.logrotate | 12 --- www-servers/thttpd/metadata.xml | 11 --- www-servers/thttpd/thttpd-2.27.1-r2.ebuild | 67 ------------- www-servers/thttpd/thttpd-9999.ebuild | 67 ------------- 9 files changed, 381 deletions(-) delete mode 100644 www-servers/thttpd/Manifest delete mode 100644 www-servers/thttpd/files/thttpd-renamed-htpasswd.patch delete mode 100644 www-servers/thttpd/files/thttpd.conf.sample delete mode 100644 www-servers/thttpd/files/thttpd.confd.1 delete mode 100644 www-servers/thttpd/files/thttpd.init.1 delete mode 100644 www-servers/thttpd/files/thttpd.logrotate delete mode 100644 www-servers/thttpd/metadata.xml delete mode 100644 www-servers/thttpd/thttpd-2.27.1-r2.ebuild delete mode 100644 www-servers/thttpd/thttpd-9999.ebuild (limited to 'www-servers/thttpd') diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest deleted file mode 100644 index 9c41e38df79a..000000000000 --- a/www-servers/thttpd/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX thttpd-renamed-htpasswd.patch 3387 BLAKE2B c1a42e454f380168d416a311fc893194dba87bc460c9d319d26264204832be8654195b960b591238920922b5c89360a94d49eb581ebaf9800ee597095e408f12 SHA512 0f0622ab8548ea3d3ba5f25d92d4d31f17bcd9baee3a8d0dc0d6c227b708e36bae681ace984e94f1c5e7def264866d27196a0b4c54af612ff0479d7a39a43475 -AUX thttpd.conf.sample 670 BLAKE2B 92d17d523837be7fd52e327e28318257ba38a391627dda0e10c420b193fc0c2b37876dacb64108c61e31de0581a7339db60027b2e4ac955e03d3593a7806961c SHA512 97c8582438518bf528b6d419fdb7bd94668e91e6b7033a3ed5cda4afb3539e38bf24aea5ae4b138ff2c561c95003e7f85cfa7ce88cd97e8cbbf558bc4147d2c6 -AUX thttpd.confd.1 1263 BLAKE2B 69cbb0fe3675b809183d10f6418c8e4d5d9d19d9768a64400d77b82f1bd957b0fcf5038d1317344174537e062bb7f9b662612fbe09bc41510fde009dfa7ee865 SHA512 83b8d5aebf180c398e27695bcfc9b847f6535302b4521be460ffd2e867b20fcf1083bcacdb605e557038c54631546a7ee1ba928611a6a23d786fb9f6ef9e0ee0 -AUX thttpd.init.1 735 BLAKE2B c50383feccbae81c835ccb1f0803001474dec2790916634b375b958357ca02d66f933fd7f0091f9a9918220101b1150c6e39a53bc26c29d6c6329339dbe0f1ed SHA512 991b8153fa030026e3fadc0b838b26fda75ab706e4fdaf1195931ed63be15dde290e4e3653951c78f41ec70464ed2d3dd984dc10bee4551cbf069435d447bea1 -AUX thttpd.logrotate 197 BLAKE2B 8b801de472c4c7902abf133218a6df79023bf54023c0217576ef1a23a30d4905b3d7815fbcfe3c3254a9ed86d137d1bf681f2fa187325a57442dd05ac4ded7c6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd -DIST thttpd-2.27.1.tar.gz 96430 BLAKE2B a3b24c0345f65ddb5b6d3b1db2e2fbcad5ec3f664eb86ebfbe6eb28e50b56476f9a1467300b9ec8a2735a97fc9620a396005f3545a7760979284dd8609681e0d SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24 -EBUILD thttpd-2.27.1-r2.ebuild 1653 BLAKE2B e829a3813f6225ae16a5bffe7b3e620e474000b991ada02698617a514b5daeab65a38ded09d98f303c37ee0dc011bdc948ce7b081e57b72191437ae63695e362 SHA512 a01f8ad22d5e8b0f698fe7d9ce4c225512fcbb07635baf823c4dc7877cf51c122adb2f597caa160090c6c8a18a2aaa006355b69d6bc0b87234d9d12267c294ba -EBUILD thttpd-9999.ebuild 1659 BLAKE2B fa6230f1d75f5b461b3885016f7a98c8b04008b4808f2f845998e4e51796b7d107e095aff57d908daf01721a858100a3d64cce7ce8d44e5c4870a73dd5fe6961 SHA512 2cc8f1ac1979fb148371ab69d7e9b40fb3ef74d7985755f75c6b5d817aec7aa97caea2231eafb7ec3f5b1be9d8c9b5cc8873079b351fc672d78fe4d5940d054d -MISC metadata.xml 334 BLAKE2B c0c550f075fcafb2bf6e135fe5aa3107c6218a13a44eee0bfba3c094df3586b189ee7d017c7faaa4734b2a662ab6b802511ab09b267794da9c0032f051e9a793 SHA512 f470fd65a85f110bb12c7e3f9bef4e5c9461e02af22329287914a448ca95e38ae147cd48606e275492b6d301706142355cd0c6b23b06d74d55dcb606d7826753 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 31e68429dbd6..000000000000 --- 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 462bd0c198d0..000000000000 --- 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 b5f630e7ecc2..000000000000 --- 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 ") - -## 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 3b7756eae19a..000000000000 --- 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 7e75c813524a..000000000000 --- 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 a10f670bebb5..000000000000 --- a/www-servers/thttpd/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - blueness@gentoo.org - Anthony G. Basile - - - blueness/sthttpd - - 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 bab74ced7884..000000000000 --- 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 d26b6c0b54f5..000000000000 --- 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 -} -- cgit v1.2.3