[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/, www-servers/thttpd/files/, profiles/

2022-09-18 Thread John Helmert III 
commit: 44bfe46214a944653ef401cc30789b44b71e1957
Author: John Helmert III  gentoo  org>
AuthorDate: Sun Sep 18 21:13:44 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Sep 18 21:13:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bfe462

www-servers/thttpd: treeclean

Bug: https://bugs.gentoo.org/769758
Signed-off-by: John Helmert III  gentoo.org>

 profiles/package.mask  |   5 -
 www-servers/thttpd/Manifest|   1 -
 .../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-.ebuild  |  67 -
 10 files changed, 378 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 16d712f82daa..f9e634cbe188 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -320,11 +320,6 @@ dev-util/bnfc
 # See: 
 dev-haskell/doctest-parallel
 
-# John Helmert III  (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  (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 04584dbe6344..
--- 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 31e68429dbd6..
--- 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..000
 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 000..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
-@@

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2021-07-20 Thread Conrad Kostecki 
commit: e8f023d8e90b629c4b2fd580525b326a3a540aff
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Jul 18 19:43:46 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul 20 19:03:05 2021 +
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  gentoo.org>

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

diff --git a/www-servers/thttpd/thttpd-.ebuild 
b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
similarity index 58%
copy from www-servers/thttpd/thttpd-.ebuild
copy to www-servers/thttpd/thttpd-2.27.1-r2.ebuild
index 4a0042d502c..bab74ced788 100644
--- a/www-servers/thttpd/thttpd-.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} = * ]]
 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-.ebuild 
b/www-servers/thttpd/thttpd-.ebuild
index 4a0042d502c..d26b6c0b54f 100644
--- a/www-servers/thttpd/thttpd-.ebuild
+++ b/www-servers/thttpd/thttpd-.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} = * ]]
 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

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2021-07-20 Thread Conrad Kostecki 
commit: 24951530c0eb4ec84533e1e75cd61c1cde2b1929
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Jul 18 19:45:13 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul 20 19:03:05 2021 +
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  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..000
--- 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} = * ]]
-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"
-}

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2021-02-14 Thread Sam James 
commit: a119e99a2bb8d971017569045fc13ad6132e555d
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 23:31:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 00:32:08 2021 +
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  gentoo.org>

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

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2021-02-09 Thread Sam James 
commit: 1141b2b6c3e31afbab13e5c71ffd3c39a5b6a11a
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 15:31:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 15:33:04 2021 +
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  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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   bluen...@gentoo.org
-   Anthony G. Basile
-
+   
+   bluen...@gentoo.org
+   Anthony G. Basile
+

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2021-02-09 Thread Sam James 
commit: d5dc18381555f31dbe6a7cddc7b1d4e3f81bce02
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 15:32:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 15:33:05 2021 +
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  gentoo.org>

 www-servers/thttpd/thttpd-2.27.1.ebuild | 4 ++--
 www-servers/thttpd/thttpd-.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-.ebuild 
b/www-servers/thttpd/thttpd-.ebuild
index 1ede15252e3..f2eb3dde345 100644
--- a/www-servers/thttpd/thttpd-.ebuild
+++ b/www-servers/thttpd/thttpd-.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"

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2021-02-09 Thread Sam James 
commit: 4767fd534d8f095ca1bef92a8a303f385d664ecd
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 15:32:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 15:33:05 2021 +
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  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 @@
bluen...@gentoo.org
Anthony G. Basile

+   
+   blueness/sthttpd
+

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2017-08-17 Thread Anthony G. Basile 
commit: 9fdd86b70fca882c39960edf61b8805886820e55
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Aug 17 17:44:48 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Aug 17 17:44:48 2017 +
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..000
--- 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} = * ]]
-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"
-}

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/files/

2017-08-09 Thread Anthony G. Basile 
commit: 8d99602315f2674c8c5399cc79b927812ac44dc1
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Aug  9 09:15:46 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Aug  9 12:18:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d996023

www-servers/thttpd: remove unused file

 www-servers/thttpd/files/thttpd.service | 12 
 1 file changed, 12 deletions(-)

diff --git a/www-servers/thttpd/files/thttpd.service 
b/www-servers/thttpd/files/thttpd.service
deleted file mode 100644
index 4e56c0877d7..000
--- a/www-servers/thttpd/files/thttpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Fork of thttpd, a small, fast, multiplexing webserver.
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/thttpd.pid
-WorkingDirectory=/var/www/localhost
-ExecStart=/usr/sbin/thttpd -C /etc/thttpd/thttpd.conf
-
-[Install]
-WantedBy=multi-user.target

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2017-07-07 Thread Markus Meier 
commit: 902c11865daafed4b86024ed660097054585218f
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Jul  7 06:16:07 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Jul  7 06:16:07 2017 +
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} = * ]]
 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"

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2017-06-28 Thread Agostino Sarubbo 
commit: bfdb74e4025360476763fb9d283ff2dcb96619ff
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 28 13:19:05 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 28 13:19:05 2017 +
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  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} = * ]]
 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"

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2017-06-08 Thread Anthony G. Basile 
commit: 16c437b88f1dad5bc0a6d2871a406f9d105e1192
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Jun  8 12:14:53 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jun  8 12:23:14 2017 +
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-.ebuild => thttpd-2.27.1.ebuild}  | 19 ++-
 www-servers/thttpd/thttpd-.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 
64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bf7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87
 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-.ebuild 
b/www-servers/thttpd/thttpd-2.27.1.ebuild
similarity index 80%
copy from www-servers/thttpd/thttpd-.ebuild
copy to www-servers/thttpd/thttpd-2.27.1.ebuild
index 08393701c50..444e9199858 100644
--- a/www-servers/thttpd/thttpd-.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} = * ]]
 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-.ebuild 
b/www-servers/thttpd/thttpd-.ebuild
index 08393701c50..444e9199858 100644
--- a/www-servers/thttpd/thttpd-.ebuild
+++ b/www-servers/thttpd/thttpd-.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} = * ]]
 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

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/, www-servers/thttpd/files/

2017-06-08 Thread Anthony G. Basile 
commit: 0e0d82e2749f750546d2dc1d2fade7a26c232511
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Jun  8 12:19:50 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jun  8 12:23:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0d82e2

www-servers/thttpd: drop older stable versions 2.26.4-r3

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 www-servers/thttpd/Manifest|  1 -
 .../files/thttpd-fix-world-readable-log.patch  | 59 -
 www-servers/thttpd/thttpd-2.26.4-r3.ebuild | 73 --
 3 files changed, 133 deletions(-)

diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index 8a4f8a09313..a404b876e5d 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -1,3 +1,2 @@
-DIST sthttpd-2.26.4.tar.gz 194544 SHA256 
78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb SHA512 
64d0ab4720cc0a8926bc8537d335f5238e5343cf6caad837fe09fe46bf7013b690193905b3db31a5e945141e7fb3aca52355459ff151ce56b30cfefccd87
 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/files/thttpd-fix-world-readable-log.patch 
b/www-servers/thttpd/files/thttpd-fix-world-readable-log.patch
deleted file mode 100644
index 5c011bac52b..000
--- a/www-servers/thttpd/files/thttpd-fix-world-readable-log.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d2e186dbd58d274a0dea9b59357edc8498b5388d Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" 
-Date: Tue, 26 Feb 2013 14:28:26 -0500
-Subject: [PATCH] src/thttpd.c: Fix world readable log, CVE-2013-0348.
-
-Make sure that the logfile is created or reopened as read/write
-by thttpd user only.
-
-X-gentoo-Bug: 458896
-X-gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=458896
-Reported-by:  Agostino Sarubbo 
-Signed-off-by: Anthony G. Basile 

- src/thttpd.c | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/thttpd.c b/src/thttpd.c
-index 019b8c0..f33a7a7 100644
 a/src/thttpd.c
-+++ b/src/thttpd.c
-@@ -326,6 +326,7 @@ static void
- re_open_logfile( void )
- {
- FILE* logfp;
-+int retchmod;
- 
- if ( no_log || hs == (httpd_server*) 0 )
-   return;
-@@ -335,7 +336,8 @@ re_open_logfile( void )
-   {
-   syslog( LOG_NOTICE, "re-opening logfile" );
-   logfp = fopen( logfile, "a" );
--  if ( logfp == (FILE*) 0 )
-+  retchmod = chmod( logfile, S_IRUSR|S_IWUSR );
-+  if ( logfp == (FILE*) 0 || retchmod != 0 )
-   {
-   syslog( LOG_CRIT, "re-opening %.80s - %m", logfile );
-   return;
-@@ -355,6 +357,7 @@ main( int argc, char** argv )
- gid_t gid = 32767;
- char cwd[MAXPATHLEN+1];
- FILE* logfp;
-+int retchmod;
- int num_ready;
- int cnum;
- connecttab* c;
-@@ -424,7 +427,8 @@ main( int argc, char** argv )
-   else
-   {
-   logfp = fopen( logfile, "a" );
--  if ( logfp == (FILE*) 0 )
-+  retchmod = chmod( logfile, S_IRUSR|S_IWUSR );
-+  if ( logfp == (FILE*) 0 || retchmod != 0 )
-   {
-   syslog( LOG_CRIT, "%.80s - %m", logfile );
-   perror( logfile );
--- 
-1.7.12.4
-

diff --git a/www-servers/thttpd/thttpd-2.26.4-r3.ebuild 
b/www-servers/thttpd/thttpd-2.26.4-r3.ebuild
deleted file mode 100644
index f1db7482119..000
--- a/www-servers/thttpd/thttpd-2.26.4-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic systemd toolchain-funcs user
-
-MY_P="s${P}"
-
-DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver"
-HOMEPAGE="http://opensource.dyc.edu/sthttpd;
-SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz;
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/

2017-06-08 Thread Anthony G. Basile 
commit: 333c7bca37e7d00b69fc4aed5aeaa1b84877e2e5
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Jun  8 12:23:01 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Jun  8 12:23:18 2017 +
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-.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} = * ]]
 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-.ebuild 
b/www-servers/thttpd/thttpd-.ebuild
index 444e9199858..de37464fa18 100644
--- a/www-servers/thttpd/thttpd-.ebuild
+++ b/www-servers/thttpd/thttpd-.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} = * ]]
 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

[gentoo-commits] repo/gentoo:master commit in: www-servers/thttpd/files/

2016-05-18 Thread Austin English 
commit: 5fcb8cf0278813703d7e178e7073667c9c7529ea
Author: Austin English  gentoo  org>
AuthorDate: Wed May 18 06:35:24 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed May 18 06:38:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fcb8cf0

www-servers/thttpd: use #!/sbin/openrc-run instead of #!/sbin/runscript

 www-servers/thttpd/files/thttpd.init.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/thttpd/files/thttpd.init.1 
b/www-servers/thttpd/files/thttpd.init.1
index 415ead7..3b7756e 100644
--- a/www-servers/thttpd/files/thttpd.init.1
+++ b/www-servers/thttpd/files/thttpd.init.1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v3 or later