rpms/selinux-policy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix infrastructure to expand macros in initrc_context when installing.

Browse Source 
The initrc_context file uses the mls_systemhigh macro and needs to be properly
expanded based on the build.conf settings.  Add makefile support to do this.
This commit is contained in:
Chris PeBenito 2009-08-10 13:59:29 -04:00
parent e51390dfcb
commit 90286f4292
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -1,3 +1,4 @@
- Fix infrastructure to expand macros in initrc_context when installing.
- Handle unix_chkpwd usage by useradd and groupadd. - Handle unix_chkpwd usage by useradd and groupadd.
- Add missing compatibility aliases for xdm_xserver*_t types. - Add missing compatibility aliases for xdm_xserver*_t types.

7
Makefile
View File

@ -102,6 +102,8 @@ get_type_attr_decl := $(SED) -r -f $(support)/get_type_attr_decl.sed
comment_move_decl := $(SED) -r -f $(support)/comment_move_decl.sed comment_move_decl := $(SED) -r -f $(support)/comment_move_decl.sed
gennetfilter := $(PYTHON) -E $(support)/gennetfilter.py gennetfilter := $(PYTHON) -E $(support)/gennetfilter.py
m4iferror := $(support)/iferror.m4 m4iferror := $(support)/iferror.m4
m4divert := $(support)/divert.m4
m4undivert := $(support)/undivert.m4
# use our own genhomedircon to make sure we have a known usable one, # use our own genhomedircon to make sure we have a known usable one,
# so policycoreutils updates are not required (RHEL4) # so policycoreutils updates are not required (RHEL4)
genhomedircon := $(PYTHON) -E $(support)/genhomedircon genhomedircon := $(PYTHON) -E $(support)/genhomedircon
@ -231,10 +233,11 @@ endif
CTAGS ?= ctags CTAGS ?= ctags
m4support := $(wildcard $(poldir)/support/*.spt) m4support := $(m4divert) $(wildcard $(poldir)/support/*.spt)
ifdef LOCAL_ROOT ifdef LOCAL_ROOT
m4support += $(wildcard $(local_poldir)/support/*.spt) m4support += $(wildcard $(local_poldir)/support/*.spt)
endif endif
m4support += $(m4undivert)
appconf := config/appconfig-$(TYPE) appconf := config/appconfig-$(TYPE)
seusers := $(appconf)/seusers seusers := $(appconf)/seusers
@ -529,7 +532,7 @@ $(contextpath)/users/%: $(appconf)/%_default_contexts
$(appdir)/%: $(appconf)/% $(appdir)/%: $(appconf)/%
@mkdir -p $(appdir) @mkdir -p $(appdir)
$(verbose) $(INSTALL) -m 644 $< $@ $(verbose) $(M4) $(M4PARAM) $(m4support) $< > $@
######################################## ########################################
# #

1
support/divert.m4 Normal file
View File

@ -0,0 +1 @@
divert(`-1')

1
support/undivert.m4 Normal file
View File

@ -0,0 +1 @@
divert