rpms/setools
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix Missing return code.

Browse Source
This commit is contained in:
Daniel J Walsh 2005-05-06 12:26:00 +00:00
parent cd2fb1e444
commit ee838e09c3
2 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
setools-rhat.patch
View File

@ -1,5 +1,47 @@
--- setools-2.0.0/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500 --- setools-2.1.0/sediff/Makefile.rhat 2005-04-18 10:52:02.000000000 -0400
+++ setools-2.0.0/Makefile 2005-03-02 14:36:54.000000000 -0500 +++ 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
@@ -42,8 +42,8 @@ @@ -42,8 +42,8 @@
# File location defaults; used in various places in code # File location defaults; used in various places in code
# Change these if you want different defaults # Change these if you want different defaults
@ -28,8 +70,8 @@
export SELINUX_DIR POLICY_INSTALL_DIR POLICY_SRC_DIR SRC_POLICY_DIR POLICY_SRC_FILE DEFAULT_LOG_FILE 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 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.1.0/apol/Makefile.rhat 2005-04-18 10:52:00.000000000 -0400
+++ setools-2.0.0/apol/Makefile 2005-03-02 14:36:54.000000000 -0500 +++ setools-2.1.0/apol/Makefile 2005-05-06 08:19:47.000000000 -0400
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
cd ../ ; $(MAKE) libsefs cd ../ ; $(MAKE) libsefs
@ -47,8 +89,8 @@
cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping
clean: clean:
--- setools-2.0.0/seaudit/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500 --- setools-2.1.0/seaudit/Makefile.rhat 2005-04-18 10:52:00.000000000 -0400
+++ setools-2.0.0/seaudit/Makefile 2005-03-02 14:36:54.000000000 -0500 +++ setools-2.1.0/seaudit/Makefile 2005-05-06 08:19:47.000000000 -0400
@@ -54,8 +54,8 @@ @@ -54,8 +54,8 @@
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $< $(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
@ -60,35 +102,3 @@
install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR) install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
install -m 644 seaudit_help.txt $(INSTALL_LIBDIR) install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
install -m 444 dot_seaudit $(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

5
setools.spec
View File

@ -1,7 +1,7 @@
Summary: SELinux tools for managing policy Summary: SELinux tools for managing policy
Name: setools Name: setools
Version: 2.1.0 Version: 2.1.0
Release: 2 Release: 3
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2 Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2
@ -181,6 +181,9 @@ Headers, static libraries and API docs for SETools.
/usr/share/doc/setools-%{version}/* /usr/share/doc/setools-%{version}/*
%changelog %changelog
* Fri May 6 2005 Dan Walsh <dwalsh@redhat.com> 2.1.0-3
- Fix Missing return code.
* Wed Apr 20 2005 Dan Walsh <dwalsh@redhat.com> 2.1.0-2 * Wed Apr 20 2005 Dan Walsh <dwalsh@redhat.com> 2.1.0-2
- Fix requires line - Fix requires line