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

[Jason Zaman]

commit:     fb0f304abe6689428b64dffe3e8337463ca28fb2
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Feb 21 08:04:56 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 08:06:53 2017 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=fb0f304a

Update deprecated interfaces

WERROR fails to build with the deprecated ones
domain_auto_trans -> domain_auto_transition_pattern
alsa_read_rw_config -> alsa_read_config

 policy/modules/contrib/alsa.te   | 2 +-
 policy/modules/contrib/dirsrv.if | 2 +-
 policy/modules/contrib/gorg.if   | 2 +-
 policy/modules/contrib/nginx.if  | 2 +-
 policy/modules/contrib/vde.if    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/policy/modules/contrib/alsa.te b/policy/modules/contrib/alsa.te
index 127333e9..6946ef0a 100644
--- a/policy/modules/contrib/alsa.te
+++ b/policy/modules/contrib/alsa.te
@@ -130,6 +130,6 @@ ifdef(`distro_gentoo',`
        # ALSA applications need access to /usr/share/alsa/*
        files_read_usr_files(alsadomain)
 
-       alsa_read_rw_config(alsadomain)
+       alsa_read_config(alsadomain)
        alsa_read_home_files(alsadomain)
 ')

diff --git a/policy/modules/contrib/dirsrv.if b/policy/modules/contrib/dirsrv.if
index af0aebe1..cbe9ecaf 100644
--- a/policy/modules/contrib/dirsrv.if
+++ b/policy/modules/contrib/dirsrv.if
@@ -17,7 +17,7 @@ interface(`dirsrv_domtrans',`
                type dirsrv_t, dirsrv_exec_t;
        ')
 
-       domain_auto_trans($1,dirsrv_exec_t,dirsrv_t)
+       domain_auto_transition_pattern($1, dirsrv_exec_t, dirsrv_t)
 
        allow dirsrv_t $1:fd use;
        allow dirsrv_t $1:fifo_file rw_file_perms;

diff --git a/policy/modules/contrib/gorg.if b/policy/modules/contrib/gorg.if
index 814d5593..6c5969c1 100644
--- a/policy/modules/contrib/gorg.if
+++ b/policy/modules/contrib/gorg.if
@@ -22,7 +22,7 @@ interface(`gorg_role',`
 
        role $1 types gorg_t;
 
-       domain_auto_trans($2, gorg_exec_t, gorg_t)
+       domain_auto_transition_pattern($2, gorg_exec_t, gorg_t)
        allow $2 gorg_t:process { noatsecure siginh rlimitinh };
        allow gorg_t $2:fd use;
        allow gorg_t $2:process { sigchld signull };

diff --git a/policy/modules/contrib/nginx.if b/policy/modules/contrib/nginx.if
index 6fa607a5..ebef6e75 100644
--- a/policy/modules/contrib/nginx.if
+++ b/policy/modules/contrib/nginx.if
@@ -60,7 +60,7 @@ interface(`nginx_domtrans',`
        allow nginx_t $1:fifo_file rw_file_perms;
        allow nginx_t $1:process sigchld;
 
-       domain_auto_trans($1,nginx_exec_t,nginx_t)
+       domain_auto_transition_pattern($1, nginx_exec_t, nginx_t)
 ')
 
 ########################################

diff --git a/policy/modules/contrib/vde.if b/policy/modules/contrib/vde.if
index 4a9c208b..00b31b4c 100644
--- a/policy/modules/contrib/vde.if
+++ b/policy/modules/contrib/vde.if
@@ -33,7 +33,7 @@ interface(`vde_role',`
        allow vde_t self:tun_socket { relabelfrom relabelto };
        ps_process_pattern($2, vde_t)
 
-       domain_auto_trans($2, vde_exec_t, vde_t)
+       domain_auto_transition_pattern($2, vde_exec_t, vde_t)
 ')
 
 ########################################