Revbump with fix for bug #458892 (fix world-readable log file).

Package-Manager: portage-2.2.0_alpha179/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 77 insertions, 5 deletions

diff --git a/www-servers/webfs/ChangeLog b/www-servers/webfs/ChangeLog
index c50bd6a4e34e..3855a0962286 100644
--- a/www-servers/webfs/ChangeLog
+++ b/www-servers/webfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/webfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.33 2013/06/14 21:59:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.34 2013/06/14 23:21:53 zmedico Exp $
+
+*webfs-1.21-r3 (14 Jun 2013)
+
+  14 Jun 2013; Zac Medico <zmedico@gentoo.org>
+  +files/webfs-1.21-CVE-2013-0347.patch, +webfs-1.21-r3.ebuild:
+  Revbump with fix for bug #458892 (fix world-readable log file).
 
   14 Jun 2013; Zac Medico <zmedico@gentoo.org> files/webfs.initd-r1:
   Fix bashisms in init script.
diff --git a/www-servers/webfs/Manifest b/www-servers/webfs/Manifest
index cbca95be1101..0eb759383239 100644
--- a/www-servers/webfs/Manifest
+++ b/www-servers/webfs/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX webfs-1.21-CVE-2013-0347.patch 333 SHA256 d92c855c303456826a3099dc91f60c35825cda82730748cde5424ee040f08b90 SHA512 8c9e5fd120beac459bb79e236d608e28c1ce7c8c042e99c274637683a3d59381462ac437f4b6fe52d59a0d594d8d208b5bc5ff5c403ec47e3eec8a54d7547aee WHIRLPOOL 1bb4856a9a490730ede0fcbd07a729e7fa14ba369c214c88c8e51e1fedc1710d9083d49cbe19d51397efa38124ca4e718367803fdba22aaa8962732a2f5e3cd1
 AUX webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch 478 SHA256 42ca9c91a9d231f9c11f74461bd9700d76a3edb71b561bea0e615e42b1221791 SHA512 c77374124f2b7fea459f5ec594f0a03d4900ca7d4f5c2c8d2518372e59143d3f0be014d803df374f90fe615be1edd96253dbb878d3d727724032b1b0d5569377 WHIRLPOOL b9fc7a37c3d310ca254dbb48f0878506ce0ce65a826b9580b5b24864b25b0292cf637cd0736415ed6bf7928eed74c4c8c9552dab0a943410221ffd08038ffd63
 AUX webfs.confd 606 SHA256 8ee86ded9ed145546477eb04c6cc68701fd36be3c35d537e45a987b4c9a4f237 SHA512 ec7bbba41e68972c4139ddbfd00b54b956a3dfe747c5a6a22702d2ded53cc1dd07aa4383540a120b1e62c9d514c38bc3c96bcea5b3f00b10f72269acd32f4526 WHIRLPOOL 7ff3681d5b8d46cd2944633e2b162b61783cc159f33bc25b22b1f22e9768ad848f7f99640fe9ccc9ebff72f0863164ecc70c4f388e7e7e3147d0bed9a08de7ae
 AUX webfs.initd-r1 1172 SHA256 fad475ad87034f24522d3864ee509e34bac162b296b069300ec2c43657e7f9be SHA512 f07457247506b538741ffe27f229b09d007d1fc10a541a9b9bbb48ae67a1e51b7bedf05c4c6b4b3c6d1ef908992fa8d03cb9eb65baf7acc5bb7c8eb865ed66a0 WHIRLPOOL 32467b72a8b4897fb78bd081401b1f431eb92b970c7ccb51d478bbee40ce4c6d3a77e34b9895bbd694fe6971840370e60ca7df47b6605dfd502c716f50ee8f39
 DIST webfs-1.21.tar.gz 44249 SHA256 98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a SHA512 68b9b3163a21be8a549e395295b27dd8ce9b575183d6c36b05b98bdc310917cf2dc653ff73bdb78a8c063674a8e9480211ec5c28b8a676f9cee41fa962cfd473 WHIRLPOOL 6d5b1d079c98d2125b6a57d56f4c8fa7693c43bc20c1c29a1ff64db9c9217c85a13f9ae784eee2505b580260d72919970fa875d93c3d31d9c0d10d6307309d9e
 EBUILD webfs-1.21-r2.ebuild 1207 SHA256 56cd53438e85fb8501e1f188df5360f5c76dc419b4b6b88f2a6cf5f6fc3cacbe SHA512 d467069d5042eb095bd7cf0942ba53eb3d2d1cc7620cac975d83c61c2ac8bc713d84aae373cf0e2a825c3a55a7b4339b65d2c8722a856590cd3ac95d2a7ac89b WHIRLPOOL c61f989d9bb76e9e4899c5b54f953c6ae461d5bc3ca4271f34869bdbab501b2d967352f2e4d49850e7c063b732f781ed7a4c5432b5513ec4f5c3a1fd399f1be2
-MISC ChangeLog 4727 SHA256 477c9efc176e9003cb097594d64c5c39d6da86247dc2edd0ccc050fabeea0ee3 SHA512 09cfee4a4107b87ade676311959a2b6fb98b4756bba65ca2866f33dd4c33c2309efc6978d67c9ec525ca4cd6d65ecfe4d3d9a9b32c85a01007ea33dffe27ed91 WHIRLPOOL 98643e38dec5066ac03240a201af51da49707f9b6b39755b042c75d8b902c06851e9c3c537a5b341bc8f5e7e7fce8801d3accf2adc14e83d5e4e6c3b65ff413a
+EBUILD webfs-1.21-r3.ebuild 1376 SHA256 6b43d5055976abc019cf9e22206600e394ebc07c7fb236faa01e961ca5445d4b SHA512 5d1502601c44727f5cd4a0e22bb3a78334303d5c07070eef669b071ed439b6d0c1e06b34be0047b16d1a6077d9b07a6a07b99f82b90f7f32ebfa44fbf46c8118 WHIRLPOOL 64c6872c91a7b6a150eb754f6a48a1f195c0c31d7a50d95a5d422eaab01d5f04879d9243de07648d2fa322d6c006dd03753fd0fd224950fabd2944314036d65b
+MISC ChangeLog 4935 SHA256 d01ade210b6cc8ab03e040dd421439a04498bec5b75e4eedf045d4c472e61693 SHA512 8ad938e3f1dca6c6ead1c92687c9210b586e3da7373305543807ab4dfe05a09a4ae3eb5045b49b362fefd868930b1a2daeeff1657a91eabaf006c43c7df9e9bf WHIRLPOOL 02a22b8c3b1faa1fe2145eddcb793374a4afc0d2f9ab9ce3731923284d2bde01b0c15ec789d82ecadea26d1c2088c779a391129af0d4878c7c289ed78c81a8a7
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG7kigACgkQ/ejvha5XGaMvQQCgzlSPExW/lPZdGeSPS8xTlpx5
-qtkAn2/kpyDV4A2kjt5e7IH0FO5eSQ6p
-=fgjr
+iEYEAREIAAYFAlG7pZMACgkQ/ejvha5XGaPZWACg752AidzgBUR3eOXw76C7F2eI
+W94AoLnKYQBs2xOb6IeY7Y8SXcvgNme5
+=G/GD
 -----END PGP SIGNATURE-----
diff --git a/www-servers/webfs/files/webfs-1.21-CVE-2013-0347.patch b/www-servers/webfs/files/webfs-1.21-CVE-2013-0347.patch
new file mode 100644
index 000000000000..26e225def360
--- /dev/null
+++ b/www-servers/webfs/files/webfs-1.21-CVE-2013-0347.patch
@@ -0,0 +1,15 @@
+--- ./webfsd.c
++++ ./webfsd.c
+@@ -918,8 +918,11 @@
+ 	} else {
+ 	    if (NULL == (logfh = fopen(logfile,"a")))
+ 		xperror(LOG_WARNING,"open access log",NULL);
+-	    else
++	    else {
+ 		close_on_exec(fileno(logfh));
++		if (0 != chmod(logfile,S_IRUSR|S_IWUSR))
++		    xperror(LOG_WARNING,"chmod access log",NULL);
++	    }
+ 	}
+     }
+ 
diff --git a/www-servers/webfs/webfs-1.21-r3.ebuild b/www-servers/webfs/webfs-1.21-r3.ebuild
new file mode 100644
index 000000000000..53bc947cf5c5
--- /dev/null
+++ b/www-servers/webfs/webfs-1.21-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21-r3.ebuild,v 1.1 2013/06/14 23:21:53 zmedico Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Lightweight HTTP server for static content"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
+HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~arm-linux ~x86-linux"
+IUSE="ssl threads"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch"
+	epatch "${FILESDIR}/${P}-CVE-2013-0347.patch"
+	sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	use ssl || myconf="${myconf} USE_SSL=no"
+	use threads && myconf="${myconf} USE_THREADS=yes"
+
+	emake prefix="${EPREFIX}/usr" ${myconf}
+}
+
+src_install() {
+	local myconf
+	use ssl || myconf="${myconf} USE_SSL=no"
+	use threads && myconf="${myconf} USE_THREADS=yes"
+	einstall ${myconf} mandir="${ED}/usr/share/man"
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	dodoc README
+}
+
+pkg_preinst() {
+	# Fix existing log permissions for bug #458892.
+	chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null
+}