setools/setools-rhat.patch
2004-11-01 16:00:13 +00:00

92 lines
3.6 KiB
Diff

--- setools-1.5.1/apol/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400
+++ setools-1.5.1/apol/Makefile 2004-11-01 10:15:38.000000000 -0500
@@ -56,7 +56,7 @@
install: apol apol.tcl
- install -m 755 apol $(BINDIR)
+ install -m 755 apol $(SBINDIR)
@if [ -n $(INSTALL_LIBDIR) ]; then \
for file in $(TCL-FILES); do \
if [ -f $(INSTALL_LIBDIR)/$$file ]; then \
@@ -65,6 +65,7 @@
done \
fi
install -m 644 apol.tcl $(APOL_HELP_FILES) $(APOL_PERM_MAPS) $(INSTALL_LIBDIR)
+ install -m 644 $(APOL_HELP_FILES) $(APOL_PERM_MAPS) ${INSTALL_HELPDIR}
cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping
clean:
--- setools-1.5.1/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400
+++ setools-1.5.1/Makefile 2004-11-01 10:57:12.071440625 -0500
@@ -39,8 +39,8 @@
# File location defaults; used in various places in code
# Change these if you want different defaults
SELINUX_DIR = $(DESTDIR)/selinux
-SELINUX_POLICY_DIR = $(DESTDIR)/etc/security/selinux
-POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)
+SELINUX_POLICY_DIR = $(DESTDIR)/etc/selinux/strict/
+POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/policy
POLICY_SRC_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/src/policy
POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf
DEFAULT_LOG_FILE = /var/log/messages
@@ -68,6 +68,7 @@
# Install directories
# Binaries go here
BINDIR = $(DESTDIR)/usr/bin
+SBINDIR = $(DESTDIR)/usr/sbin
# The code uses the specified path below. If you change this, DO NOT add
@@ -88,7 +89,7 @@
POLICYINSTALLDIRS = seuser
# exports
-export CFLAGS CC YACC LEX LINKFLAGS BINDIR INSTALL_LIBDIR INSTALL_HELPDIR LIBS TCL_LIBINC TCL_LIBS MAKE
+export CFLAGS CC YACC LEX LINKFLAGS BINDIR SBINDIR INSTALL_LIBDIR INSTALL_HELPDIR LIBS TCL_LIBINC TCL_LIBS MAKE
export SELINUX_DIR POLICY_INSTALL_DIR POLICY_SRC_DIR SRC_POLICY_DIR POLICY_SRC_FILE DEFAULT_LOG_FILE
export TOPDIR SHARED_LIB_INSTALL_DIR STATIC_LIB_INSTALL_DIR SETOOLS_INCLUDE DEBUG LIBSELINUX
@@ -206,7 +207,7 @@
install-nogui: $(INSTALL_LIBDIR) install-seuser install-secmds
-install: $(BINDIR) $(SHARED_LIB_INSTALL_DIR) install-dev install-apol install-seuserx install-sepcut \
+install: $(BINDIR) $(SHARED_LIB_INSTALL_DIR) install-apol install-seuserx install-sepcut \
install-awish install-secmds install-seaudit install-docs
$(SHARED_LIB_INSTALL_DIR):
--- setools-1.5.1/seaudit/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400
+++ setools-1.5.1/seaudit/Makefile 2004-11-01 10:15:38.000000000 -0500
@@ -53,8 +53,8 @@
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
install: seaudit seaudit-report
- install -m 755 seaudit $(BINDIR)
- install -m 755 seaudit-report $(BINDIR)
+ install -m 755 seaudit $(SBINDIR)
+ install -m 755 seaudit-report $(SBINDIR)
install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
install -m 444 dot_seaudit $(INSTALL_LIBDIR)
--- setools-1.5.1/seuser/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400
+++ setools-1.5.1/seuser/Makefile 2004-11-01 10:15:38.000000000 -0500
@@ -158,7 +158,7 @@
install: seuser seuserx se_user.tcl
install -d $(BINDIR)
install -m 755 seuser $(BINDIR)
- install -m 755 seuserx $(BINDIR);
+ install -m 755 seuserx $(SBINDIR);
install -m 755 $(SE_SHELL_SCRIPTS) $(BINDIR)
install -m 644 se_user.tcl $(SEUSER_HELP_FILE) $(INSTALL_LIBDIR)
install -m 644 $(SEUSER_CONF_FILE) $(INSTALL_LIBDIR);
--- setools-1.5.1/packages/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400
+++ setools-1.5.1/packages/Makefile 2004-11-01 10:15:38.000000000 -0500
@@ -16,4 +16,4 @@
clean:
rm -Rf BWidget-1.4.1
-bare: clean
\ No newline at end of file
+bare: clean