[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

[Jason Zaman]

commit:     192f02005a5673e022d3cc7ff18af83855faceba
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Sun Aug  6 21:03:06 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 22:48:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=192f0200

Remove deprecated interfaces more than one year old.

 policy/modules/contrib/abrt.if        | 16 --------
 policy/modules/contrib/alsa.if        | 51 ------------------------
 policy/modules/contrib/automount.if   | 15 -------
 policy/modules/contrib/awstats.if     | 28 -------------
 policy/modules/contrib/bind.if        | 14 -------
 policy/modules/contrib/bluetooth.if   | 40 -------------------
 policy/modules/contrib/certwatch.if   | 29 --------------
 policy/modules/contrib/clogd.if       | 15 -------
 policy/modules/contrib/cobbler.if     | 22 ----------
 policy/modules/contrib/corosync.if    | 22 ----------
 policy/modules/contrib/cups.if        | 14 -------
 policy/modules/contrib/dbus.if        | 75 -----------------------------------
 policy/modules/contrib/dictd.if       | 15 -------
 policy/modules/contrib/finger.if      | 14 -------
 policy/modules/contrib/ftp.if         | 14 -------
 policy/modules/contrib/glusterfs.if   | 22 ----------
 policy/modules/contrib/gnome.if       | 66 ------------------------------
 policy/modules/contrib/gpg.if         | 14 -------
 policy/modules/contrib/i18n_input.if  | 14 -------
 policy/modules/contrib/inetd.if       | 28 -------------
 policy/modules/contrib/iodine.if      | 22 ----------
 policy/modules/contrib/jabber.if      | 14 -------
 policy/modules/contrib/kerberos.if    | 41 -------------------
 policy/modules/contrib/ldap.if        | 14 -------
 policy/modules/contrib/mandb.if       | 57 --------------------------
 policy/modules/contrib/mojomojo.if    | 22 ----------
 policy/modules/contrib/mozilla.if     | 31 ---------------
 policy/modules/contrib/mpd.if         | 19 ---------
 policy/modules/contrib/mta.if         | 14 -------
 policy/modules/contrib/mysql.if       | 34 ----------------
 policy/modules/contrib/nessus.if      | 14 -------
 policy/modules/contrib/nis.if         | 28 -------------
 policy/modules/contrib/nsd.if         | 28 -------------
 policy/modules/contrib/oident.if      | 19 ---------
 policy/modules/contrib/pcscd.if       | 45 ---------------------
 policy/modules/contrib/perdition.if   | 14 -------
 policy/modules/contrib/portmap.if     | 42 --------------------
 policy/modules/contrib/postfix.if     | 32 ---------------
 policy/modules/contrib/ppp.if         | 19 ---------
 policy/modules/contrib/pulseaudio.if  | 31 ---------------
 policy/modules/contrib/radius.if      | 14 -------
 policy/modules/contrib/rpc.if         | 28 -------------
 policy/modules/contrib/rpm.if         | 16 --------
 policy/modules/contrib/sendmail.if    | 16 --------
 policy/modules/contrib/slocate.if     | 14 -------
 policy/modules/contrib/snmp.if        | 14 -------
 policy/modules/contrib/soundserver.if | 14 -------
 policy/modules/contrib/squid.if       | 14 -------
 policy/modules/contrib/virt.if        | 16 --------
 49 files changed, 1214 deletions(-)

diff --git a/policy/modules/contrib/abrt.if b/policy/modules/contrib/abrt.if
index 39b6d291..9d1f00da 100644
--- a/policy/modules/contrib/abrt.if
+++ b/policy/modules/contrib/abrt.if
@@ -164,22 +164,6 @@ interface(`abrt_run_helper',`
 ########################################
 ## <summary>
 ##	Create, read, write, and delete
-##	abrt cache files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`abrt_cache_manage',`
-	refpolicywarn(`$0($*) has been deprecated, use abrt_manage_cache() instead.')
-	abrt_manage_cache($1)
-')
-
-########################################
-## <summary>
-##	Create, read, write, and delete
 ##	abrt cache content.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/alsa.if b/policy/modules/contrib/alsa.if
index d50f5e33..9cff9efb 100644
--- a/policy/modules/contrib/alsa.if
+++ b/policy/modules/contrib/alsa.if
@@ -2,25 +2,6 @@
 
 ########################################
 ## <summary>
-##	Role access for alsa.
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-template(`alsa_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Execute a domain transition to run Alsa.
 ## </summary>
 ## <param name="domain">
@@ -102,22 +83,6 @@ interface(`alsa_rw_shared_mem',`
 
 ########################################
 ## <summary>
-##	Read writable Alsa configuration
-##	content.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`alsa_read_rw_config',`
-	refpolicywarn(`$0($*) has been deprecated, use alsa_read_config() instead.')
-	alsa_read_config($1)
-')
-
-########################################
-## <summary>
 ##	Read Alsa configuration content.
 ## </summary>
 ## <param name="domain">
@@ -139,22 +104,6 @@ interface(`alsa_read_config',`
 
 ########################################
 ## <summary>
-##	Manage writable Alsa config
-##	files.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`alsa_manage_rw_config',`
-	refpolicywarn(`$0($*) has been deprecated, use alsa_manage_config() instead.')
-	alsa_manage_config($1)
-')
-
-########################################
-## <summary>
 ##	Manage Alsa config files.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/automount.if b/policy/modules/contrib/automount.if
index 37847d93..fbaa3220 100644
--- a/policy/modules/contrib/automount.if
+++ b/policy/modules/contrib/automount.if
@@ -40,21 +40,6 @@ interface(`automount_signal',`
 
 ########################################
 ## <summary>
-##	Execute automount in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`automount_exec_config',`
-	refpolicywarn(`$0(): has been deprecated, please use files_exec_etc_files() instead.')
-	files_exec_etc_files($1)
-')
-
-########################################
-## <summary>
 ##	Read automount process state.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/awstats.if b/policy/modules/contrib/awstats.if
index 68616dd9..e86fe87f 100644
--- a/policy/modules/contrib/awstats.if
+++ b/policy/modules/contrib/awstats.if
@@ -19,31 +19,3 @@ interface(`awstats_domtrans',`
 	corecmd_search_bin($1)
 	domtrans_pattern($1, awstats_exec_t, awstats_t)
 ')
-
-########################################
-## <summary>
-##	Read and write awstats unnamed pipes. (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`awstats_rw_pipes',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
-##	Execute awstats cgi scripts in the caller domain. (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`awstats_cgi_exec',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')

diff --git a/policy/modules/contrib/bind.if b/policy/modules/contrib/bind.if
index 7193af63..a99bae9c 100644
--- a/policy/modules/contrib/bind.if
+++ b/policy/modules/contrib/bind.if
@@ -331,20 +331,6 @@ interface(`bind_manage_zone',`
 
 ########################################
 ## <summary>
-##	Send and receive datagrams to and from named.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`bind_udp_chat_named',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an bind environment.
 ## </summary>

diff --git a/policy/modules/contrib/bluetooth.if b/policy/modules/contrib/bluetooth.if
index 09d6248d..dc61988c 100644
--- a/policy/modules/contrib/bluetooth.if
+++ b/policy/modules/contrib/bluetooth.if
@@ -130,46 +130,6 @@ interface(`bluetooth_dbus_chat',`
 
 ########################################
 ## <summary>
-##	Execute bluetooth_helper in the bluetooth_helper domain.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`bluetooth_domtrans_helper',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
-##	Execute bluetooth_helper in the bluetooth_helper domain, and
-##	allow the specified role the bluetooth_helper domain.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="terminal">
-##	<summary>
-##	The type of the terminal allow the bluetooth_helper domain to use.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`bluetooth_run_helper',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Do not audit attempts to read
 ##	bluetooth process state files.
 ## </summary>

diff --git a/policy/modules/contrib/certwatch.if b/policy/modules/contrib/certwatch.if
index 9291c5cc..54e6e661 100644
--- a/policy/modules/contrib/certwatch.if
+++ b/policy/modules/contrib/certwatch.if
@@ -46,32 +46,3 @@ interface(`certwatch_run',`
 	certwatch_domtrans($1)
 	roleattribute $2 certwatch_roles;
 ')
-
-########################################
-## <summary>
-##	Execute certwatch in the certwatch domain, and
-##	allow the specified role the certwatch domain,
-##	and use the caller's terminal. Has a sigchld
-##	backchannel.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="terminal">
-##	<summary>
-##	The type of the terminal allow the certwatch domain to use.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`certwatach_run',`
-	refpolicywarn(`$0($*) has been deprecated, please use certwatch_run() instead.')
-	certwatch_run($*)
-')

diff --git a/policy/modules/contrib/clogd.if b/policy/modules/contrib/clogd.if
index 221d9143..dce4cb19 100644
--- a/policy/modules/contrib/clogd.if
+++ b/policy/modules/contrib/clogd.if
@@ -21,21 +21,6 @@ interface(`clogd_domtrans',`
 
 #####################################
 ## <summary>
-##	Connect to clogd over a unix domain
-##	stream socket.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`clogd_stream_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-#####################################
-## <summary>
 ##	Read and write clogd semaphores.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/cobbler.if b/policy/modules/contrib/cobbler.if
index 376fa84b..40f89990 100644
--- a/policy/modules/contrib/cobbler.if
+++ b/policy/modules/contrib/cobbler.if
@@ -151,28 +151,6 @@ interface(`cobbler_manage_lib_files',`
 ## </param>
 ## <rolecap/>
 #
-interface(`cobblerd_admin',`
-	refpolicywarn(`$0($*) has been deprecated, use cobbler_admin() instead.')
-	cobbler_admin($1, $2)
-')
-
-########################################
-## <summary>
-##	All of the rules required to
-##	administrate an cobbler environment.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
 interface(`cobbler_admin',`
 	gen_require(`
 		type cobblerd_t, cobbler_var_lib_t, cobbler_var_log_t;

diff --git a/policy/modules/contrib/corosync.if b/policy/modules/contrib/corosync.if
index 57736aab..2b2d11af 100644
--- a/policy/modules/contrib/corosync.if
+++ b/policy/modules/contrib/corosync.if
@@ -133,28 +133,6 @@ interface(`corosync_rw_tmpfs',`
 ## </param>
 ## <rolecap/>
 #
-interface(`corosyncd_admin',`
-	refpolicywarn(`$0($*) has been deprecated, use corosync_admin() instead.')
-	corosync_admin($1, $2)
-')
-
-######################################
-## <summary>
-##	All of the rules required to
-##	administrate an corosync environment.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
 interface(`corosync_admin',`
 	gen_require(`
 		type corosync_t, corosync_var_lib_t, corosync_var_log_t;

diff --git a/policy/modules/contrib/cups.if b/policy/modules/contrib/cups.if
index bd6b77f4..73887e50 100644
--- a/policy/modules/contrib/cups.if
+++ b/policy/modules/contrib/cups.if
@@ -75,20 +75,6 @@ interface(`cups_stream_connect',`
 
 ########################################
 ## <summary>
-##	Connect to cups over TCP.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`cups_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Send and receive messages from
 ##	cups over dbus.
 ## </summary>

diff --git a/policy/modules/contrib/dbus.if b/policy/modules/contrib/dbus.if
index 3893df7c..32824d9a 100644
--- a/policy/modules/contrib/dbus.if
+++ b/policy/modules/contrib/dbus.if
@@ -139,22 +139,6 @@ interface(`dbus_system_bus_client',`
 
 #######################################
 ## <summary>
-##	Acquire service on DBUS
-##	session bus.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`dbus_connect_session_bus',`
-	refpolicywarn(`$0($*) has been deprecated, use dbus_connect_all_session_bus() instead.')
-	dbus_connect_all_session_bus($1)
-')
-
-#######################################
-## <summary>
 ##	Acquire service on all DBUS
 ##	session busses.
 ## </summary>
@@ -201,22 +185,6 @@ interface(`dbus_connect_spec_session_bus',`
 
 #######################################
 ## <summary>
-##	Creating connections to DBUS
-##	session bus.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`dbus_session_bus_client',`
-	refpolicywarn(`$0($*) has been deprecated, use dbus_all_session_bus_client() instead.')
-	dbus_all_session_bus_client($1)
-')
-
-#######################################
-## <summary>
 ##	Creating connections to all
 ##	DBUS session busses.
 ## </summary>
@@ -276,21 +244,6 @@ interface(`dbus_spec_session_bus_client',`
 
 #######################################
 ## <summary>
-##	Send messages to DBUS session bus.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`dbus_send_session_bus',`
-	refpolicywarn(`$0($*) has been deprecated, use dbus_send_all_session_bus() instead.')
-	dbus_send_all_session_bus($1)
-')
-
-#######################################
-## <summary>
 ##	Send messages to all DBUS
 ##	session busses.
 ## </summary>
@@ -399,34 +352,6 @@ interface(`dbus_manage_lib_files',`
 ##	Allow a application domain to be
 ##	started by the specified session bus.
 ## </summary>
-## <param name="role_prefix">
-##	<summary>
-##	The prefix of the user role (e.g., user
-##	is the prefix for user_r).
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	Type to be used as a domain.
-##	</summary>
-## </param>
-## <param name="entry_point">
-##	<summary>
-##	Type of the program to be used as an
-##	entry point to this domain.
-##	</summary>
-## </param>
-#
-interface(`dbus_session_domain',`
-	refpolicywarn(`$0($*) has been deprecated, use dbus_all_session_domain() instead.')
-	dbus_all_session_domain($1, $2)
-')
-
-########################################
-## <summary>
-##	Allow a application domain to be
-##	started by the specified session bus.
-## </summary>
 ## <param name="domain">
 ##	<summary>
 ##	Type to be used as a domain.

diff --git a/policy/modules/contrib/dictd.if b/policy/modules/contrib/dictd.if
index 3878acc7..6feb8280 100644
--- a/policy/modules/contrib/dictd.if
+++ b/policy/modules/contrib/dictd.if
@@ -2,21 +2,6 @@
 
 ########################################
 ## <summary>
-##	Use dictionary services by connecting
-##	over TCP.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`dictd_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an dictd environment.
 ## </summary>

diff --git a/policy/modules/contrib/finger.if b/policy/modules/contrib/finger.if
index 2656d2b5..a071cfd4 100644
--- a/policy/modules/contrib/finger.if
+++ b/policy/modules/contrib/finger.if
@@ -18,17 +18,3 @@ interface(`finger_domtrans',`
 	corecmd_search_bin($1)
 	domtrans_pattern($1, fingerd_exec_t, fingerd_t)
 ')
-
-########################################
-## <summary>
-##	Connect to fingerd with a tcp socket.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`finger_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')

diff --git a/policy/modules/contrib/ftp.if b/policy/modules/contrib/ftp.if
index 93fd4be4..349d1b3b 100644
--- a/policy/modules/contrib/ftp.if
+++ b/policy/modules/contrib/ftp.if
@@ -20,20 +20,6 @@ interface(`ftp_dyntrans_anon_sftpd',`
 
 ########################################
 ## <summary>
-##	Connect to over ftpd over TCP.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`ftp_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Read ftpd configuration files.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/glusterfs.if b/policy/modules/contrib/glusterfs.if
index 0945d876..b4f5d01c 100644
--- a/policy/modules/contrib/glusterfs.if
+++ b/policy/modules/contrib/glusterfs.if
@@ -17,28 +17,6 @@
 ## </param>
 ## <rolecap/>
 #
-interface(`glusterd_admin',`
-	refpolicywarn(`$0($*) has been deprecated, use glusterfs_admin() instead.')
-	glusterfs_admin($1, $2)
-')
-
-########################################
-## <summary>
-##	All of the rules required to
-##	administrate an glusterfs environment.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
 interface(`glusterfs_admin',`
 	gen_require(`
 		type glusterd_t, glusterd_initrc_exec_t, glusterd_log_t;

diff --git a/policy/modules/contrib/gnome.if b/policy/modules/contrib/gnome.if
index edf4d4e6..2eb4f047 100644
--- a/policy/modules/contrib/gnome.if
+++ b/policy/modules/contrib/gnome.if
@@ -1,24 +1,5 @@
 ## <summary>GNU network object model environment.</summary>
 
-########################################
-## <summary>
-##	Role access for gnome.  (Deprecated)
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-interface(`gnome_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
 #######################################
 ## <summary>
 ##	The role template for gnome.
@@ -267,22 +248,6 @@ interface(`gnome_create_generic_home_dirs',`
 ########################################
 ## <summary>
 ##	Set attributes of generic gnome
-##	user home directories.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`gnome_setattr_config_dirs',`
-	refpolicywarn(`$0($*) has been deprecated, use gnome_setattr_generic_home_dirs() instead.')
-	gnome_setattr_generic_home_dirs($1)
-')
-
-########################################
-## <summary>
-##	Set attributes of generic gnome
 ##	user home directories.
 ## </summary>
 ## <param name="domain">
@@ -302,21 +267,6 @@ interface(`gnome_setattr_generic_home_dirs',`
 
 ########################################
 ## <summary>
-##	Read generic gnome user home content.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`gnome_read_config',`
-	refpolicywarn(`$0($*) has been deprecated, use gnome_read_generic_home_content() instead.')
-	gnome_read_generic_home_content($1)
-')
-
-########################################
-## <summary>
 ##	Read generic gnome home content.
 ## </summary>
 ## <param name="domain">
@@ -341,22 +291,6 @@ interface(`gnome_read_generic_home_content',`
 ########################################
 ## <summary>
 ##	Create, read, write, and delete
-##	generic gnome user home content.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`gnome_manage_config',`
-	refpolicywarn(`$0($*) has been deprecated, use gnome_manage_generic_home_content() instead.')
-	gnome_manage_generic_home_content($1)
-')
-
-########################################
-## <summary>
-##	Create, read, write, and delete
 ##	generic gnome home content.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/gpg.if b/policy/modules/contrib/gpg.if
index 4f118bf3..c4b7c4cd 100644
--- a/policy/modules/contrib/gpg.if
+++ b/policy/modules/contrib/gpg.if
@@ -125,20 +125,6 @@ interface(`gpg_spec_domtrans',`
 
 ######################################
 ## <summary>
-##	Execute gpg in the gpg web domain.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`gpg_domtrans_web',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-######################################
-## <summary>
 ##	Make gpg executable files an
 ##	entrypoint for the specified domain.
 ## </summary>

diff --git a/policy/modules/contrib/i18n_input.if b/policy/modules/contrib/i18n_input.if
index b9082642..4e08c3cf 100644
--- a/policy/modules/contrib/i18n_input.if
+++ b/policy/modules/contrib/i18n_input.if
@@ -2,20 +2,6 @@
 
 ########################################
 ## <summary>
-##	Use i18n_input over a TCP connection.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`i18n_use',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an i18n input environment.
 ## </summary>

diff --git a/policy/modules/contrib/inetd.if b/policy/modules/contrib/inetd.if
index fbb54e7d..593cd40b 100644
--- a/policy/modules/contrib/inetd.if
+++ b/policy/modules/contrib/inetd.if
@@ -140,20 +140,6 @@ interface(`inetd_use_fds',`
 
 ########################################
 ## <summary>
-##	Connect to the inetd service using a TCP connection.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`inetd_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Run inetd child process in the
 ##	inet child domain.
 ## </summary>
@@ -174,20 +160,6 @@ interface(`inetd_domtrans_child',`
 
 ########################################
 ## <summary>
-##	Send UDP network traffic to inetd.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`inetd_udp_send',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Read and write inetd TCP sockets.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/iodine.if b/policy/modules/contrib/iodine.if
index 87e47eb2..99f1afd1 100644
--- a/policy/modules/contrib/iodine.if
+++ b/policy/modules/contrib/iodine.if
@@ -17,28 +17,6 @@
 ## </param>
 ## <rolecap/>
 #
-interface(`iodined_admin',`
-	refpolicywarn(`$0($*) has been deprecated, use iodine_admin() instead.')
-	iodine_admin($1, $2)
-')
-
-########################################
-## <summary>
-##	All of the rules required to
-##	administrate an iodined environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
 interface(`iodine_admin',`
 	gen_require(`
 		type iodined_t, iodined_initrc_exec_t;

diff --git a/policy/modules/contrib/jabber.if b/policy/modules/contrib/jabber.if
index 549dac1f..9a31ee51 100644
--- a/policy/modules/contrib/jabber.if
+++ b/policy/modules/contrib/jabber.if
@@ -42,20 +42,6 @@ interface(`jabber_manage_lib_files',`
 
 ########################################
 ## <summary>
-##	Connect to jabber over a TCP socket  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`jabber_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an jabber environment.
 ## </summary>

diff --git a/policy/modules/contrib/kerberos.if b/policy/modules/contrib/kerberos.if
index 01caeead..c8c5a37d 100644
--- a/policy/modules/contrib/kerberos.if
+++ b/policy/modules/contrib/kerberos.if
@@ -2,25 +2,6 @@
 
 ########################################
 ## <summary>
-##	Role access for kerberos.
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-template(`kerberos_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Execute kadmind in the caller domain.
 ## </summary>
 ## <param name="domain">
@@ -339,28 +320,6 @@ interface(`kerberos_etc_filetrans_keytab',`
 
 ########################################
 ## <summary>
-##	Create a derived type for kerberos
-##	keytab files.
-## </summary>
-## <param name="prefix">
-##	<summary>
-##	The prefix to be used for deriving type names.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-template(`kerberos_keytab_template',`
-	refpolicywarn(`$0($*) has been deprecated.')
-	kerberos_read_keytab($2)
-	kerberos_use($2)
-')
-
-########################################
-## <summary>
 ##	Read kerberos kdc configuration files.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/ldap.if b/policy/modules/contrib/ldap.if
index b4eabc96..59752140 100644
--- a/policy/modules/contrib/ldap.if
+++ b/policy/modules/contrib/ldap.if
@@ -41,20 +41,6 @@ interface(`ldap_read_config',`
 
 ########################################
 ## <summary>
-##	Use LDAP over TCP connection.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`ldap_use',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Connect to slapd over an unix
 ##	stream socket.
 ## </summary>

diff --git a/policy/modules/contrib/mandb.if b/policy/modules/contrib/mandb.if
index 2b5d5385..e880655d 100644
--- a/policy/modules/contrib/mandb.if
+++ b/policy/modules/contrib/mandb.if
@@ -48,63 +48,6 @@ interface(`mandb_run',`
 
 ########################################
 ## <summary>
-##	Search mandb cache directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mandb_search_cache',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
-##	Delete mandb cache content.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mandb_delete_cache_content',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
-##	Read mandb cache content.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mandb_read_cache_content',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
-##	Create, read, write, and delete
-##	mandb cache files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mandb_manage_cache_content',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an mandb environment.
 ## </summary>

diff --git a/policy/modules/contrib/mojomojo.if b/policy/modules/contrib/mojomojo.if
index 73952f4c..6680a087 100644
--- a/policy/modules/contrib/mojomojo.if
+++ b/policy/modules/contrib/mojomojo.if
@@ -1,23 +1 @@
 ## <summary>MojoMojo Wiki.</summary>
-
-########################################
-## <summary>
-##	All of the rules required to
-##	administrate an mojomojo environment.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`mojomojo_admin',`
-	refpolicywarn(`$0($*) has been deprecated, use apache_admin() instead.')
-	apache_admin($1, $2)
-')

diff --git a/policy/modules/contrib/mozilla.if b/policy/modules/contrib/mozilla.if
index 70390632..178d68d8 100644
--- a/policy/modules/contrib/mozilla.if
+++ b/policy/modules/contrib/mozilla.if
@@ -242,21 +242,6 @@ interface(`mozilla_dontaudit_manage_user_home_files',`
 
 ########################################
 ## <summary>
-##	Execute mozilla home directory files.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mozilla_exec_user_home_files',`
-	refpolicywarn(`$0($*) has been deprecated, use mozilla_exec_user_plugin_home_files() instead.')
-	mozilla_exec_user_plugin_home_files($1)
-')
-
-########################################
-## <summary>
 ##	Execute mozilla plugin home directory files.
 ## </summary>
 ## <param name="domain">
@@ -276,22 +261,6 @@ interface(`mozilla_exec_user_plugin_home_files',`
 
 ########################################
 ## <summary>
-##	Mozilla home directory file
-##	text relocation.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mozilla_execmod_user_home_files',`
-	refpolicywarn(`$0($*) has been deprecated, use mozilla_execmod_user_plugin_home_files() instead.')
-	mozilla_execmod_user_plugin_home_files($1)
-')
-
-########################################
-## <summary>
 ##	Mozilla plugin home directory file
 ##	text relocation.
 ## </summary>

diff --git a/policy/modules/contrib/mpd.if b/policy/modules/contrib/mpd.if
index 384599fd..02faa37e 100644
--- a/policy/modules/contrib/mpd.if
+++ b/policy/modules/contrib/mpd.if
@@ -2,25 +2,6 @@
 
 ########################################
 ## <summary>
-##	Role access for mpd.
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-template(`mpd_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Execute a domain transition to run mpd.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/mta.if b/policy/modules/contrib/mta.if
index 7e268b80..0602746b 100644
--- a/policy/modules/contrib/mta.if
+++ b/policy/modules/contrib/mta.if
@@ -753,20 +753,6 @@ interface(`mta_dontaudit_rw_delivery_tcp_sockets',`
 
 #######################################
 ## <summary>
-##	Connect to all mail servers over TCP.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mta_tcp_connect_all_mailservers',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-#######################################
-## <summary>
 ##	Do not audit attempts to read
 ##	mail spool symlinks.
 ## </summary>

diff --git a/policy/modules/contrib/mysql.if b/policy/modules/contrib/mysql.if
index e7250f7f..af59114a 100644
--- a/policy/modules/contrib/mysql.if
+++ b/policy/modules/contrib/mysql.if
@@ -1,24 +1,5 @@
 ## <summary>Open source database.</summary>
 
-########################################
-## <summary>
-##	Role access for mysql.
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-interface(`mysql_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
 ######################################
 ## <summary>
 ##	Execute MySQL in the mysql domain.
@@ -263,21 +244,6 @@ interface(`mysql_manage_db_files',`
 
 ########################################
 ## <summary>
-##	Read and write mysqld database sockets.
-##	named socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`mysql_rw_db_sockets',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Create, read, write, and delete
 ##	mysqld home files.
 ## </summary>

diff --git a/policy/modules/contrib/nessus.if b/policy/modules/contrib/nessus.if
index f41ec5f3..57bed033 100644
--- a/policy/modules/contrib/nessus.if
+++ b/policy/modules/contrib/nessus.if
@@ -2,20 +2,6 @@
 
 ########################################
 ## <summary>
-##	Connect to nessus over a TCP socket  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`nessus_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an nessus environment.
 ## </summary>

diff --git a/policy/modules/contrib/nis.if b/policy/modules/contrib/nis.if
index 718db6ea..66a3ba28 100644
--- a/policy/modules/contrib/nis.if
+++ b/policy/modules/contrib/nis.if
@@ -215,34 +215,6 @@ interface(`nis_list_var_yp',`
 
 ########################################
 ## <summary>
-##	Send UDP network traffic to NIS clients.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`nis_udp_send_ypbind',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
-##	Connect to ypbind over TCP.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`nis_tcp_connect_ypbind',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Read ypbind pid files.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/nsd.if b/policy/modules/contrib/nsd.if
index 8ec6ec4e..e071bcd0 100644
--- a/policy/modules/contrib/nsd.if
+++ b/policy/modules/contrib/nsd.if
@@ -2,34 +2,6 @@
 
 ########################################
 ## <summary>
-##	Send and receive datagrams from NSD.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`nsd_udp_chat',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
-##	Connect to NSD over a TCP socket  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`nsd_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an nsd environment.
 ## </summary>

diff --git a/policy/modules/contrib/oident.if b/policy/modules/contrib/oident.if
index c317a3aa..95b329ef 100644
--- a/policy/modules/contrib/oident.if
+++ b/policy/modules/contrib/oident.if
@@ -2,25 +2,6 @@
 
 ########################################
 ## <summary>
-##	Role access for oident.
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-interface(`oident_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Read oidentd user home content.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/pcscd.if b/policy/modules/contrib/pcscd.if
index b5c522d3..412c24aa 100644
--- a/policy/modules/contrib/pcscd.if
+++ b/policy/modules/contrib/pcscd.if
@@ -29,21 +29,6 @@ interface(`pcscd_domtrans',`
 ##	</summary>
 ## </param>
 #
-interface(`pcscd_read_pub_files',`
-	refpolicywarn(`$0($*) has been deprecated, use pcscd_read_pid_files() instead.')
-	pcscd_read_pid_files($1)
-')
-
-########################################
-## <summary>
-##	Read pcscd pid files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
 interface(`pcscd_read_pid_files',`
 	gen_require(`
 		type pcscd_var_run_t;
@@ -55,36 +40,6 @@ interface(`pcscd_read_pid_files',`
 
 ########################################
 ## <summary>
-##	Create, read, write, and delete
-##	pcscd pid files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`pcscd_manage_pub_files',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
-##	Create, read, write, and delete
-##	pcscd pid fifo files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`pcscd_manage_pub_pipes',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Connect to pcscd over an unix
 ##	domain stream socket.
 ## </summary>

diff --git a/policy/modules/contrib/perdition.if b/policy/modules/contrib/perdition.if
index 092ac614..4d69d909 100644
--- a/policy/modules/contrib/perdition.if
+++ b/policy/modules/contrib/perdition.if
@@ -2,20 +2,6 @@
 
 ########################################
 ## <summary>
-##	Connect to perdition over a TCP socket  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`perdition_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an perdition environment.
 ## </summary>

diff --git a/policy/modules/contrib/portmap.if b/policy/modules/contrib/portmap.if
index f0af3fe3..52208ce0 100644
--- a/policy/modules/contrib/portmap.if
+++ b/policy/modules/contrib/portmap.if
@@ -48,48 +48,6 @@ interface(`portmap_run_helper',`
 
 ########################################
 ## <summary>
-##	Send UDP network traffic to portmap.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`portmap_udp_send',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
-##	Send and receive UDP network traffic from portmap.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`portmap_udp_chat',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
-##	Connect to portmap over a TCP socket  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`portmap_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an portmap environment.
 ## </summary>

diff --git a/policy/modules/contrib/postfix.if b/policy/modules/contrib/postfix.if
index 19fe6132..fa17bde4 100644
--- a/policy/modules/contrib/postfix.if
+++ b/policy/modules/contrib/postfix.if
@@ -428,22 +428,6 @@ interface(`postfix_stream_connect_master',`
 
 ########################################
 ## <summary>
-##	Read and write postfix master
-##	unnamed pipes.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`postfix_rw_master_pipes',`
-	refpolicywarn(`$0($*) has been deprecated, use postfix_rw_inherited_master_pipes() instead.')
-	postfix_rw_inherited_master_pipes($1)
-')
-
-########################################
-## <summary>
 ##	Execute the master postdrop in the
 ##	postfix postdrop domain.
 ## </summary>
@@ -484,22 +468,6 @@ interface(`postfix_domtrans_postqueue',`
 
 #######################################
 ## <summary>
-##	Execute the master postqueue in
-##	the caller domain.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`posftix_exec_postqueue',`
-	refpolicywarn(`$0($*) has been deprecated.')
-	postfix_exec_postqueue($1)
-')
-
-#######################################
-## <summary>
 ##	Execute postfix postqueue in
 ##	the caller domain.
 ## </summary>

diff --git a/policy/modules/contrib/ppp.if b/policy/modules/contrib/ppp.if
index 0376e92f..070e565c 100644
--- a/policy/modules/contrib/ppp.if
+++ b/policy/modules/contrib/ppp.if
@@ -2,25 +2,6 @@
 
 ########################################
 ## <summary>
-##	Role access for ppp.
-## </summary>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <param name="domain">
-##	<summary>
-##	User domain for the role.
-##	</summary>
-## </param>
-#
-interface(`ppp_role',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Create, read, write, and delete
 ##	ppp home files.
 ## </summary>

diff --git a/policy/modules/contrib/pulseaudio.if b/policy/modules/contrib/pulseaudio.if
index 7236f624..921e519c 100644
--- a/policy/modules/contrib/pulseaudio.if
+++ b/policy/modules/contrib/pulseaudio.if
@@ -254,21 +254,6 @@ interface(`pulseaudio_setattr_home_dir',`
 ##	</summary>
 ## </param>
 #
-interface(`pulseaudio_read_home_files',`
-	refpolicywarn(`$0($*) has been deprecated, use pulseaudio_read_home() instead.')
-	pulseaudio_read_home($1)
-')
-
-########################################
-## <summary>
-##	Read pulseaudio home content.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
 interface(`pulseaudio_read_home',`
 	gen_require(`
 		type pulseaudio_home_t;
@@ -311,22 +296,6 @@ interface(`pulseaudio_rw_home_files',`
 ##	</summary>
 ## </param>
 #
-interface(`pulseaudio_manage_home_files',`
-	refpolicywarn(`$0($*) has been deprecated, use pulseaudio_manage_home() instead.')
-	pulseaudio_manage_home($1)
-')
-
-########################################
-## <summary>
-##	Create, read, write, and delete
-##	pulseaudio home content.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
 interface(`pulseaudio_manage_home',`
 	gen_require(`
 		type pulseaudio_home_t;

diff --git a/policy/modules/contrib/radius.if b/policy/modules/contrib/radius.if
index 7703bc78..bce89c30 100644
--- a/policy/modules/contrib/radius.if
+++ b/policy/modules/contrib/radius.if
@@ -2,20 +2,6 @@
 
 ########################################
 ## <summary>
-##	Use radius over a UDP connection.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`radius_use',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an radius environment.
 ## </summary>

diff --git a/policy/modules/contrib/rpc.if b/policy/modules/contrib/rpc.if
index fbf5995d..7063c42f 100644
--- a/policy/modules/contrib/rpc.if
+++ b/policy/modules/contrib/rpc.if
@@ -52,20 +52,6 @@ template(`rpc_domain_template',`
 
 ########################################
 ## <summary>
-##	Send UDP network traffic to rpc and recieve UDP traffic from rpc.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`rpc_udp_send',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Do not audit attempts to get
 ##	attributes of export files.
 ## </summary>
@@ -298,20 +284,6 @@ interface(`rpc_udp_rw_nfs_sockets',`
 
 ########################################
 ## <summary>
-##	Send UDP traffic to NFSd.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`rpc_udp_send_nfs',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Search nfs lib directories.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/rpm.if b/policy/modules/contrib/rpm.if
index 304e97cb..016cdb2a 100644
--- a/policy/modules/contrib/rpm.if
+++ b/policy/modules/contrib/rpm.if
@@ -564,22 +564,6 @@ interface(`rpm_manage_pid_files',`
 	files_search_pids($1)
 ')
 
-######################################
-## <summary>
-##	Create files in pid directories
-##	with the rpm pid file type.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`rpm_pid_filetrans',`
-	refpolicywarn(`$0($*) has been deprecated, rpm_pid_filetrans_rpm_pid() instead.')
-	rpm_pid_filetrans_rpm_pid($1, file)
-')
-
 ########################################
 ## <summary>
 ##	Create specified objects in pid directories

diff --git a/policy/modules/contrib/sendmail.if b/policy/modules/contrib/sendmail.if
index d60de843..5358d159 100644
--- a/policy/modules/contrib/sendmail.if
+++ b/policy/modules/contrib/sendmail.if
@@ -228,22 +228,6 @@ interface(`sendmail_manage_log',`
 ##	Domain allowed access.
 ##	</summary>
 ## </param>
-#
-interface(`sendmail_create_log',`
-	refpolicywarn(`$0($*) has been deprecated, use sendmail_log_filetrans_sendmail_log() instead.')
-	sendmail_log_filetrans_sendmail_log($1, $2, $3)
-')
-
-########################################
-## <summary>
-##	Create specified objects in generic
-##	log directories sendmail log file type.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
 ## <param name="object_class">
 ##	<summary>
 ##	Class of the object being created.

diff --git a/policy/modules/contrib/slocate.if b/policy/modules/contrib/slocate.if
index 1f25803d..82de1b68 100644
--- a/policy/modules/contrib/slocate.if
+++ b/policy/modules/contrib/slocate.if
@@ -2,20 +2,6 @@
 
 ########################################
 ## <summary>
-##	Create the locate log with append mode.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`slocate_create_append_log',`
-	refpolicywarn(`$0($*) has been deprecated')
-')
-
-########################################
-## <summary>
 ##	Read locate lib files.
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/snmp.if b/policy/modules/contrib/snmp.if
index 96775032..d8a75680 100644
--- a/policy/modules/contrib/snmp.if
+++ b/policy/modules/contrib/snmp.if
@@ -43,20 +43,6 @@ interface(`snmp_tcp_connect',`
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic to SNMP  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`snmp_udp_chat',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	Create, read, write, and delete
 ##	snmp lib directories.
 ## </summary>

diff --git a/policy/modules/contrib/soundserver.if b/policy/modules/contrib/soundserver.if
index 8dc1c0f4..106e0700 100644
--- a/policy/modules/contrib/soundserver.if
+++ b/policy/modules/contrib/soundserver.if
@@ -2,20 +2,6 @@
 
 ########################################
 ## <summary>
-##	Connect to the sound server over a TCP socket  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`soundserver_tcp_connect',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	All of the rules required to
 ##	administrate an soundd environment.
 ## </summary>

diff --git a/policy/modules/contrib/squid.if b/policy/modules/contrib/squid.if
index b5adfad3..2443afbd 100644
--- a/policy/modules/contrib/squid.if
+++ b/policy/modules/contrib/squid.if
@@ -177,20 +177,6 @@ interface(`squid_manage_logs',`
 
 ########################################
 ## <summary>
-##	Use squid services by connecting over TCP.  (Deprecated)
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`squid_use',`
-	refpolicywarn(`$0($*) has been deprecated.')
-')
-
-########################################
-## <summary>
 ##	dontaudit statting tmpfs files
 ## </summary>
 ## <param name="domain">

diff --git a/policy/modules/contrib/virt.if b/policy/modules/contrib/virt.if
index 8016cccb..993ee6c8 100644
--- a/policy/modules/contrib/virt.if
+++ b/policy/modules/contrib/virt.if
@@ -1069,22 +1069,6 @@ interface(`virt_rw_all_image_chr_files',`
 ########################################
 ## <summary>
 ##	Create, read, write, and delete
-##	svirt cache files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`virt_manage_svirt_cache',`
-	refpolicywarn(`$0($*) has been deprecated, use virt_manage_virt_cache() instead.')
-	virt_manage_virt_cache($1)
-')
-
-########################################
-## <summary>
-##	Create, read, write, and delete
 ##	virt cache content.
 ## </summary>
 ## <param name="domain">