public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2017-06-08 12:23 Anthony G. Basile
  0 siblings, 0 replies; 11+ messages in thread
From: Anthony G. Basile @ 2017-06-08 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     333c7bca37e7d00b69fc4aed5aeaa1b84877e2e5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 12:23:01 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 12:23:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333c7bca

www-servers/thttpd: use eapply rather than epatch with EAPI=6

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 www-servers/thttpd/thttpd-2.27.1.ebuild | 4 ++--
 www-servers/thttpd/thttpd-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-servers/thttpd/thttpd-2.27.1.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
index 444e9199858..de37464fa18 100644
--- a/www-servers/thttpd/thttpd-2.27.1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools eutils flag-o-matic toolchain-funcs user
+inherit autotools flag-o-matic toolchain-funcs user
 
 if [[ ${PV} = 9999* ]]
 then
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/thttpd-renamed-htpasswd.patch
+	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
 	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
 	eapply_user
 	eautoreconf -f -i

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 444e9199858..de37464fa18 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools eutils flag-o-matic toolchain-funcs user
+inherit autotools flag-o-matic toolchain-funcs user
 
 if [[ ${PV} = 9999* ]]
 then
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/thttpd-renamed-htpasswd.patch
+	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
 	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
 	eapply_user
 	eautoreconf -f -i


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2017-06-08 12:23 Anthony G. Basile
  0 siblings, 0 replies; 11+ messages in thread
From: Anthony G. Basile @ 2017-06-08 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     16c437b88f1dad5bc0a6d2871a406f9d105e1192
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 12:14:53 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 12:23:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c437b8

www-servers/thttpd: version bump to 2.27.1

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 www-servers/thttpd/Manifest                           |  1 +
 .../{thttpd-9999.ebuild => thttpd-2.27.1.ebuild}      | 19 ++++++++++---------
 www-servers/thttpd/thttpd-9999.ebuild                 | 19 ++++++++++---------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 65853b6ecb9..8a4f8a09313 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,2 +1,3 @@
 DIST sthttpd-2.26.4.tar.gz 194544 SHA256 78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bfaaaa7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87 WHIRLPOOL e38cce33dd417ce8e30426d0764797e24ebfab2060bacf2f27ee2717b2025e48e6f32245cc6a5ebfed856f8755098f1540ec7ed2005aad1aeff65454dd731c1a
 DIST sthttpd-2.27.0.tar.gz 206781 SHA256 97d660a881331e93818e872ce11536f461105d70a18dfc5de5895851c4b2afdb SHA512 78945867a01de2f9019deb2d1f21cdedf675c9d67f5de672d0d0bfdc397b444ac287a91d96976dddcdca080cc944e72dd3d1f95f31a592eb839125c494799bdc WHIRLPOOL 55ab90405b3affcb260dc4cfa14008f79cc0b2fd808686078b34ae0a6be2cc4941241406d78f9c2d06360ab6a07f1bf4abc1cf814a46ebe136f031058026419f
+DIST thttpd-2.27.1.tar.gz 96430 SHA256 a1ee2806432eaf5b5dd267a0523701f9f1fa00fefd499d5bec42165a41e05846 SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24 WHIRLPOOL e64b132e83b459fb0ab6da6f3a15c4a603f8d4f53f123cabccc82077506a258c616c2703992b671e9193c26c452bd3b6908ebfadfb15301f1e34f8925303f625

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
similarity index 80%
copy from www-servers/thttpd/thttpd-9999.ebuild
copy to www-servers/thttpd/thttpd-2.27.1.ebuild
index 08393701c50..444e9199858 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit autotools eutils flag-o-matic toolchain-funcs user
 
 if [[ ${PV} = 9999* ]]
 then
-	EGIT_REPO_URI="git://opensource.dyc.edu/s${PN}.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
+	inherit git-r3
 	KEYWORDS=""
 else
 	MY_P="s${P}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz"
+	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 ~arm-linux ~x86-linux"
 fi
 
@@ -33,7 +33,7 @@ THTTPD_USER=thttpd
 THTTPD_GROUP=thttpd
 THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
 
-DOCS=( README TODO )
+DOCS=( TODO )
 
 pkg_setup() {
 	ebegin "Creating thttpd user and group"
@@ -43,7 +43,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/thttpd-renamed-htpasswd.patch
-	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c}
+	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
+	eapply_user
 	eautoreconf -f -i
 }
 
@@ -66,8 +67,8 @@ src_install () {
 	#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
-	mkdir "${ED}"${WEBROOT}/htdocs
+		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
+	mkdir "${ED}"${WEBROOT}/htdocs || die
 
 	keepdir ${WEBROOT}/htdocs
 

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 08393701c50..444e9199858 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit autotools eutils flag-o-matic toolchain-funcs user
 
 if [[ ${PV} = 9999* ]]
 then
-	EGIT_REPO_URI="git://opensource.dyc.edu/s${PN}.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
+	inherit git-r3
 	KEYWORDS=""
 else
 	MY_P="s${P}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz"
+	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 ~arm-linux ~x86-linux"
 fi
 
@@ -33,7 +33,7 @@ THTTPD_USER=thttpd
 THTTPD_GROUP=thttpd
 THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
 
-DOCS=( README TODO )
+DOCS=( TODO )
 
 pkg_setup() {
 	ebegin "Creating thttpd user and group"
@@ -43,7 +43,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/thttpd-renamed-htpasswd.patch
-	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c}
+	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
+	eapply_user
 	eautoreconf -f -i
 }
 
@@ -66,8 +67,8 @@ src_install () {
 	#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
-	mkdir "${ED}"${WEBROOT}/htdocs
+		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
+	mkdir "${ED}"${WEBROOT}/htdocs || die
 
 	keepdir ${WEBROOT}/htdocs
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2017-06-28 13:19 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2017-06-28 13:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bfdb74e4025360476763fb9d283ff2dcb96619ff
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 13:19:05 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 13:19:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdb74e4

www-servers/thttpd: amd64 stable wrt bug #622306

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 www-servers/thttpd/thttpd-2.27.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/thttpd/thttpd-2.27.1.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
index de37464fa18..9cdabd1918a 100644
--- a/www-servers/thttpd/thttpd-2.27.1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -9,12 +9,12 @@ if [[ ${PV} = 9999* ]]
 then
 	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="amd64"
 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 ~arm-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2017-07-07  6:16 Markus Meier
  0 siblings, 0 replies; 11+ messages in thread
From: Markus Meier @ 2017-07-07  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     902c11865daafed4b86024ed660097054585218f
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 06:16:07 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 06:16:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902c1186

www-servers/thttpd: arm stable, bug #622306

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 www-servers/thttpd/thttpd-2.27.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/thttpd/thttpd-2.27.1.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
index e1068689c3a..17a5baca446 100644
--- a/www-servers/thttpd/thttpd-2.27.1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -9,12 +9,12 @@ if [[ ${PV} = 9999* ]]
 then
 	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
 	inherit git-r3
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 arm x86"
 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 ~arm-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2017-08-17 17:45 Anthony G. Basile
  0 siblings, 0 replies; 11+ messages in thread
From: Anthony G. Basile @ 2017-08-17 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9fdd86b70fca882c39960edf61b8805886820e55
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 17:44:48 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 17:44:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fdd86b7

www-servers/thttpd: remove insecure version, bug #622306

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 www-servers/thttpd/Manifest             |  1 -
 www-servers/thttpd/thttpd-2.27.0.ebuild | 80 ---------------------------------
 2 files changed, 81 deletions(-)

diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index a404b876e5d..4c3ace792cf 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,2 +1 @@
-DIST sthttpd-2.27.0.tar.gz 206781 SHA256 97d660a881331e93818e872ce11536f461105d70a18dfc5de5895851c4b2afdb SHA512 78945867a01de2f9019deb2d1f21cdedf675c9d67f5de672d0d0bfdc397b444ac287a91d96976dddcdca080cc944e72dd3d1f95f31a592eb839125c494799bdc WHIRLPOOL 55ab90405b3affcb260dc4cfa14008f79cc0b2fd808686078b34ae0a6be2cc4941241406d78f9c2d06360ab6a07f1bf4abc1cf814a46ebe136f031058026419f
 DIST thttpd-2.27.1.tar.gz 96430 SHA256 a1ee2806432eaf5b5dd267a0523701f9f1fa00fefd499d5bec42165a41e05846 SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24 WHIRLPOOL e64b132e83b459fb0ab6da6f3a15c4a603f8d4f53f123cabccc82077506a258c616c2703992b671e9193c26c452bd3b6908ebfadfb15301f1e34f8925303f625

diff --git a/www-servers/thttpd/thttpd-2.27.0.ebuild b/www-servers/thttpd/thttpd-2.27.0.ebuild
deleted file mode 100644
index 55c36fe49a0..00000000000
--- a/www-servers/thttpd/thttpd-2.27.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic toolchain-funcs user
-
-if [[ ${PV} = 9999* ]]
-then
-	EGIT_REPO_URI="git://opensource.dyc.edu/s${PN}.git"
-	inherit git-2
-	KEYWORDS="ppc64 sparc"
-else
-	MY_P="s${P}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="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=( README TODO )
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/thttpd-renamed-htpasswd.patch
-	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
-	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"
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2021-02-09 15:33 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-02-09 15:33 UTC (permalink / raw
  To: gentoo-commits

commit:     d5dc18381555f31dbe6a7cddc7b1d4e3f81bce02
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 15:32:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 15:33:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dc1838

www-servers/thttpd: add github HOMEPAGE

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/thttpd/thttpd-2.27.1.ebuild | 4 ++--
 www-servers/thttpd/thttpd-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-servers/thttpd/thttpd-2.27.1.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
index 8cfda663177..bd2cb885c42 100644
--- a/www-servers/thttpd/thttpd-2.27.1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="http://opensource.dyc.edu/sthttpd"
+HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
 
 LICENSE="BSD GPL-2"
 SLOT="0"

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 1ede15252e3..f2eb3dde345 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="http://opensource.dyc.edu/sthttpd"
+HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
 
 LICENSE="BSD GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2021-02-09 15:33 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-02-09 15:33 UTC (permalink / raw
  To: gentoo-commits

commit:     4767fd534d8f095ca1bef92a8a303f385d664ecd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 15:32:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 15:33:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4767fd53

www-servers/thttpd: add github remote-id

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/thttpd/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www-servers/thttpd/metadata.xml b/www-servers/thttpd/metadata.xml
index d920e3ba3e5..8cb9b000a93 100644
--- a/www-servers/thttpd/metadata.xml
+++ b/www-servers/thttpd/metadata.xml
@@ -5,4 +5,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">blueness/sthttpd</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2021-02-09 15:33 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-02-09 15:33 UTC (permalink / raw
  To: gentoo-commits

commit:     1141b2b6c3e31afbab13e5c71ffd3c39a5b6a11a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 15:31:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 15:33:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1141b2b6

www-servers/thttpd: fix metadata indentation

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/thttpd/metadata.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-servers/thttpd/metadata.xml b/www-servers/thttpd/metadata.xml
index d728f56aa6a..d920e3ba3e5 100644
--- a/www-servers/thttpd/metadata.xml
+++ b/www-servers/thttpd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2021-02-15  0:32 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-02-15  0:32 UTC (permalink / raw
  To: gentoo-commits

commit:     a119e99a2bb8d971017569045fc13ad6132e555d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 23:31:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 00:32:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a119e99a

www-servers/thttpd: fix double KEYWORDS

Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.

See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/thttpd/thttpd-2.27.1.ebuild | 1 -
 www-servers/thttpd/thttpd-9999.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/www-servers/thttpd/thttpd-2.27.1.ebuild b/www-servers/thttpd/thttpd-2.27.1.ebuild
index bd2cb885c42..ecb3a592c1a 100644
--- a/www-servers/thttpd/thttpd-2.27.1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1.ebuild
@@ -9,7 +9,6 @@ if [[ ${PV} = 9999* ]]
 then
 	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
 	inherit git-r3
-	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 else
 	MY_P="s${P}"
 	S="${WORKDIR}/${MY_P}"

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index f2eb3dde345..babc844058e 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -9,7 +9,6 @@ if [[ ${PV} = 9999* ]]
 then
 	EGIT_REPO_URI="https://github.com/blueness/sthttpd.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	MY_P="s${P}"
 	S="${WORKDIR}/${MY_P}"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2021-07-20 19:03 Conrad Kostecki
  0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2021-07-20 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     24951530c0eb4ec84533e1e75cd61c1cde2b1929
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 19:45:13 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 19:03:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24951530

www-servers/thttpd: drop old version

Closes: https://bugs.gentoo.org/781548
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 www-servers/thttpd/thttpd-2.27.1-r1.ebuild | 79 ------------------------------
 1 file changed, 79 deletions(-)

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 c7f0958f6ec..00000000000
--- 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"
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/
@ 2021-07-20 19:03 Conrad Kostecki
  0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2021-07-20 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e8f023d8e90b629c4b2fd580525b326a3a540aff
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 19:43:46 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 19:03:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f023d8

www-servers/thttpd: migrate to GLEP 81

Bug: https://bugs.gentoo.org/781548
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...{thttpd-9999.ebuild => thttpd-2.27.1-r2.ebuild} | 42 ++++++++--------------
 www-servers/thttpd/thttpd-9999.ebuild              | 40 ++++++++-------------
 2 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
similarity index 58%
copy from www-servers/thttpd/thttpd-9999.ebuild
copy to www-servers/thttpd/thttpd-2.27.1-r2.ebuild
index 4a0042d502c..bab74ced788 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1-r2.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
@@ -13,7 +13,7 @@ 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"
+	KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
@@ -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
 }

diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 4a0042d502c..d26b6c0b54f 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
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-07-20 19:03 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-09 15:33 [gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-07-20 19:03 Conrad Kostecki
2021-07-20 19:03 Conrad Kostecki
2021-02-15  0:32 Sam James
2021-02-09 15:33 Sam James
2021-02-09 15:33 Sam James
2017-08-17 17:45 Anthony G. Basile
2017-07-07  6:16 Markus Meier
2017-06-28 13:19 Agostino Sarubbo
2017-06-08 12:23 Anthony G. Basile
2017-06-08 12:23 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox