summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-07-26 08:02:08 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-07-26 08:02:08 +0000
commit491cc46288d76fc42e5099d0501a5c7b0334a977 (patch)
tree15dd899634148652bf16dbdf7830d429de1383a5 /profiles
parentSecurity upgrade addressing an IPv6-only buffer overflow (CVE-2012-3570), rem... (diff)
downloadgentoo-2-491cc46288d76fc42e5099d0501a5c7b0334a977.tar.gz
gentoo-2-491cc46288d76fc42e5099d0501a5c7b0334a977.tar.bz2
gentoo-2-491cc46288d76fc42e5099d0501a5c7b0334a977.zip
Rename =app-arch/rpm-5* to app-arch/rpm5 as it is completely different upstream.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask4
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index bf8894d77e65..f0d7713c7c1d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6840 2012/07/26 04:04:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6841 2012/07/26 08:02:08 scarabeus 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!
+ 26 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
+ Rename =app-arch/rpm-5* to app-arch/rpm5 as it is completely different
+ upstream.
+
26 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> updates/3Q-2012:
Move sys-kernel/amd-ucode to sys-firmware/amd-ucode.
diff --git a/profiles/package.mask b/profiles/package.mask
index 72f1b47eb2ef..2521dfd6542f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14010 2012/07/26 03:23:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14011 2012/07/26 08:02:08 scarabeus 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
@@ -911,7 +911,7 @@ gnome-extra/gnome-lirc-properties
# Vlastimil Babka <caster@gentoo.org> (20 May 2008)
# Masked for testing
-=app-arch/rpm-5*
+app-arch/rpm5
# Chris Gianelloni <wolf31o2@gentoo.org> (03 Mar 2008)
# Masking due to security bug #194607 and security bug #204067