From b49088575eb777ced2551f484da86317332d6087 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Jul 2021 02:11:45 +0100 Subject: gentoo resync : 24.07.2021 --- www-servers/thttpd/Manifest | 4 +- www-servers/thttpd/thttpd-2.27.1-r1.ebuild | 79 ------------------------------ www-servers/thttpd/thttpd-2.27.1-r2.ebuild | 67 +++++++++++++++++++++++++ www-servers/thttpd/thttpd-9999.ebuild | 40 ++++++--------- 4 files changed, 83 insertions(+), 107 deletions(-) delete mode 100644 www-servers/thttpd/thttpd-2.27.1-r1.ebuild create mode 100644 www-servers/thttpd/thttpd-2.27.1-r2.ebuild (limited to 'www-servers/thttpd') diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest index ba4fad0f7929..b9ce779160ea 100644 --- a/www-servers/thttpd/Manifest +++ b/www-servers/thttpd/Manifest @@ -4,6 +4,6 @@ AUX thttpd.confd.1 1263 BLAKE2B 69cbb0fe3675b809183d10f6418c8e4d5d9d19d9768a6440 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-r1.ebuild 1934 BLAKE2B 915d05cdb713af0e5ba8ca0ec57fe926aca871a2d0f2a55ae05e4c42253eca0551b87d3f695ac2463114ca5107060c0412deeecb5a9ed85f9e50455c9375ca10 SHA512 e585083be6c6bc6818b966331adb6288d7803f5857bc1f0b96f7703cfcee952b13a85f482f208c113497fbf1f1d046c36e22194f48dc16072cd7ef2d36923b5e -EBUILD thttpd-9999.ebuild 1940 BLAKE2B 542b9d12e6e25278dcf223f58d47abdb3c0fd23c844e037b25372f9286fdf2998ee76614fbb5dbb947a87def726d1578991ac7cc5c7649079bc3f93e5f0e8d26 SHA512 acbf7b55774926e401d7cdfa1a303c03a9b5d1749fce9c743e3a8506952da2de28dc83dededb6e6381f301c72f8cf14f5d61827c3861ff602af89e4c91244502 +EBUILD thttpd-2.27.1-r2.ebuild 1653 BLAKE2B e829a3813f6225ae16a5bffe7b3e620e474000b991ada02698617a514b5daeab65a38ded09d98f303c37ee0dc011bdc948ce7b081e57b72191437ae63695e362 SHA512 a01f8ad22d5e8b0f698fe7d9ce4c225512fcbb07635baf823c4dc7877cf51c122adb2f597caa160090c6c8a18a2aaa006355b69d6bc0b87234d9d12267c294ba +EBUILD thttpd-9999.ebuild 1659 BLAKE2B fa6230f1d75f5b461b3885016f7a98c8b04008b4808f2f845998e4e51796b7d107e095aff57d908daf01721a858100a3d64cce7ce8d44e5c4870a73dd5fe6961 SHA512 2cc8f1ac1979fb148371ab69d7e9b40fb3ef74d7985755f75c6b5d817aec7aa97caea2231eafb7ec3f5b1be9d8c9b5cc8873079b351fc672d78fe4d5940d054d MISC metadata.xml 333 BLAKE2B 9613233b895b29ad968791a6273aca58fbd161fba4acf4f41cdf4fba8c4623ea1fbac2cc393ae5e4ecda30cb67a039fe2c638e73b9a277113535a0b4eb80fce1 SHA512 7e1d7ed4947be16a3954c510004c21d26f45b4a05dd05102dea5c1f4001787aea9e602862afd204d529c8abb5746c5fe2148ffb533cebbbf38747717b6bf2877 diff --git a/www-servers/thttpd/thttpd-2.27.1-r1.ebuild b/www-servers/thttpd/thttpd-2.27.1-r1.ebuild deleted file mode 100644 index c7f0958f6ecc..000000000000 --- a/www-servers/thttpd/thttpd-2.27.1-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools flag-o-matic toolchain-funcs user - -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="virtual/libcrypt:=" -DEPEND="${RDEPEND}" - -WEBROOT="/var/www/localhost" - -THTTPD_USER=thttpd -THTTPD_GROUP=thttpd -THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs" - -DOCS=( TODO ) - -pkg_setup() { - ebegin "Creating thttpd user and group" - enewgroup ${THTTPD_GROUP} - enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP} -} - -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=${THTTPD_DOCROOT} -} - -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_GROUP} "${ED}/usr/sbin/makeweb" \ - || die "Failed chown makeweb" - chmod 2751 "${ED}/usr/sbin/makeweb" \ - || die "Failed chmod makeweb" - chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \ - || die "Failed chmod printenv" -} diff --git a/www-servers/thttpd/thttpd-2.27.1-r2.ebuild b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild new file mode 100644 index 000000000000..bab74ced7884 --- /dev/null +++ b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild @@ -0,0 +1,67 @@ +# 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 index 4a0042d502cb..d26b6c0b54f5 100644 --- a/www-servers/thttpd/thttpd-9999.ebuild +++ b/www-servers/thttpd/thttpd-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools flag-o-matic toolchain-funcs user +inherit autotools flag-o-matic toolchain-funcs if [[ ${PV} = 9999* ]] then @@ -22,23 +22,15 @@ HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd" LICENSE="BSD GPL-2" SLOT="0" -RDEPEND="virtual/libcrypt:=" +RDEPEND=" + acct-group/thttpd + acct-user/thttpd + virtual/libcrypt:= +" DEPEND="${RDEPEND}" WEBROOT="/var/www/localhost" -THTTPD_USER=thttpd -THTTPD_GROUP=thttpd -THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs" - -DOCS=( TODO ) - -pkg_setup() { - ebegin "Creating thttpd user and group" - enewgroup ${THTTPD_GROUP} - enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP} -} - src_prepare() { eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die @@ -47,7 +39,7 @@ src_prepare() { } src_configure() { - econf WEBDIR=${THTTPD_DOCROOT} + econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs" } src_install() { @@ -62,18 +54,14 @@ src_install() { insinto /etc/thttpd doins "${FILESDIR}"/thttpd.conf.sample - #move htdocs to docdir, bug #429632 + # 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 + mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die + mkdir "${ED}"/${WEBROOT}/htdocs || die keepdir ${WEBROOT}/htdocs - chown root:${THTTPD_GROUP} "${ED}/usr/sbin/makeweb" \ - || die "Failed chown makeweb" - chmod 2751 "${ED}/usr/sbin/makeweb" \ - || die "Failed chmod makeweb" - chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \ - || die "Failed chmod printenv" + 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