From d17bab02ccbc2ac5d77a7abe64d76eb7c0dfeb4c Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Wed, 21 Mar 2007 19:40:55 +0000
Subject: [PATCH] stop adding netfilter contexts, as decided at the developers
 summit

---
 Changelog        | 1 +
 Rules.modular    | 4 ++--
 Rules.monolithic | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index d63829de..455c4109 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Stop including netfilter contexts by default.
 - Add dontaudits for init fds and console to init_daemon_domain().
 - Patch to allow gpg to create user keys dir.
 - Patch to support kvmfs from Dan Walsh.
diff --git a/Rules.modular b/Rules.modular
index 9a1a9951..4d31fdbf 100644
--- a/Rules.modular
+++ b/Rules.modular
@@ -91,10 +91,10 @@ $(builddir)%.pp: $(tmpdir)/%.mod $(tmpdir)/%.mod.fc
 #
 # Create a base module package
 #
-$(base_pkg): $(base_mod) $(base_fc) $(users_extra) $(tmpdir)/seusers $(net_contexts)
+$(base_pkg): $(base_mod) $(base_fc) $(users_extra) $(tmpdir)/seusers
 	@echo "Creating $(NAME) base module package"
 	@test -d $(builddir) || mkdir -p $(builddir)
-	$(verbose) $(SEMOD_PKG) -o $@ -m $(base_mod) -f $(base_fc) -u $(users_extra) -s $(tmpdir)/seusers -n $(net_contexts)
+	$(verbose) $(SEMOD_PKG) -o $@ -m $(base_mod) -f $(base_fc) -u $(users_extra) -s $(tmpdir)/seusers
 
 $(base_mod): $(base_conf)
 	@echo "Compiling $(NAME) base module"
diff --git a/Rules.monolithic b/Rules.monolithic
index 6f8f5c82..2b78c8dd 100644
--- a/Rules.monolithic
+++ b/Rules.monolithic
@@ -50,7 +50,7 @@ default: policy
 
 policy: $(polver)
 
-install: $(loadpath) $(fcpath) $(ncpath) $(appfiles)
+install: $(loadpath) $(fcpath) $(appfiles)
 
 load: $(tmpdir)/load