summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@gentoo.org>2014-06-29 03:54:33 +0000
committerGreg Kroah-Hartman <gregkh@gentoo.org>2014-06-29 03:54:33 +0000
commit48b5884c16b708ad3c8504e5227a8a9f044fc9bc (patch)
tree8adb754f818f81550bbea0871ad8e093edb73e5a /profiles
parentadd py3.4 pypy, add missing dep, tidy, fixes bug #513900 by Patrick (diff)
downloadhistorical-48b5884c16b708ad3c8504e5227a8a9f044fc9bc.tar.gz
historical-48b5884c16b708ad3c8504e5227a8a9f044fc9bc.tar.bz2
historical-48b5884c16b708ad3c8504e5227a8a9f044fc9bc.zip
remove docker masks as no one ever explained why it was there. Oh, and there's a security bug in the old versions, so we really don't want them around...
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog7
-rw-r--r--profiles/package.mask7
2 files changed, 7 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e4505d26ea9d..cd8e2894c503 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9116 2014/06/29 00:41:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9117 2014/06/29 03:54:33 gregkh Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 29 Jun 2014; Greg Kroah-Hartman <gregkh@gentoo.org>
+ remove docker masks due to security issues with old versions.
+ And a total lack of anyone telling me that they were masking them
+ in the first place...
+
29 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
targets/desktop/gnome/package.use:
Do not enable gstreamer in wine by default
diff --git a/profiles/package.mask b/profiles/package.mask
index 7c3f2b86f47b..057cd90cfc25 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15816 2014/06/28 09:31:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15817 2014/06/29 03:54:33 gregkh Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -213,7 +213,6 @@ dev-db/mysql++:3
# Markos Chandras <hwoarang@gentoo.org> (03 May 2014)
# Masked for further testing
>=app-emulation/lxc-1.0.0
->=app-emulation/docker-1.0.0
# Tom Wijsman <TomWij@gentoo.org> (03 May 2014)
# Needs to be further tested and revised by both Java and Ruby herds.
@@ -426,10 +425,6 @@ www-client/google-chrome:unstable
# to use it (#483562)
=media-libs/libopenraw-0.1.0_pre20130826
-# Tom Wijsman <TomWij@gentoo.org> (31 Dec 2013)
-# [QA] Mask LIVEVCS.unmasked versions of docker, newer versions are available.
-<=app-emulation/docker-0.7.0
-
# Julian Ospald <hasufell@gentoo.org> (30 Dec 2013)
# breaks every consumer
=dev-games/ogre-1.9.0