Removing the SELinux 2.20101213 policies

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 5 insertions, 98 deletions

diff --git a/sec-policy/selinux-networkmanager/ChangeLog b/sec-policy/selinux-networkmanager/ChangeLog
index 545f172d7cc8..a0f91e5ecb00 100644
--- a/sec-policy/selinux-networkmanager/ChangeLog
+++ b/sec-policy/selinux-networkmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/ChangeLog,v 1.4 2011/10/23 12:42:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/ChangeLog,v 1.5 2011/11/12 20:53:12 swift Exp $
+
+  12 Nov 2011; <swift@gentoo.org> -selinux-networkmanager-2.20101213.ebuild,
+  -files/fix-networkmanager.patch:
+  Removing old policies
 
   23 Oct 2011; <swift@gentoo.org> selinux-networkmanager-2.20110726-r1.ebuild:
   Stabilization (tracker #384231)
diff --git a/sec-policy/selinux-networkmanager/files/fix-networkmanager.patch b/sec-policy/selinux-networkmanager/files/fix-networkmanager.patch
deleted file mode 100644
index 8c38757d1b44..000000000000
--- a/sec-policy/selinux-networkmanager/files/fix-networkmanager.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- services/networkmanager.te	2010-09-10 17:05:45.000000000 +0200
-+++ ../../../refpolicy/policy/modules/services/networkmanager.te	2011-01-02 15:40:48.781999979 +0100
-@@ -28,6 +28,9 @@
- type wpa_cli_exec_t;
- init_system_domain(wpa_cli_t, wpa_cli_exec_t)
- 
-+type wpa_cli_var_run_t;
-+files_pid_file(wpa_cli_var_run_t)
-+
- ########################################
- #
- # Local policy
-@@ -68,6 +71,11 @@
- manage_sock_files_pattern(NetworkManager_t, NetworkManager_var_run_t, NetworkManager_var_run_t)
- files_pid_filetrans(NetworkManager_t, NetworkManager_var_run_t, { dir file sock_file })
- 
-+manage_dirs_pattern(wpa_cli_t, wpa_cli_var_run_t, wpa_cli_var_run_t)
-+manage_files_pattern(wpa_cli_t, wpa_cli_var_run_t, wpa_cli_var_run_t)
-+manage_sock_files_pattern(wpa_cli_t, wpa_cli_var_run_t, wpa_cli_var_run_t)
-+files_pid_filetrans(wpa_cli_t, wpa_cli_var_run_t, { dir file sock_file })
-+
- kernel_read_system_state(NetworkManager_t)
- kernel_read_network_state(NetworkManager_t)
- kernel_read_kernel_sysctls(NetworkManager_t)
-@@ -125,10 +133,12 @@
- init_read_utmp(NetworkManager_t)
- init_dontaudit_write_utmp(NetworkManager_t)
- init_domtrans_script(NetworkManager_t)
-+init_domtrans_script(wpa_cli_t)
- 
- auth_use_nsswitch(NetworkManager_t)
- 
- logging_send_syslog_msg(NetworkManager_t)
-+logging_send_syslog_msg(wpa_cli_t)
- 
- miscfiles_read_localization(NetworkManager_t)
- miscfiles_read_generic_certs(NetworkManager_t)
-@@ -149,6 +159,7 @@
- 
- userdom_dontaudit_use_unpriv_user_fds(NetworkManager_t)
- userdom_dontaudit_use_user_ttys(NetworkManager_t)
-+userdom_use_user_ttys(wpa_cli_t)
- # Read gnome-keyring
- userdom_read_user_home_content_files(NetworkManager_t)
- 
-@@ -287,3 +298,20 @@
- miscfiles_read_localization(wpa_cli_t)
- 
- term_dontaudit_use_console(wpa_cli_t)
-+
-+fs_search_tmpfs(wpa_cli_t)
-+fs_search_tmpfs(NetworkManager_t)
-+fs_rw_tmpfs_files(wpa_cli_t)
-+fs_rw_tmpfs_files(NetworkManager_t)
-+fs_manage_tmpfs_dirs(wpa_cli_t)
-+fs_manage_tmpfs_sockets(wpa_cli_t)
-+fs_manage_tmpfs_sockets(NetworkManager_t)
-+getty_use_fds(wpa_cli_t)
-+files_search_pids(wpa_cli_t)
-+corecmd_exec_shell(wpa_cli_t)
-+corecmd_exec_bin(wpa_cli_t)
-+
-+ifdef(`distro_gentoo',`
-+	sysnet_domtrans_dhcpc(wpa_cli_t)
-+	allow wpa_cli_t etc_t:file { getattr };
-+')
---- services/networkmanager.fc	2010-08-03 15:11:06.000000000 +0200
-+++ ../../../refpolicy/policy/modules/services/networkmanager.fc	2011-01-02 17:30:48.448999997 +0100
-@@ -24,3 +24,6 @@
- /var/run/nm-dhclient.*			gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
- /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
- /var/run/wpa_supplicant-global	-s	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-+/var/run/wpa_cli-.*		--	gen_context(system_u:object_r:wpa_cli_var_run_t,s0)
-+/etc/wpa_supplicant/wpa_cli.sh	--	gen_context(system_u:object_r:bin_t,s0)
-+/usr/bin/wpa_cli		--	gen_context(system_u:object_r:wpa_cli_exec_t,s0)
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20101213.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20101213.ebuild
deleted file mode 100644
index 64db56fe5532..000000000000
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20101213.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20101213.ebuild,v 1.2 2011/06/02 12:40:04 blueness Exp $
-
-IUSE=""
-
-MODS="networkmanager"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for general applications"
-
-KEYWORDS="amd64 x86"
-
-MODDEPEND=">=sec-policy/selinux-base-policy-2.20101213-r1"
-
-# Patch "fix-networkmanager.patch" contains:
-# - Support for wpa_cli. Gentoo's init scripts use wpa_cli to run the init
-#   scripts when wpa_supplicant has associated.
-# - Support running wpa_cli from commandline (requires
-#   selinux-base-policy-2.20101213-r1) due to patch to sysadm_t domain
-POLICY_PATCH="${FILESDIR}/fix-networkmanager.patch"