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

- Update to latest from tresys

Browse Source
This commit is contained in:
Daniel J Walsh 2005-03-02 21:01:21 +00:00
parent 20a540e174
commit 92db4c62bd
6 changed files with 68 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1,3 +1,4 @@
setools-1.4.1.tgz setools-1.4.1.tgz
setools-1.5.tgz setools-1.5.tgz
setools-1.5.1.tgz setools-1.5.1.tgz
setools-2.0.0.tar.bz2

3
sediffx.console Normal file
View File

@ -0,0 +1,3 @@
USER=root
PROGRAM=/usr/sbin/sediffx
SESSION=true

11
sediffx.desktop Normal file
View File

@ -0,0 +1,11 @@
[Desktop Entry]
Name=sediffx
GenericName=SELinux Policy Difference too
Comment=This tool allows you to compare two policy files
Exec=/usr/bin/sediffx
Type=Application
Terminal=false
Encoding=UTF-8
Categories=System;X-Red-Hat-Base;X-Red-Hat-ServerConfig;
X-Desktop-File-Install-Version=0.2
StartupNotify=true

99
setools-rhat.patch
View File

@ -1,25 +1,6 @@
--- setools-1.5.1/apol/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400 --- setools-2.0.0/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-1.5.1/apol/Makefile 2004-11-01 10:15:38.000000000 -0500 +++ setools-2.0.0/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -56,7 +56,7 @@ @@ -42,8 +42,8 @@
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 # File location defaults; used in various places in code
# Change these if you want different defaults # Change these if you want different defaults
SELINUX_DIR = $(DESTDIR)/selinux SELINUX_DIR = $(DESTDIR)/selinux
@ -30,35 +11,45 @@
POLICY_SRC_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/src/policy POLICY_SRC_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/src/policy
POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf
DEFAULT_LOG_FILE = /var/log/messages DEFAULT_LOG_FILE = /var/log/messages
@@ -68,6 +68,7 @@ @@ -59,6 +59,7 @@
# Install directories # Install directories
# Binaries go here # Binaries go here
BINDIR = $(DESTDIR)/usr/bin BINDIR = $(DESTDIR)/usr/bin
+SBINDIR = $(DESTDIR)/usr/sbin +SBINDIR = $(DESTDIR)/usr/sbin
# The code uses the specified path below. If you change this, DO NOT add # The code uses the specified path below. If you change this, DO NOT add
@@ -88,7 +89,7 @@ # a trailing path seperator ("/"). For example, use "/usr/share/setools"
POLICYINSTALLDIRS = seuser @@ -102,7 +103,7 @@
SRC_POLICY_DIR = ../../
# exports # 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 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 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 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 export TOPDIR SHARED_LIB_INSTALL_DIR STATIC_LIB_INSTALL_DIR SETOOLS_INCLUDE DYNAMIC LIBSELINUX USE_LIBSEFS
@@ -206,7 +207,7 @@ --- 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-nogui: $(INSTALL_LIBDIR) install-seuser install-secmds 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
-install: $(BINDIR) $(SHARED_LIB_INSTALL_DIR) install-dev install-apol install-seuserx install-sepcut \ clean:
+install: $(BINDIR) $(SHARED_LIB_INSTALL_DIR) install-apol install-seuserx install-sepcut \ --- setools-2.0.0/seaudit/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
install-awish install-secmds install-seaudit install-docs +++ setools-2.0.0/seaudit/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -54,8 +54,8 @@
$(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 $< $(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
install: seaudit seaudit-report install: seaudit seaudit-report
@ -69,9 +60,18 @@
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-1.5.1/seuser/Makefile.rhat 2004-10-29 17:51:22.000000000 -0400 --- setools-2.0.0/packages/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-1.5.1/seuser/Makefile 2004-11-01 10:15:38.000000000 -0500 +++ setools-2.0.0/packages/Makefile 2005-03-02 14:36:54.000000000 -0500
@@ -158,7 +158,7 @@ @@ -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: seuser seuserx se_user.tcl
install -d $(BINDIR) install -d $(BINDIR)
install -m 755 seuser $(BINDIR) install -m 755 seuser $(BINDIR)
@ -80,12 +80,15 @@
install -m 755 $(SE_SHELL_SCRIPTS) $(BINDIR) install -m 755 $(SE_SHELL_SCRIPTS) $(BINDIR)
install -m 644 se_user.tcl $(SEUSER_HELP_FILE) $(INSTALL_LIBDIR) install -m 644 se_user.tcl $(SEUSER_HELP_FILE) $(INSTALL_LIBDIR)
install -m 644 $(SEUSER_CONF_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-2.0.0/sediff/Makefile.rhat 2005-02-28 18:31:59.000000000 -0500
+++ setools-1.5.1/packages/Makefile 2004-11-01 10:15:38.000000000 -0500 +++ setools-2.0.0/sediff/Makefile 2005-03-02 14:48:03.000000000 -0500
@@ -16,4 +16,4 @@ @@ -23,7 +23,8 @@
clean: install -m 755 sediff $(BINDIR);
rm -Rf BWidget-1.4.1
-bare: clean install: all
\ No newline at end of file - install -m 755 sediff sediffx $(BINDIR);
+bare: clean + install -m 755 sediff $(BINDIR);
+ install -m 755 sediffx $(SBINDIR);
install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
%.o: %.c

2
setools.spec
View File

@ -116,7 +116,7 @@ install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sedi
install -D %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop install -D %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop
install -D %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/applications/seuserx.desktop install -D %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/applications/seuserx.desktop
install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop install -D %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop
install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop install -D %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop
cd $RPM_BUILD_ROOT/%_bindir/ cd $RPM_BUILD_ROOT/%_bindir/
ln -sf consolehelper apol ln -sf consolehelper apol
ln -sf consolehelper seuserx ln -sf consolehelper seuserx

2
sources
View File

@ -1 +1 @@
98b540b77f1554ff24b5ea62de32c0db setools-1.5.1.tgz 1ef6bc24447a8549f1bff96dba453032 setools-2.0.0.tar.bz2