From 118af332af6d7ad54f44971d372b74e165b2806c Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 30 Jun 2021 19:38:17 +0100 Subject: www-servers/thttpd: add missing libcrypt dependency Signed-off-by: Sam James --- www-servers/thttpd/thttpd-2.27.1-r1.ebuild | 79 +++++++++++++++++++++++++++++ www-servers/thttpd/thttpd-2.27.1.ebuild | 80 ------------------------------ www-servers/thttpd/thttpd-9999.ebuild | 5 +- 3 files changed, 81 insertions(+), 83 deletions(-) create mode 100644 www-servers/thttpd/thttpd-2.27.1-r1.ebuild delete mode 100644 www-servers/thttpd/thttpd-2.27.1.ebuild diff --git a/www-servers/thttpd/thttpd-2.27.1-r1.ebuild b/www-servers/thttpd/thttpd-2.27.1-r1.ebuild new file mode 100644 index 000000000000..c7f0958f6ecc --- /dev/null +++ b/www-servers/thttpd/thttpd-2.27.1-r1.ebuild @@ -0,0 +1,79 @@ +# 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.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild deleted file mode 100644 index ecb3a592c1ab..000000000000 --- a/www-servers/thttpd/thttpd-2.27.1.ebuild +++ /dev/null @@ -1,80 +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" -IUSE="" - -RDEPEND="" -DEPEND="" - -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-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild index babc844058e0..4a0042d502cb 100644 --- a/www-servers/thttpd/thttpd-9999.ebuild +++ b/www-servers/thttpd/thttpd-9999.ebuild @@ -21,10 +21,9 @@ HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd" LICENSE="BSD GPL-2" SLOT="0" -IUSE="" -RDEPEND="" -DEPEND="" +RDEPEND="virtual/libcrypt:=" +DEPEND="${RDEPEND}" WEBROOT="/var/www/localhost" -- cgit v1.2.3-65-gdbad