Removed stale 'net-ftp/proftpd' mask.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0f44d59d19406f6fac5fdc92ce07d38df151db46..97f555279c603def82eea3b0a0ba26581065e46a 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9667 2015/01/07 16:36:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9668 2015/01/08 10:28:58 slyfox 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!
 
+  08 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> package.mask:
+  Removed stale 'net-ftp/proftpd' mask.
+
   07 Jan 2015; Mike Gilbert <floppym@gentoo.org> package.mask:
   Remove duplicate mask on sci-physics/camfr.
 

diff --git a/profiles/package.mask b/profiles/package.mask
index a862cc623220343f09858fe495637f23e09d4966..432ab1de61a6165fe77af5975b6381cf25654872 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16274 2015/01/07 19:30:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16275 2015/01/08 10:28:58 slyfox 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
@@ -939,10 +939,6 @@ sci-geosciences/googleearth
 # Do not lastrite this, just leave mask by Lars Wendler's request.
 net-irc/xchat-otr
 
-# Michael Weber <xmw@gentoo.org> (9 Jul 2013)
-# Masked for security bug 450746, CVE-2012-6095
-<net-ftp/proftpd-1.3.4c
-
 # Tom Wijsman <TomWij@gentoo.org> (30 Jun 2013)
 # Sun JDK and JRE contain critical vulnerabilities and receive no further
 # updates; masking to make users aware of this, users that still need this