summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-06-13 18:44:46 +0000
committerSamuli Suominen <drac@gentoo.org>2007-06-13 18:44:46 +0000
commitdbbbd45590c6b4ee9639c9615994f33bfda11743 (patch)
treeb64472463b187463fdef70527bcfb2a180881e7e /x11-misc
parentVersion bump for security bug #181922 - CVE-2006-4168 (diff)
downloadgentoo-2-dbbbd45590c6b4ee9639c9615994f33bfda11743.tar.gz
gentoo-2-dbbbd45590c6b4ee9639c9615994f33bfda11743.tar.bz2
gentoo-2-dbbbd45590c6b4ee9639c9615994f33bfda11743.zip
Stop using hypertorus.xml patch since it was fixed differently. Bug 154444.
(Portage version: 2.1.2.9)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/ChangeLog6
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild5
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild5
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.02.ebuild5
4 files changed, 8 insertions, 13 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 1ceaf6854722..62e7e7885d5d 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xscreensaver
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.186 2007/06/09 10:39:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.187 2007/06/13 18:44:46 drac Exp $
+
+ 13 Jun 2007; Samuli Suominen <drac@gentoo.org> xscreensaver-5.02.ebuild,
+ xscreensaver-5.02-r1.ebuild, xscreensaver-5.02-r2.ebuild:
+ Stop using hypertorus.xml patch since it was fixed differently. Bug 154444.
09 Jun 2007; Samuli Suominen <drac@gentoo.org>
xscreensaver-5.02-r2.ebuild:
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
index 7d83d604a8c2..bf99e3d7975f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild,v 1.4 2007/06/07 18:46:04 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild,v 1.5 2007/06/13 18:44:46 drac Exp $
inherit eutils flag-o-matic pam fixheadtails autotools
@@ -50,9 +50,6 @@ src_unpack() {
# disable not-safe-for-work xscreensavers
use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
- # Fix bug #154444 - hypertorus hack:
- epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
-
epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
eautoreconf
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
index c43a046e5b6c..d893740650d6 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild,v 1.2 2007/06/09 10:39:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild,v 1.3 2007/06/13 18:44:46 drac Exp $
inherit eutils flag-o-matic pam fixheadtails autotools
@@ -49,9 +49,6 @@ src_unpack() {
# disable not-safe-for-work xscreensavers
use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
- # Fix bug #154444 - hypertorus hack:
- epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
-
epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
# bug 180542. fix for segmentation fault with non-interactive pam.
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
index 6c53b8b6f5c1..42b057d701cd 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.10 2007/05/24 12:24:41 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.11 2007/06/13 18:44:46 drac Exp $
inherit eutils flag-o-matic pam fixheadtails autotools
@@ -50,9 +50,6 @@ src_unpack() {
# disable not-safe-for-work xscreensavers
use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
- # Fix bug #154444 - hypertorus hack:
- epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
-
eautoreconf
# change old head/tail to POSIX ones