Skip to content

Fix issues with SELinux #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ardovm wants to merge 1 commit into
base: AOO41X
Choose a base branch
from
Open

Fix issues with SELinux #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions main/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7320,6 +7320,17 @@ else
fi
AC_SUBST(nodep)

dnl ===================================================================
dnl Check for execstack(8) on Linux
dnl ===================================================================
if test "$_os" = "Linux"; then
AC_PATH_PROG(EXECSTACK, execstack )
if test -z "$EXECSTACK"; then
AC_MSG_ERROR([execstack is required on Linux])
fi
fi


dnl ===================================================================
dnl Setting up the environment.
dnl ===================================================================
Expand Down
12 changes: 10 additions & 2 deletions main/desktop/util/makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ $(APP1TARGETN) : $(MISC)$/binso_created.flg

.IF "$(APP5TARGETN)"!=""
$(APP5TARGETN) : $(MISC)$/binso_created.flg
.ENDIF # "$(APP6TARGETN)"!=""
.ENDIF # "$(APP5TARGETN)"!=""

.IF "$(APP6TARGETN)"!=""
$(APP6TARGETN) : $(MISC)$/binso_created.flg
Expand All @@ -201,6 +201,14 @@ ALLTAR: $(BIN)$/$(TARGET).bin
$(BIN)$/soffice_oo$(EXECPOST) : $(APP5TARGETN)
$(COPY) $< $@

.IF "$(OS)" == "LINUX"
# $(APP5TARGETN) must be fixed with execstack
$(BIN)$/soffice_oo$(EXECPOST) : $(MISC)$/selinux_fixed.flg

$(MISC)$/selinux_fixed.flg : $(APP5TARGETN)
execstack -s $< && $(TOUCH) $@
.ENDIF # Linux

.IF "$(GUI)" != "OS2"
.IF "$(LINK_SO)"=="TRUE"
$(BIN)$/so$/soffice_so$(EXECPOST) : $(APP1TARGETN)
Expand Down Expand Up @@ -270,4 +278,4 @@ $(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST)
$(MISC)$/binso_created.flg :
@@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@

.ENDIF
.ENDIF # "$(L10N_framework)"==""