SOURCES: refpolicy-pld.patch, refpolicy-makefile.patch - up to 200...

zbyniu zbyniu at pld-linux.org
Tue Dec 19 04:50:40 CET 2006 

Author: zbyniu                       Date: Tue Dec 19 03:50:40 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 20061212

---- Files affected:
SOURCES:
   refpolicy-pld.patch (1.1 -> 1.2) , refpolicy-makefile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/refpolicy-pld.patch
diff -u SOURCES/refpolicy-pld.patch:1.1 SOURCES/refpolicy-pld.patch:1.2
--- SOURCES/refpolicy-pld.patch:1.1	Thu Apr 27 03:23:19 2006
+++ SOURCES/refpolicy-pld.patch	Tue Dec 19 04:50:34 2006
@@ -44,7 +44,7 @@
 +/sbin/pmap_set		--	gen_context(system_u:object_r:portmap_helper_exec_t,s0)
 +')
 +
- /var/run/portmap.upgrade-state -- gen_context(system_u:object_r:portmap_var_run_t,s0)
+ /var/run/portmap\.upgrade-state -- gen_context(system_u:object_r:portmap_var_run_t,s0)
 diff -ur refpolicy.org/policy/modules/services/postfix.fc refpolicy.pld/policy/modules/services/postfix.fc
 --- refpolicy.org/policy/modules/services/postfix.fc	2006-02-21 19:25:34.000000000 +0100
 +++ refpolicy.pld/policy/modules/services/postfix.fc	2006-04-18 01:55:12.941433250 +0200
@@ -90,18 +90,6 @@
  
  ifdef(`targeted_policy', `', `
  /usr/bin/ssh-agent		--	gen_context(system_u:object_r:ssh_agent_exec_t,s0)
-diff -ur refpolicy.org/policy/modules/services/ssh.if refpolicy.pld/policy/modules/services/ssh.if
---- refpolicy.org/policy/modules/services/ssh.if	2006-03-03 00:47:29.000000000 +0100
-+++ refpolicy.pld/policy/modules/services/ssh.if	2006-04-14 03:03:38.203074500 +0200
-@@ -479,7 +479,7 @@
- 	auth_domtrans_chk_passwd($1_t)
- 	auth_rw_login_records($1_t)
- 	auth_rw_lastlog($1_t)
--	auth_append_faillog($1_t)
-+	auth_rw_faillog($1_t)
- 
- 	corecmd_read_bin_symlinks($1_t)
- 	corecmd_getattr_bin_files($1_t)
 diff -ur refpolicy.org/policy/modules/services/telnet.fc refpolicy.pld/policy/modules/services/telnet.fc
 --- refpolicy.org/policy/modules/services/telnet.fc	2006-02-21 19:25:34.000000000 +0100
 +++ refpolicy.pld/policy/modules/services/telnet.fc	2006-04-18 02:10:59.617243500 +0200
@@ -118,9 +106,9 @@
 --- refpolicy.org/policy/modules/services/tftp.fc	2006-02-21 19:25:34.000000000 +0100
 +++ refpolicy.pld/policy/modules/services/tftp.fc	2006-04-18 02:08:52.133042250 +0200
 @@ -3,3 +3,8 @@
- /usr/sbin/in\.tftpd	--	gen_context(system_u:object_r:tftpd_exec_t,s0)
  
- /tftpboot(/.*)?			gen_context(system_u:object_r:tftpdir_t,s0)
+ /tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0) 
+ /tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
 +
 +ifdef(`distro_pld', `
 +/usr/sbin/tftpd		--	gen_context(system_u:object_r:tftpd_exec_t,s0)
@@ -152,9 +140,9 @@
 +/etc/rc\.d/rc\.init	--	gen_context(system_u:object_r:initrc_t,s0)
 +')
 +
- ifdef(`targeted_policy', `', `
- /etc/X11/prefdm		--	gen_context(system_u:object_r:initrc_exec_t,s0)
- ')
+ ifdef(`distro_gentoo',`
+ /etc/vmware/init\.d/vmware --	gen_context(system_u:object_r:initrc_exec_t,s0)
+ /etc/x11/startDM.sh	--	gen_context(system_u:object_r:initrc_exec_t,s0)
 @@ -47,6 +51,10 @@
  /var/run/svscan\.pid	--	gen_context(system_u:object_r:initrc_var_run_t,s0)
  ')

================================================================
Index: SOURCES/refpolicy-makefile.patch
diff -u SOURCES/refpolicy-makefile.patch:1.1 SOURCES/refpolicy-makefile.patch:1.2
--- SOURCES/refpolicy-makefile.patch:1.1	Thu Apr 27 03:23:19 2006
+++ SOURCES/refpolicy-makefile.patch	Tue Dec 19 04:50:35 2006
@@ -1,24 +1,15 @@
---- serefpolicy-2.2.25/Makefile.org	2006-04-09 04:57:02.337458250 +0200
-+++ serefpolicy-2.2.25/Makefile	2006-04-09 04:59:27.574535000 +0200
-@@ -250,9 +250,9 @@
- endif
+--- refpolicy/Makefile~	2006-10-31 22:01:48.000000000 +0100
++++ refpolicy/Makefile	2006-12-19 04:15:37.125997000 +0100
+@@ -276,9 +276,9 @@ cmdline_mods := $(addsuffix .te,$(APPS_M
+ cmdline_off := $(addsuffix .te,$(APPS_OFF))
  
  # extract settings from modules.conf
--BASE_MODS := $(addsuffix .te,$(sort $(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODBASE)") print $$1 }' $(MOD_CONF) 2> /dev/null)))
--MOD_MODS := $(addsuffix .te,$(sort $(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODMOD)") print $$1 }' $(MOD_CONF) 2> /dev/null)))
--OFF_MODS := $(addsuffix .te,$(sort $(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODUNUSED)") print $$1 }' $(MOD_CONF) 2> /dev/null)))
-+BASE_MODS := $(addsuffix .te,$(sort $(shell gawk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODBASE)") print $$1 }' $(MOD_CONF) 2> /dev/null)))
-+MOD_MODS := $(addsuffix .te,$(sort $(shell gawk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODMOD)") print $$1 }' $(MOD_CONF) 2> /dev/null)))
-+OFF_MODS := $(addsuffix .te,$(sort $(shell gawk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(MODUNUSED)") print $$1 }' $(MOD_CONF) 2> /dev/null)))
+-mod_conf_base := $(addsuffix .te,$(sort $(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(configbase)") print $$1 }' $(mod_conf) 2> /dev/null)))
+-mod_conf_mods := $(addsuffix .te,$(sort $(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(configmod)") print $$1 }' $(mod_conf) 2> /dev/null)))
+-mod_conf_off := $(addsuffix .te,$(sort $(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(configoff)") print $$1 }' $(mod_conf) 2> /dev/null)))
++mod_conf_base := $(addsuffix .te,$(sort $(shell $(AWK) '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(configbase)") print $$1 }' $(mod_conf) 2> /dev/null)))
++mod_conf_mods := $(addsuffix .te,$(sort $(shell $(AWK) '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(configmod)") print $$1 }' $(mod_conf) 2> /dev/null)))
++mod_conf_off := $(addsuffix .te,$(sort $(shell $(AWK) '/^[[:blank:]]*[[:alpha:]]/{ if ($$3 == "$(configoff)") print $$1 }' $(mod_conf) 2> /dev/null)))
  
- # add module overrides from command line
- BASE_MODS += $(APPS_BASE)
-@@ -273,7 +273,7 @@
- # parse-rolemap modulename,outputfile
- define parse-rolemap
- 	$(verbose) m4 $(M4PARAM) $(ROLEMAP) | \
--		awk '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
-+		gawk '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
- endef
- 
- # peruser-expansion modulename,outputfile
+ base_mods := $(cmdline_base)
+ mod_mods := $(cmdline_mods)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/refpolicy-pld.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/refpolicy-makefile.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list