summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2008-03-19 01:01:03 +0000
committerJeroen Roovers <jer@gentoo.org>2008-03-19 01:01:03 +0000
commit308186792080d3e42b6035237bc8178c8e358cea (patch)
treec45fe9cb7199145a837d018cd25e6135c4369ab3 /profiles
parentamd64 stable, bug 213820 (diff)
downloadgentoo-2-308186792080d3e42b6035237bc8178c8e358cea.tar.gz
gentoo-2-308186792080d3e42b6035237bc8178c8e358cea.tar.bz2
gentoo-2-308186792080d3e42b6035237bc8178c8e358cea.zip
Masking net-firewall/conntrack (bug #213084).
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 70da9244f0b1..3da393bac35e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for profile directory
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1221 2008/03/18 17:19:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1222 2008/03/19 01:01:03 jer Exp $
+
+ 19 Mar 2008; Jeroen Roovers <jer@gentoo.org> package.mask:
+ Masking net-firewall/conntrack (bug #213084).
18 Mar 2008; Raúl Porcel <armin76@gentoo.org> updates/1Q-2008:
Slotmove xulrunner-1.8* again
diff --git a/profiles/package.mask b/profiles/package.mask
index 85f3311b4683..cdaf6f91471a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8396 2008/03/17 23:25:03 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8397 2008/03/19 01:01:03 jer 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
@@ -29,6 +29,12 @@
#--- END OF EXAMPLES ---
+# Jeroen Roovers <jer@gentoo.org> (19 Mar 2008)
+# Deprecated in favour of net-firewall/conntrack-tools, which
+# merges both conntrack and conntrackd (bug #213084).
+# Going for removal on or about 19 Apr 2008:
+net-firewall/conntrack
+
# Donnie Berkholz <dberkholz@gentoo.org> (17 Mar 2008)
# Most apps that use lm_sensors aren't compatible with the new version
>=sys-apps/lm_sensors-3