summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-06-11 09:36:27 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-06-11 09:36:27 +0000
commit3ae0e38f3dfcc955f733866bcc1afe1245a8603e (patch)
treebd48a4b9144d39cd91ed5dcc579ec02229f5aeb7 /x11-base
parentPull version vulnerable to #53226. (Manifest recommit) (diff)
downloadgentoo-2-3ae0e38f3dfcc955f733866bcc1afe1245a8603e.tar.gz
gentoo-2-3ae0e38f3dfcc955f733866bcc1afe1245a8603e.tar.bz2
gentoo-2-3ae0e38f3dfcc955f733866bcc1afe1245a8603e.zip
Make it tough to emerge this, as it's still got a security hole (#53226).
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/Manifest2
-rw-r--r--x11-base/xfree/xfree-4.3.0-r7.ebuild10
3 files changed, 14 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 04d84ffed52d..53aade3e2a2b 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.342 2004/06/11 09:31:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.343 2004/06/11 09:36:27 spyderous Exp $
+
+ 11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r7.ebuild:
+ Make it tough to emerge this, as it's still got a security hole (#53226).
11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
-xfree-4.3.99.902-r2.ebuild:
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 6f4f8a64a88c..1238bfd9832f 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,7 +1,7 @@
MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
MD5 3272f90b624b5729d7c8ea7436bde88d ChangeLog 75327
MD5 208f0bb6e81171bdc1d454c2cb709dc4 xfree-4.3.0-r6.ebuild 35426
-MD5 e527cca03027f1bfe4b0059300210d98 xfree-4.3.0-r7.ebuild 39688
+MD5 da0923095ac89ec51594956b73302cd7 xfree-4.3.0-r7.ebuild 39959
MD5 b43f495a34fdd2ca971630c250e4cc1f xfree-4.3.0-r5.ebuild 35364
MD5 252c61d8b687ce1467ff95552c156c48 files/digest-xfree-4.3.0-r7 1528
MD5 8ef125d85e46c8618cd318e611d8f33c files/digest-xfree-4.3.0-r6 2002
diff --git a/x11-base/xfree/xfree-4.3.0-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild
index 262c7d8e7346..32fdc6c78326 100644
--- a/x11-base/xfree/xfree-4.3.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.1 2004/06/11 08:43:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.2 2004/06/11 09:36:27 spyderous Exp $
# TODO
# 14 Mar. 2004 <spyderous@gentoo.org>
@@ -133,6 +133,14 @@ PROVIDE="virtual/x11
DESCRIPTION="XFree86: free X server"
pkg_setup() {
+ # Still vulnerable to security bug #53226. Make it tough to emerge.
+ if [ -z "${GAPING_SECURITY_HOLE}" ]
+ then
+ die "This package is vulnerable to security bug #53226.
+ See bugs.gentoo.org. Set the environment variable
+ GAPING_SECURITY_HOLE to get past this."
+ fi
+
# Whether to drop in external render, xrender and xft from freedesktop.org
# NOTE: The freedesktop versions are the CORRECT upstream versions to use.
# WARNING: Remember to add the external stuff to SRC_URI when in use.