Old.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 5 insertions, 83 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/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)"
-}