Old.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 9 insertions, 90 deletions

diff --git a/www-client/surf/ChangeLog b/www-client/surf/ChangeLog
index 81accfa97f51..256121c329b5 100644
--- a/www-client/surf/ChangeLog
+++ b/www-client/surf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/surf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.21 2012/09/25 09:02:38 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.22 2012/10/24 15:54:25 jer Exp $
+
+  24 Oct 2012; Jeroen Roovers <jer@gentoo.org> -surf-0.4.1-r1.ebuild,
+  -files/CVE-2012-0842.patch:
+  Old.
 
   25 Sep 2012; Tony Vroon <chainsaw@gentoo.org> surf-0.5.ebuild:
   Marked stable on AMD64 based on arch testing by Maurizio "k01" Camisaschi &
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 908605348a79..d110cad9f2e7 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX CVE-2012-0842.patch 796 SHA256 93c8faed4569e075ce38a38270e82780a95e79333631dbbb27784b334b65a66b SHA512 21d8222e6bcc7b71e5fcc61a64f5c1433bc665344131466de6e95b52a614bf54ea5b8c74caaebd4b72f995f24d5986a1960661bba3898937c0087f115f495ff6 WHIRLPOOL 494b95da008d01e5f2be5f74371dd8348726f7e438cacda826207874e721e3c79ad682f747724755aa8e7a8761433a19efcee41d54690ccf83be914cbec0f759
-DIST surf-0.4.1.tar.gz 10102 SHA256 93709ba3e84baf2118676e96a5b2e5d4176f28c35c782fffd80a65c0a5bea546 SHA512 f7c40a663e214f8572aee3865d4717732290625871c55e1aa92a6446339380e211b313f432d1e900b1a17d0a68a2cf410ed6d714d8941ec3c3f70d6e4f5d59f4 WHIRLPOOL 5fa594caea9fbc5102295db3bebaeb7d7bafb2986516fb17062c323e7e7c02f0d7bd41e0263835a232e83d02482545b291e7e8dbcde4aaae97da45497ae11394
 DIST surf-0.5.tar.gz 10714 SHA256 bd0a1784d028bcc18dc7d1f4a35e25e75f5f67b84cd36b2d67b05c331b9f0ea7 SHA512 5e685e833b9ac5df5d7f1cc168fba82e0dfa98ff4e7667ace8a7a7f93b6f4a98f4762e2c3bdcac30cd44145ccb9f412eb49313221490fb6c1ea9f02aee190a5f WHIRLPOOL bb26cacd1861851e8be423cee2abc5108b9dc4c99aa56a49612061a2ff0094e3521e9cfe2d0fce4a996790fe6d10b8c3a6a35f6f33491b1e53c4ba4ca9d36211
-EBUILD surf-0.4.1-r1.ebuild 1696 SHA256 ee163f6149b99ff7784f00a34f688e5fb73cb19047b949f809e0c5ac57bfd484 SHA512 502e2bb6121d07dd24391cffde54523b8201f33935331871ba077bd71507da3c9f87b696f24648dbe850a8cdf0be933ae51a7c352bb020f5acae80652b610367 WHIRLPOOL c41b7d83676e5c590173cd15362684e917825099c7c845f89c98b791c1049996f9f7372c34fee3121c3728cfcb9901eae5e7181e94f610765c93c9f4b858b428
 EBUILD surf-0.5.ebuild 1639 SHA256 b8a2be79b71593f16fd7e9f9e07071e605c2b6fc9d7e52311ca274d79d1aa33a SHA512 0ac7f311c8c08527d1343447ce6713af9d01177b238ad77dbe5638b505f81cfc75d293d9573a6326a460c965877b7c8a4baaee5049840f3651658768405aaca9 WHIRLPOOL d051931a2546d21a0c152cdba2548ae3279e5b2fd422e9a2627256b93fc1e2ecc0f1343031dcfef3545910a2b46fbaaf4b6eb3975e73ff948aed944953dc0518
-MISC ChangeLog 2936 SHA256 a0f97df239758f68ce872109d600e8fe774e4838686388cba98d336246af5fc2 SHA512 e97e7024042a0ebf1deee1c9f67e529e67a8ca9e69790d14917ef2c39e61646393cdb37633d35f74001638c5952a015b43023f2e479693539268887e75769a24 WHIRLPOOL 7927735027741108f5864d1916eefca9514e3c6154299c3a38518df2cf521d403d82b7e6b7ca493a71c13a0fdc0af81e83353fafd31a073d34fb980d8d743914
+MISC ChangeLog 3039 SHA256 416dc0634992a29a892a3c51f255a54b6da3b7d2d77c47543e5542ca599fbdb9 SHA512 489df3e06bf0ab7732beef39f157dc3a89afec62d53301342da6b92af3296e7dfa6ffc65b5e97ae80a848335e98b132ee0add55ab9c2705dc6877cac43b0f442 WHIRLPOOL a45dc715490f2e1bad238a4a62039b6d93ea5fdd174dbdbe0fdb7c58e11d747c97be3f716efa7c5dd49b857584dc6f73640fe27c3fda81c41e3b01c04a753e9f
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBhc0wACgkQp5vW4rUFj5oTawCfQm4pcLqr3NR2chZs9ewjVb/o
-ItMAoJ6NJZbAMr2s8SD02TOwQrpQ15n9
-=nBDx
+iEYEAREIAAYFAlCIDzIACgkQVWmRsqeSphMktACggU0RiUZ7ej3GCwdx3Ik86ovF
+CcQAniVsp9guYlHNqd5Rf+aH+zxecBDw
+=Efcs
 -----END PGP SIGNATURE-----
diff --git a/www-client/surf/files/CVE-2012-0842.patch b/www-client/surf/files/CVE-2012-0842.patch
deleted file mode 100644
index 79701cb423d8..000000000000
--- a/www-client/surf/files/CVE-2012-0842.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix for world readable cookie jar vulnerability
- This is the patch provided by upstream to fix the world readable
- cookie jar vulnerability filed as http://bugs.debian.org/659296.
- Thanks to Peter Hartman from the upstream for quick patch.
-Author: Peter Hartman <peterjohnhartman@gmail.com>
-Last-Update: 2012-02-10
-Bug-Debian: http://bugs.debian.org/659296
-Forwarded: http://lists.suckless.org/dev/1202/10972.html
---- a/surf.c	Wed Feb 01 15:23:39 2012 +0100
-+++ b/surf.c	Fri Feb 10 11:46:18 2012 -0500
-@@ -127,7 +127,7 @@
- 		apath = g_strconcat(g_get_home_dir(), "/", path, NULL);
- 	if((p = strrchr(apath, '/'))) {
- 		*p = '\0';
--		g_mkdir_with_parents(apath, 0755);
-+		g_mkdir_with_parents(apath, 0700);
- 		*p = '/';
- 	}
- 	/* creating file (gives error when apath ends with "/") */
diff --git a/www-client/surf/surf-0.4.1-r1.ebuild b/www-client/surf/surf-0.4.1-r1.ebuild
deleted file mode 100644
index 9cc805bdc5b6..000000000000
--- a/www-client/surf/surf-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.4.1-r1.ebuild,v 1.4 2012/03/09 09:12:23 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="a simple web browser based on WebKit/GTK+"
-HOMEPAGE="http://surf.suckless.org/"
-SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib
-	net-libs/libsoup
-	net-libs/webkit-gtk:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-RDEPEND="
-	!sci-chemistry/surf
-	!savedconfig? ( net-misc/wget x11-terms/xterm )
-	x11-apps/xprop
-	x11-misc/dmenu
-	${DEPEND}
-"
-
-pkg_setup() {
-	elog "net-misc/wget and x11-terms/xterm will be installed by default to"
-	elog "support the default download command, which can be changed through"
-	elog "the savedconfig mechanism. If you enable USE=savedconfig, you will"
-	elog "need to satisfy requirements for the alternative download command"
-	elog "yourself."
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/CVE-2012-0842.patch
-	sed -i \
-		-e 's|{|(|g;s|}|)|g' \
-		-e 's|\t@|\t|g;s|echo|@&|g' \
-		-e 's|^LIBS.*|LIBS = $(GTKLIB) -lgthread-2.0|g' \
-		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \
-		-e 's|^CC.*|CC ?= gcc|g' \
-		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \
-		config.mk Makefile || die "sed failed"
-	restore_config config.h
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	save_config config.h
-}
-
-pkg_postinst() {
-	ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
-	ewarn "and its contents to no longer be world readable (see bug #404983)"
-}