diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-08 19:48:18 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-07-08 19:48:18 +0000 |
commit | b063b666cc90c53876fc203e4126d5abad048711 (patch) | |
tree | 49b79262354725974efee9fb53b7114dbce1234f /profiles | |
parent | Add patch to build on gcc-4.7. #421899 (diff) | |
download | historical-b063b666cc90c53876fc203e4126d5abad048711.tar.gz historical-b063b666cc90c53876fc203e4126d5abad048711.tar.bz2 historical-b063b666cc90c53876fc203e4126d5abad048711.zip |
Downgrade netkit-tftp masking to non-removal.
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/ChangeLog | 5 | ||||
-rw-r--r-- | profiles/package.mask | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index aafac6b83df7..d4847a2cb1a7 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,12 +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.6757 2012/07/08 18:04:27 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6758 2012/07/08 19:48:18 flameeyes 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 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> package.mask: + Downgrade netkit-tftp masking to non-removal. + + 08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> package.mask: Mask netkit-ftp for removal. 07 Jul 2012; Michael Weber <xmw@gentoo.org> package.mask: diff --git a/profiles/package.mask b/profiles/package.mask index c46f2f63fa60..ad428869ca1a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13936 2012/07/08 18:04:27 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13937 2012/07/08 19:48:18 flameeyes 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 @@ -33,7 +33,9 @@ # Diego Elio Pettenò <flameeyes@gentoo.org> (08 Jul 2012) # Dead upstream (domain is gone as well), very bad code. -# Remove by 2012-08-08, replace with net-ftp/tftp-hpa. +# If possible use net-ftp/tftp-hpa; if that is not possible, we're +# going to keep this around for a while, but let us know by filing a +# bug and blocking against bug #425362 net-ftp/netkit-tftp # Doug Goldstein <cardoe@gentoo.org> (07 Jul 2012) |