Removing the SELinux 2.20101213 policies

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 6 insertions, 89 deletions

diff --git a/sec-policy/selinux-wireshark/ChangeLog b/sec-policy/selinux-wireshark/ChangeLog
index 533d506a9ded..c3394158ee2f 100644
--- a/sec-policy/selinux-wireshark/ChangeLog
+++ b/sec-policy/selinux-wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sec-policy/selinux-wireshark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/ChangeLog,v 1.15 2011/10/23 12:42:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/ChangeLog,v 1.16 2011/11/12 20:53:38 swift Exp $
+
+  12 Nov 2011; <swift@gentoo.org> -files/fix-apps-wireshark-r1.patch,
+  -selinux-wireshark-2.20101213-r1.ebuild,
+  -selinux-wireshark-2.20110726-r1.ebuild:
+  Removing old policies
 
   23 Oct 2011; <swift@gentoo.org> selinux-wireshark-2.20110726-r2.ebuild:
   Stabilization (tracker #384231)
diff --git a/sec-policy/selinux-wireshark/files/fix-apps-wireshark-r1.patch b/sec-policy/selinux-wireshark/files/fix-apps-wireshark-r1.patch
deleted file mode 100644
index 291a77c7a179..000000000000
--- a/sec-policy/selinux-wireshark/files/fix-apps-wireshark-r1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- apps/wireshark.te	2010-12-13 15:11:01.000000000 +0100
-+++ apps/wireshark.te	2011-02-10 22:07:27.561999998 +0100
-@@ -35,18 +35,20 @@
- #
- 
- allow wireshark_t self:capability { net_admin net_raw setgid };
--allow wireshark_t self:process { signal getsched };
-+allow wireshark_t self:process { signal getsched setcap };
- allow wireshark_t self:fifo_file { getattr read write };
- allow wireshark_t self:shm destroy;
- allow wireshark_t self:shm create_shm_perms;
- allow wireshark_t self:netlink_route_socket { nlmsg_read create_socket_perms };
--allow wireshark_t self:packet_socket { setopt bind ioctl getopt create read };
-+allow wireshark_t self:packet_socket { setopt bind ioctl getopt create read write };
- allow wireshark_t self:tcp_socket create_socket_perms;
- allow wireshark_t self:udp_socket create_socket_perms;
- 
- # Re-execute itself (why?)
- can_exec(wireshark_t, wireshark_exec_t)
- corecmd_search_bin(wireshark_t)
-+corecmd_exec_bin(wireshark_t)
-+corecmd_exec_shell(wireshark_t)
- 
- # /home/.wireshark
- manage_dirs_pattern(wireshark_t, wireshark_home_t, wireshark_home_t)
-@@ -70,12 +72,17 @@
- kernel_read_system_state(wireshark_t)
- kernel_read_sysctl(wireshark_t)
- 
-+selinux_getattr_fs(wireshark_t)
-+
- corecmd_search_bin(wireshark_t)
- 
- corenet_tcp_connect_generic_port(wireshark_t)
- corenet_tcp_sendrecv_generic_if(wireshark_t)
- 
-+dev_read_sysfs(wireshark_t)
- dev_read_urand(wireshark_t)
-+dev_read_rand(wireshark_t)
-+dev_search_sysfs(wireshark_t)
- 
- files_read_etc_files(wireshark_t)
- files_read_usr_files(wireshark_t)
-@@ -92,7 +99,10 @@
- 
- sysnet_read_config(wireshark_t)
- 
-+userdom_exec_user_home_content_files(wireshark_t)
-+userdom_user_home_dir_filetrans_user_home_content(wireshark_t, { file lnk_file fifo_file sock_file })
- userdom_manage_user_home_content_files(wireshark_t)
-+userdom_use_user_terminals(wireshark_t)
- 
- tunable_policy(`use_nfs_home_dirs',`
- 	fs_manage_nfs_dirs(wireshark_t)
---- apps/wireshark.fc	2010-08-03 15:11:04.000000000 +0200
-+++ apps/wireshark.fc	2011-02-08 21:31:40.547999979 +0100
-@@ -1,3 +1,3 @@
- HOME_DIR/\.wireshark(/.*)? 		gen_context(system_u:object_r:wireshark_home_t,s0)
--
-+HOME_DIR/ffi(.*)		--	gen_context(system_u:object_r:wireshark_home_exec_t,s0)
- /usr/bin/wireshark		--	gen_context(system_u:object_r:wireshark_exec_t,s0)
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20101213-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20101213-r1.ebuild
deleted file mode 100644
index 9b4e118abdfa..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20101213-r1.ebuild
+++ /dev/null
@@ -1,14 +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-wireshark/selinux-wireshark-2.20101213-r1.ebuild,v 1.2 2011/06/02 13:10:32 blueness Exp $
-
-MODS="wireshark"
-IUSE=""
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-
-KEYWORDS="amd64 x86"
-
-POLICY_PATCH="${FILESDIR}/fix-apps-wireshark-r1.patch"
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20110726-r1.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20110726-r1.ebuild
deleted file mode 100644
index c46a99dd6d77..000000000000
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20110726-r1.ebuild
+++ /dev/null
@@ -1,13 +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-wireshark/selinux-wireshark-2.20110726-r1.ebuild,v 1.1 2011/08/28 21:12:38 swift Exp $
-EAPI="4"
-
-IUSE=""
-MODS="wireshark"
-BASEPOL="2.20110726-r1"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for wireshark"
-KEYWORDS="~amd64 ~x86"