setools/setools-rhat.patch
2005-03-02 21:01:21 +00:00

95 lines
3.7 KiB
Diff

--- setools-2.0.0/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-2.0.0/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -42,8 +42,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
@@ -59,6 +59,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
# a trailing path seperator ("/"). For example, use "/usr/share/setools"
@@ -102,7 +103,7 @@
SRC_POLICY_DIR = ../../
# 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 DYNAMIC LIBSELINUX USE_LIBSEFS
--- setools-2.0.0/apol/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-2.0.0/apol/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -70,7 +70,7 @@
cd ../ ; $(MAKE) libsefs
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 \
@@ -79,6 +79,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-2.0.0/seaudit/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-2.0.0/seaudit/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -54,8 +54,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-2.0.0/packages/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-2.0.0/packages/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -16,4 +16,4 @@
clean:
rm -Rf BWidget-1.4.1
-bare: clean
\ No newline at end of file
+bare: clean
--- setools-2.0.0/seuser/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-2.0.0/seuser/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -166,7 +166,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-2.0.0/sediff/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-2.0.0/sediff/Makefile 2005-03-02 14:48:03.000000000 -0500
@@ -23,7 +23,8 @@
install -m 755 sediff $(BINDIR);
install: all
- install -m 755 sediff sediffx $(BINDIR);
+ install -m 755 sediff $(BINDIR);
+ install -m 755 sediffx $(SBINDIR);
install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
%.o: %.c