rpms/setools
7
0
Fork 0
Code Issues Pull Requests Releases Activity
17ff598422
setools/setools-rhat.patch

136 lines
5.0 KiB
Diff
Raw Normal View History

- Move sepcut to gui apps.
2005-05-12 16:48:56 +00:00
--- setools-2.1.0/sepct/Makefile.rhat 2005-04-18 10:51:59.000000000 -0400
+++ setools-2.1.0/sepct/Makefile 2005-05-12 12:30:44.000000000 -0400
@@ -23,7 +23,7 @@
# do nothing
install: sepcut
- install -m 755 sepcut $(BINDIR)
+ install -m 755 sepcut $(SBINDIR)
install -m 644 $(SEPCUT_HELP_FILE) $(INSTALL_LIBDIR)
clean:
- Fix Missing return code.
2005-05-06 12:26:00 +00:00
--- setools-2.1.0/sediff/Makefile.rhat 2005-04-18 10:52:02.000000000 -0400
+++ setools-2.1.0/sediff/Makefile 2005-05-06 08:19:47.000000000 -0400
@@ -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)
install -m 644 sediff_help.txt $(INSTALL_LIBDIR)
--- setools-2.1.0/libapol/poldiff.c.rhat 2005-04-18 10:52:02.000000000 -0400
+++ setools-2.1.0/libapol/poldiff.c 2005-05-06 08:21:36.000000000 -0400
@@ -244,6 +244,7 @@
cond_diff->false_list_diffs[cond_diff->num_false_list_diffs] = rule;
cond_diff->num_false_list_diffs++;
}
+ return 0;
}
/* search policy 2 for a matching conditional */
--- setools-2.1.0/seuser/Makefile.rhat 2005-04-18 10:52:00.000000000 -0400
+++ setools-2.1.0/seuser/Makefile 2005-05-06 08:19:47.000000000 -0400
@@ -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.1.0/packages/Makefile.rhat 2005-04-18 10:52:01.000000000 -0400
+++ setools-2.1.0/packages/Makefile 2005-05-06 08:19:47.000000000 -0400
@@ -16,4 +16,4 @@
clean:
rm -Rf BWidget-1.4.1
-bare: clean
\ No newline at end of file
+bare: clean
--- setools-2.1.0/Makefile.rhat 2005-04-18 10:51:59.000000000 -0400
+++ setools-2.1.0/Makefile 2005-05-06 08:19:47.000000000 -0400
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
@@ -42,8 +42,8 @@
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
# 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
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
@@ -59,6 +59,7 @@
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
# 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
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
# a trailing path seperator ("/"). For example, use "/usr/share/setools"
@@ -102,7 +103,7 @@
SRC_POLICY_DIR = ../../
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
# 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
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
export TOPDIR SHARED_LIB_INSTALL_DIR STATIC_LIB_INSTALL_DIR SETOOLS_INCLUDE DYNAMIC LIBSELINUX USE_LIBSEFS
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
- Fix Missing return code.
2005-05-06 12:26:00 +00:00
--- setools-2.1.0/apol/Makefile.rhat 2005-04-18 10:52:00.000000000 -0400
+++ setools-2.1.0/apol/Makefile 2005-05-06 08:19:47.000000000 -0400
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
@@ -70,7 +70,7 @@
cd ../ ; $(MAKE) libsefs
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
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
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
clean:
- Fix Missing return code.
2005-05-06 12:26:00 +00:00
--- setools-2.1.0/seaudit/Makefile.rhat 2005-04-18 10:52:00.000000000 -0400
+++ setools-2.1.0/seaudit/Makefile 2005-05-06 08:19:47.000000000 -0400
- Update to latest from tresys
2005-03-02 21:01:21 +00:00
@@ -54,8 +54,8 @@
- Update to latest from Upstream
2004-11-01 16:00:13 +00:00
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
add setools patch and new desktop tools
2004-09-27 20:01:22 +00:00
- Update to latest from Upstream
2004-11-01 16:00:13 +00:00
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)
put libraries in %{_libdir}, not hardcoded /usr/lib
2005-05-23 18:59:57 +00:00
--- setools-2.1.0/Makefile.foo 2005-05-23 14:53:49.000000000 -0400
+++ setools-2.1.0/Makefile 2005-05-23 14:54:17.000000000 -0400
@@ -26,7 +26,7 @@
TCLVER = $(shell env tclsh tcl_vars)
#TCLVER = 8.3
#TCL_INCLUDE = -I/usr/include
-#TCL_LIBINC = -L/usr/lib
+#TCL_LIBINC = -L$(LIBDIR)
TCL_LIBS = -ltk$(TCLVER) -ltcl$(TCLVER) -ldl $(LIBS)
INCLUDE_DIR = $(DESTDIR)/usr/include
@@ -35,7 +35,7 @@
YACC = bison -y
LEX = flex -olex.yy.c
-SHARED_LIB_INSTALL_DIR = $(DESTDIR)/usr/lib
+SHARED_LIB_INSTALL_DIR = $(DESTDIR)$(LIBDIR)
STATIC_LIB_INSTALL_DIR = $(SHARED_LIB_INSTALL_DIR)
SETOOLS_INCLUDE = $(INCLUDE_DIR)/setools
Reference in New Issue Copy Permalink