| 1 |
blueness 13/02/26 20:04:33 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: thttpd-2.26.4-r2.ebuild |
| 5 |
Log: |
| 6 |
Make log read/write by thttpd user only, bug #458896, CVE-2013-0348 |
| 7 |
|
| 8 |
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.58 www-servers/thttpd/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/ChangeLog?rev=1.58&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/ChangeLog?rev=1.58&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/ChangeLog?r1=1.57&r2=1.58 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v |
| 20 |
retrieving revision 1.57 |
| 21 |
retrieving revision 1.58 |
| 22 |
diff -u -r1.57 -r1.58 |
| 23 |
--- ChangeLog 25 Feb 2013 21:27:58 -0000 1.57 |
| 24 |
+++ ChangeLog 26 Feb 2013 20:04:32 -0000 1.58 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for www-servers/thttpd |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.57 2013/02/25 21:27:58 zmedico Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.58 2013/02/26 20:04:32 blueness Exp $ |
| 30 |
+ |
| 31 |
+*thttpd-2.26.4-r2 (26 Feb 2013) |
| 32 |
+ |
| 33 |
+ 26 Feb 2013; Anthony G. Basile <blueness@g.o> |
| 34 |
+ +files/thttpd-fix-world-readable-log.patch, +thttpd-2.26.4-r2.ebuild: |
| 35 |
+ Make log read/write by thttpd user only, bug #458896, CVE-2013-0348 |
| 36 |
|
| 37 |
25 Feb 2013; Zac Medico <zmedico@g.o> thttpd-2.26.4-r1.ebuild: |
| 38 |
Add ~arm-linux keyword. |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 www-servers/thttpd/thttpd-2.26.4-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: thttpd-2.26.4-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2013 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r2.ebuild,v 1.1 2013/02/26 20:04:32 blueness Exp $ |
| 52 |
|
| 53 |
EAPI="4" |
| 54 |
|
| 55 |
inherit eutils flag-o-matic toolchain-funcs |
| 56 |
|
| 57 |
MY_P="s${P}" |
| 58 |
|
| 59 |
DESCRIPTION="Fork of thttpd, a small, fast, multiplexing webserver." |
| 60 |
HOMEPAGE="http://opensource.dyc.edu/sthttpd" |
| 61 |
SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz" |
| 62 |
S="${WORKDIR}/${MY_P}" |
| 63 |
|
| 64 |
LICENSE="BSD GPL-2" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
| 67 |
IUSE="" |
| 68 |
|
| 69 |
RDEPEND="" |
| 70 |
DEPEND="" |
| 71 |
|
| 72 |
WEBROOT="/var/www/localhost" |
| 73 |
|
| 74 |
THTTPD_USER=thttpd |
| 75 |
THTTPD_GROUP=thttpd |
| 76 |
THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs" |
| 77 |
|
| 78 |
DOCS=( README TODO ) |
| 79 |
|
| 80 |
pkg_setup() { |
| 81 |
ebegin "Creating thttpd user and group" |
| 82 |
enewgroup ${THTTPD_GROUP} |
| 83 |
enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP} |
| 84 |
} |
| 85 |
|
| 86 |
src_prepare () { |
| 87 |
epatch "${FILESDIR}"/thttpd-fix-world-readable-log.patch |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
econf WEBDIR=${THTTPD_DOCROOT} |
| 92 |
} |
| 93 |
|
| 94 |
src_install () { |
| 95 |
default |
| 96 |
|
| 97 |
newinitd "${FILESDIR}"/thttpd.init.1 thttpd |
| 98 |
newconfd "${FILESDIR}"/thttpd.confd.1 thttpd |
| 99 |
|
| 100 |
insinto /etc/logrotate.d |
| 101 |
newins "${FILESDIR}/thttpd.logrotate" thttpd |
| 102 |
|
| 103 |
insinto /etc/thttpd |
| 104 |
doins "${FILESDIR}"/thttpd.conf.sample |
| 105 |
|
| 106 |
#move htdocs to docdir, bug #429632 |
| 107 |
docompress -x /usr/share/doc/"${PF}"/htdocs.dist |
| 108 |
mv "${ED}"${WEBROOT}/htdocs \ |
| 109 |
"${ED}"/usr/share/doc/"${PF}"/htdocs.dist |
| 110 |
mkdir "${ED}"${WEBROOT}/htdocs |
| 111 |
|
| 112 |
keepdir ${WEBROOT}/htdocs |
| 113 |
|
| 114 |
chown root:${THTTPD_GROUP} "${ED}/usr/sbin/makeweb" \ |
| 115 |
|| die "Failed chown makeweb" |
| 116 |
chmod 2751 "${ED}/usr/sbin/makeweb" \ |
| 117 |
|| die "Failed chmod makeweb" |
| 118 |
chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \ |
| 119 |
|| die "Failed chmod printenv" |
| 120 |
} |
Archives