Remove mysql 5.5 and friends mask

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ab94db2287a1ded3ba7fe2e7b3989d4b5f722937..0b4b3df058d164bb8d94c3fc3487cbe14870811d 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9794 2015/02/16 17:31:54 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9795 2015/02/16 18:03:23 grknight 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!
 
+  16 Feb 2015; Brian Evans <grknight@gentoo.org> package.mask:
+  Remove the masks added by me today and revbump the old virtual back down to
+  ~arch instead
+
   16 Feb 2015; Brian Evans <grknight@gentoo.org> package.mask:
   Add in dev-db/mysql-cluster-7.2* to the previous 5.5 series mask
 

diff --git a/profiles/package.mask b/profiles/package.mask
index 6afe126f5c6332eaa01f85c69ec0c72cbf2ad766..9fb1036b62d51c0dbf2053e53334861f81e47032 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16366 2015/02/16 17:31:54 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16367 2015/02/16 18:03:23 grknight 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
@@ -38,17 +38,6 @@ games-rpg/aklabeth
 games-sports/foosball
 games-strategy/dark-oberon
 
-# Brian Evans <grknight@gentoo.org> (16 Feb 2015)
-# Mask MySQL and MariaDB 5.5 series for security bug 537216
-# Please make sure mysql_upgrade has been run before moving to 5.6
-# Not removing until roughly Dec 2015 as an upgrade path must
-# exist or else the server may crash if the admin has not done
-# proper maintenance prior to updating
-=virtual/mysql-5.5
-=dev-db/mysql-5.5*
-=dev-db/mariadb-5.5*
-=dev-db/mysql-cluster-7.2*
-
 # Hans de Graaff <graaff@gentoo.org> (15 Feb 2015)
 # Mask old virtuals based on the slot-per-version idea for removal,
 # bug 421497.