pool/setools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 615934 from security:SELinux

Browse Source 
- Added warning.patch in former change to prevent warnings from
  stopping the build

- Upgrade to 4.1.1

- Update to version 4.0.1. SETools was reimplemented in Python.
- Doesn't build
  * setools-libs
  * setools-java
  * setools-tcl
  * setools-devel
  anymore since the files are not povided anymore
- Dropped
  * add-to-header-define_cond_filename_trans.patch
  * implicit-fortify-decl.patch
  * setools-3.3.5-javacflags.patch
  * setools-3.3.5-nonvoid.patch
  * setools-3.3.5-strcmp.patch
  * setools-am121.patch
  * setools-libsepol.patch
  * setools-setup_py-prefix.patch
  * setools-swig-2.0.7.patch
  * setools-swig-2x.patch
  * setools-tclass.patch

OBS-URL: https://build.opensuse.org/request/show/615934
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/setools?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2018-06-29 20:24:47 +00:00 committed by Git OBS Bridge
commit 9c4ef4362a
20 changed files with 78 additions and 1981 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
4.1.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610
size 461649

12
add-to-header-define_cond_filename_trans.patch
View File

@ -1,12 +0,0 @@
Index: setools3-setools-3.3.8/libqpol/src/policy_define.h
===================================================================
--- setools3-setools-3.3.8.orig/libqpol/src/policy_define.h 2013-01-16 17:36:04.000000000 +0100
+++ setools3-setools-3.3.8/libqpol/src/policy_define.h 2016-07-18 12:40:35.922965184 +0200
@@ -23,6 +23,7 @@
* of code here */
#define SECURITY_FS_USE_PSIDS 6
+avrule_t *define_cond_filename_trans();
avrule_t *define_cond_compute_type(int which);
avrule_t *define_cond_pol_list(avrule_t * avlist, avrule_t * stmt);
avrule_t *define_cond_te_avtab(int which);

11
apol.desktop
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Name=SELinux Policy Analysis
GenericName=SELinux Policy Analysis Tool
Comment=This tool can examine, search, and relate policy components and policy rules
Icon=apol
Exec=apol
Type=Application
Terminal=false
Encoding=UTF-8
Categories=System;Security;
StartupNotify=true

15
implicit-fortify-decl.patch
View File

@ -1,15 +0,0 @@
Index: setools3-setools-3.3.8/libqpol/src/policy.c
===================================================================
--- setools3-setools-3.3.8.orig/libqpol/src/policy.c 2013-01-16 17:36:04.000000000 +0100
+++ setools3-setools-3.3.8/libqpol/src/policy.c 2017-06-26 16:13:22.393132548 +0200
@@ -26,6 +26,10 @@
#include <config.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
#include "qpol_internal.h"
#include <assert.h>
#include <byteswap.h>

11
seaudit.desktop
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Name=SELinux Audit Log Analysis
GenericName=SELinux Audit Log Analysis Tool
Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages.
Icon=seaudit
Exec=seaudit
Type=Application
Terminal=false
Encoding=UTF-8
Categories=System;Security;
StartupNotify=true

11
sediffx.desktop
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Name=SELinux Policy Difference
GenericName=SELinux Policy Difference tool
Comment=This tool allows you to compare two policy files
Icon=sediffx
Exec=sediffx
Type=Application
Terminal=false
Encoding=UTF-8
Categories=System;Security;
StartupNotify=true

65
setools-3.3.5-javacflags.patch
View File

@ -1,65 +0,0 @@
Index: libapol/swig/java/Makefile.am
===================================================================
--- libapol/swig/java/Makefile.am.orig
+++ libapol/swig/java/Makefile.am
@@ -97,7 +97,7 @@ classes = $(patsubst %.java, $(package_d
# just depend upon the first class file, and let the Java compiler
# create the rest of them.
$(firstword $(classes)): $(java_files)
- $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+ $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
$(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
Index: libpoldiff/swig/java/Makefile.am
===================================================================
--- libpoldiff/swig/java/Makefile.am.orig
+++ libpoldiff/swig/java/Makefile.am
@@ -72,7 +72,7 @@ classes = $(patsubst %.java, $(package_d
# just depend upon the first class file, and let the Java compiler
# create the rest of them.
$(firstword $(classes)): $(java_files)
- $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+ $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
$(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
Index: libqpol/swig/java/Makefile.am
===================================================================
--- libqpol/swig/java/Makefile.am.orig
+++ libqpol/swig/java/Makefile.am
@@ -77,7 +77,7 @@ classes = $(patsubst %.java,$(package_di
# just depend upon the first class file, and let the Java compiler
# create the rest of them.
$(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES))
- $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+ $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
$(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
Index: libseaudit/swig/java/Makefile.am
===================================================================
--- libseaudit/swig/java/Makefile.am.orig
+++ libseaudit/swig/java/Makefile.am
@@ -69,7 +69,7 @@ classes = $(patsubst %.java, $(package_d
# just depend upon the first class file, and let the Java compiler
# create the rest of them.
$(firstword $(classes)): $(java_files)
- $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+ $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
$(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
Index: libsefs/swig/java/Makefile.am
===================================================================
--- libsefs/swig/java/Makefile.am.orig
+++ libsefs/swig/java/Makefile.am
@@ -64,7 +64,7 @@ classes = $(patsubst %.java, $(package_d
# just depend upon the first class file, and let the Java compiler
# create the rest of them.
$(firstword $(classes)): $(java_files)
- $(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+ $(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
$(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))

88
setools-3.3.5-nonvoid.patch
View File

@ -1,88 +0,0 @@
Index: libqpol/src/module_compiler.c
===================================================================
--- libqpol/src/module_compiler.c.orig
+++ libqpol/src/module_compiler.c
@@ -291,6 +291,7 @@ role_datum_t *declare_role(void)
assert(0); /* should never get here */
}
}
+ return 0;
}
type_datum_t *declare_type(unsigned char primary, unsigned char isattr)
@@ -353,6 +354,7 @@ type_datum_t *declare_type(unsigned char
assert(0); /* should never get here */
}
}
+ return 0;
}
static int user_implicit_bounds(hashtab_t users_tab, char *user_id, user_datum_t * user)
@@ -482,6 +484,7 @@ user_datum_t *declare_user(void)
assert(0); /* should never get here */
}
}
+ return 0;
}
/* Return a type_datum_t for the local avrule_decl with the given ID.
@@ -822,6 +825,7 @@ int require_role(int pass)
assert(0); /* should never get here */
}
}
+ return 0;
}
static int require_type_or_attribute(int pass, unsigned char isattr)
@@ -873,6 +877,7 @@ static int require_type_or_attribute(int
assert(0); /* should never get here */
}
}
+ return 0;
}
int require_type(int pass)
@@ -932,6 +937,7 @@ int require_user(int pass)
assert(0); /* should never get here */
}
}
+ return 0;
}
int require_bool(int pass)
@@ -979,6 +985,7 @@ int require_bool(int pass)
assert(0); /* should never get here */
}
}
+ return 0;
}
int require_sens(int pass)
@@ -1041,6 +1048,7 @@ int require_sens(int pass)
assert(0); /* should never get here */
}
}
+ return 0;
}
int require_cat(int pass)
@@ -1093,6 +1101,7 @@ int require_cat(int pass)
assert(0); /* should never get here */
}
}
+ return 0;
}
static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack)
Index: libqpol/src/policy_define.c
===================================================================
--- libqpol/src/policy_define.c.orig
+++ libqpol/src/policy_define.c
@@ -1512,6 +1512,7 @@ int define_compute_type(int which)
assert(0); /* should never get here */
}
}
+ return 0;
}
avrule_t *define_cond_compute_type(int which)

21
setools-3.3.5-strcmp.patch
View File

@ -1,21 +0,0 @@
Index: sediff/result_item_render.c
===================================================================
--- sediff/result_item_render.c.orig
+++ sediff/result_item_render.c
@@ -27,6 +27,7 @@
#include "result_item_render.h"
#include <assert.h>
+#include <string.h>
static const char *form_name_map[] = {
"Added", "Added New Type", "Removed", "Removed Missing Type", "Modified"
@@ -139,7 +140,7 @@ void result_item_print_string_inline(Gtk
}
case ' ':
{
- if (current_tag != "modified") {
+ if ( strcmp( current_tag, "modified") != 0 ) {
gtk_text_buffer_insert_with_tags_by_name(tb, iter, s + start, end - start + 1, current_tag, NULL);
start = end + 1;
current_tag = "modified";

3
setools-3.3.8.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49494d15d61516ba0c09bfaf5fdc069954ed1ae1e014213254e7d545e97552df
size 1184419

159
setools-am121.patch
View File

@ -1,159 +0,0 @@
Index: setools-3.3.6/apol/Makefile.am
===================================================================
--- setools-3.3.6.orig/apol/Makefile.am 2008-03-12 16:39:52.000000000 +0100
+++ setools-3.3.6/apol/Makefile.am 2012-07-03 11:11:01.642603291 +0200
@@ -86,7 +86,7 @@ $(wrappedso_DATA): apol_tcl.cc apol_tcl_
$(package_SCRIPTS): $(wrappedso_DATA) mkIndex.tcl
cat mkIndex.tcl | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libsefs/src $(TCLSH_PROG)
- $(mkdir_p) apol_tcl
+ $(MKDIR_P) apol_tcl
cp $< $@ apol_tcl
mkIndex.tcl: $(wrappedso_DATA) Makefile
Index: setools-3.3.6/libapol/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libapol/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libapol/swig/java/Makefile.am 2012-07-03 11:11:01.647603059 +0200
@@ -109,7 +109,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libapol/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libapol/swig/tcl/Makefile.am 2007-10-31 22:03:33.000000000 +0100
+++ setools-3.3.6/libapol/swig/tcl/Makefile.am 2012-07-03 11:11:01.649602966 +0200
@@ -28,7 +28,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) apol
+ $(MKDIR_P) apol
cp $(wrappedso_DATA) $@ apol
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) apol/$(wrappedso_DATA) apol/$(package_SCRIPTS)
Index: setools-3.3.6/libpoldiff/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libpoldiff/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libpoldiff/swig/java/Makefile.am 2012-07-03 11:11:01.653602780 +0200
@@ -84,7 +84,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libpoldiff/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libpoldiff/swig/tcl/Makefile.am 2007-10-31 22:03:33.000000000 +0100
+++ setools-3.3.6/libpoldiff/swig/tcl/Makefile.am 2012-07-03 11:11:01.655602687 +0200
@@ -29,7 +29,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libpoldiff/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) poldiff
+ $(MKDIR_P) poldiff
cp $(wrappedso_DATA) $@ poldiff
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) poldiff/$(wrappedso_DATA) poldiff/$(package_SCRIPTS)
Index: setools-3.3.6/libqpol/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libqpol/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libqpol/swig/java/Makefile.am 2012-07-03 11:11:01.659602501 +0200
@@ -89,7 +89,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libqpol/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libqpol/swig/tcl/Makefile.am 2008-02-22 20:06:28.000000000 +0100
+++ setools-3.3.6/libqpol/swig/tcl/Makefile.am 2012-07-03 11:11:01.661602408 +0200
@@ -28,7 +28,7 @@ libdirs = $(top_builddir)/libqpol/src
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) qpol
+ $(MKDIR_P) qpol
cp $(wrappedso_DATA) $@ qpol
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) qpol/$(wrappedso_DATA) qpol/$(package_SCRIPTS)
Index: setools-3.3.6/libseaudit/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libseaudit/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libseaudit/swig/java/Makefile.am 2012-07-03 11:11:01.664602268 +0200
@@ -81,7 +81,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libseaudit/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libseaudit/swig/tcl/Makefile.am 2007-10-31 22:03:33.000000000 +0100
+++ setools-3.3.6/libseaudit/swig/tcl/Makefile.am 2012-07-03 11:11:01.666602175 +0200
@@ -29,7 +29,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libseaudit/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) seaudit
+ $(MKDIR_P) seaudit
cp $(wrappedso_DATA) $@ seaudit
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) seaudit/$(wrappedso_DATA) seaudit/$(package_SCRIPTS)
Index: setools-3.3.6/libsefs/swig/java/Makefile.am
===================================================================
--- setools-3.3.6.orig/libsefs/swig/java/Makefile.am 2012-07-03 11:07:50.000000000 +0200
+++ setools-3.3.6/libsefs/swig/java/Makefile.am 2012-07-03 11:11:01.850593620 +0200
@@ -76,7 +76,7 @@ $(wrappedjar_DATA): $(classes)
install-data-hook:
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
- $(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
+ $(MKDIR_P) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
-rm -rf $(DESTDIR)$(wrappedsodir)/$(wrappedso_SONAME) $(DESTDIR)$(wrappedsodir)/$(short_name)
Index: setools-3.3.6/libsefs/swig/tcl/Makefile.am
===================================================================
--- setools-3.3.6.orig/libsefs/swig/tcl/Makefile.am 2008-02-22 20:06:28.000000000 +0100
+++ setools-3.3.6/libsefs/swig/tcl/Makefile.am 2012-07-03 11:11:01.873592549 +0200
@@ -29,7 +29,7 @@ $(wrappedso_DATA): $(BUILT_SOURCES)
$(package_SCRIPTS): $(wrappedso_DATA)
echo "pkg_mkIndex . $^" | LD_LIBRARY_PATH=$(top_builddir)/libqpol/src:$(top_builddir)/libapol/src:$(top_builddir)/libsefs/src $(TCLSH_PROG)
chmod 644 $@
- $(mkdir_p) sefs
+ $(MKDIR_P) sefs
cp $(wrappedso_DATA) $@ sefs
MOSTLYCLEANFILES = $(BUILT_SOURCES) $(wrappedso_DATA) $(wrappedso_SONAME) $(short_name) $(package_DATA) sefs/$(wrappedso_DATA) sefs/$(package_SCRIPTS)
Index: setools-3.3.6/packages/Makefile.am
===================================================================
--- setools-3.3.6.orig/packages/Makefile.am 2007-10-31 22:57:59.000000000 +0100
+++ setools-3.3.6/packages/Makefile.am 2012-07-03 11:11:01.954588782 +0200
@@ -20,9 +20,9 @@ $(pkgconfig_DATA): $(top_builddir)/confi
install-data-local:
if test $(copy_bwidget) = "yes"; then \
tar jxf BWidget-1.8.0.tar.bz2; \
- test -z "$(bwidget_destdir)" || $(mkdir_p) "$(bwidget_destdir)" ; \
+ test -z "$(bwidget_destdir)" || $(MKDIR_P) "$(bwidget_destdir)" ; \
cd BWidget-1.8.0 ; \
- find . -type d -exec $(mkdir_p) "$(bwidget_destdir)/{}" \; ; \
+ find . -type d -exec $(MKDIR_P) "$(bwidget_destdir)/{}" \; ; \
find . -type f -exec $(INSTALL_DATA) '{}' $(bwidget_destdir)/'{}' \; ; \
fi

31
setools-libsepol.patch
View File

@ -1,31 +0,0 @@
From 2b58d92add64b53b16cbb438e7b69e85d046afd1 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Tue, 20 Sep 2011 15:46:38 -0400
Subject: [PATCH 5/6] Fix sepol calls to work with latest libsepol
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: setools3-setools-3.3.8/configure.ac
===================================================================
--- setools3-setools-3.3.8.orig/configure.ac 2013-01-16 17:36:04.000000000 +0100
+++ setools3-setools-3.3.8/configure.ac 2016-07-18 12:40:48.255162639 +0200
@@ -521,7 +521,7 @@ else
[AC_LANG_SOURCE([
#include <sepol/policydb/expand.h>
int main () {
- return role_set_expand(NULL, NULL, NULL, NULL);
+ return role_set_expand(NULL, NULL, NULL, NULL, NULL);
}])],
sepol_new_user_role_mapping="yes",
sepol_new_user_role_mapping="no")
@@ -578,7 +578,7 @@ if test ${sepol_check_boolmap} = "yes";
[AC_LANG_SOURCE([
#include <sepol/policydb/expand.h>
int main () {
- return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0);
+ return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0);
}])],
AC_MSG_RESULT([yes]),
AC_MSG_ERROR([this version of libsepol is incompatible with SETools]))

17
setools-setup_py-prefix.patch
View File

@ -1,17 +0,0 @@
Index: setools-3.3.6/python/setools/Makefile.am
===================================================================
--- setools-3.3.6.orig/python/setools/Makefile.am
+++ setools-3.3.6/python/setools/Makefile.am
@@ -25,10 +25,10 @@ python-build: sesearch.c seinfo.c
LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build
install-exec-hook:
- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ $(PYTHON) setup.py install --prefix=/usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
uninstall-hook:
- $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ $(PYTHON) setup.py uninstall --prefix=usr `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
clean-local:
$(PYTHON) setup.py clean -a

1049
setools-swig-2.0.7.patch
View File

File diff suppressed because it is too large Load Diff

78
setools-swig-2x.patch
View File

@ -1,78 +0,0 @@
--- m4/ac_pkg_swig.m4 2007-02-09 18:32:41.000000000 +0100
+++ m4/ac_pkg_swig.m4 2011-05-26 11:25:08.995022389 +0200
@@ -64,6 +64,20 @@
# may extend this special exception to the GPL to apply to your
# modified version as well.
+AC_DEFUN([SWIG_VERSION_GOOD],[
+ AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+ SWIG_LIB=`$SWIG -swiglib`
+ AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+ SWIG_VERSION=`echo $(( $available_major * 100 * 100 + $available_minor * 100 + $available_patch ))`
+ AC_MSG_NOTICE([SWIG version is '$SWIG_VERSION'])
+ # AM_CONDITIONAL(SWIG_NEW_OPTIONS, test "$SWIG_VERSION" \> 10331)
+])
+
+AC_DEFUN([SWIG_VERSION_BAD],[
+ AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
+])
+
AC_DEFUN([AC_PROG_SWIG],[
AC_PATH_PROG([SWIG],[swig])
if test -z "$SWIG" ; then
@@ -106,16 +120,44 @@
if test -z "$available_patch" ; then
[available_patch=0]
fi
- if test $available_major -ne $required_major \
- -o $available_minor -ne $required_minor \
- -o $available_patch -lt $required_patch ; then
- AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
- SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
- else
- AC_MSG_NOTICE([SWIG executable is '$SWIG'])
- SWIG_LIB=`$SWIG -swiglib`
- AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
- fi
+
+
+
+ if test $available_major -gt $required_major; then
+ # the available major is greater than required major --GOOD
+ SWIG_VERSION_GOOD()
+
+ elif test $available_major -lt $required_major ; then
+ # the avialable major is less than required major -- BAD
+ SWIG_VERSION_BAD()
+ else
+ # the available and require major are equal check the minor and patch versions.
+
+ if test $available_minor -gt $required_minor ; then
+ # GOOD
+ SWIG_VERSION_GOOD()
+ elif test $avaialble_minor -lt $required_minor ; then
+ # BAD
+ SWIG_VERSION_BAD()
+ else
+ # the minor version are also equal
+
+ if test $available_patch -gt $required_patch ; then
+ # GOOD
+ SWIG_VERSION_GOOD()
+ elif test $available_minor -lt $required_minor ; then
+ # BAD
+ SWIG_VERSION_BAD()
+ else
+ # all the available major, minor and patch levels are the same as the required -- GOOD
+ SWIG_VERSION_GOOD()
+ fi
+ fi
+ fi
+
+
+
+
else
AC_MSG_WARN([cannot determine SWIG version])
SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'

114
setools-tclass.patch
View File

@ -1,114 +0,0 @@
From f1e5b208d507171968ca4d2eeefd7980f1004a3c Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 12 Feb 2015 08:55:12 -0500
Subject: [PATCH] Update for 2015-02-02 Userspace release (2.4)
SETools now requires libsepol 2.4 and libselinux 2.4.
---
configure.ac | 6 +++---
libqpol/src/policy_define.c | 4 ++--
libqpol/src/policy_extend.c | 4 ++--
libqpol/src/syn_rule_query.c | 6 +++---
secmds/replcon.cc | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
Index: setools3-setools-3.3.8/configure.ac
===================================================================
--- setools3-setools-3.3.8.orig/configure.ac 2016-07-18 12:40:35.914965056 +0200
+++ setools3-setools-3.3.8/configure.ac 2016-07-18 12:40:35.930965312 +0200
@@ -25,9 +25,9 @@ libseaudit_version=4.5
setoolsdir='${prefix}/share/setools-3.3'
javadir='${prefix}/share/java'
-version_min_sepol_major=1
-version_min_sepol_minor=12
-version_min_sepol_patch=27
+version_min_sepol_major=2
+version_min_sepol_minor=4
+version_min_sepol_patch=0
dnl *** end of tunable values ***
Index: setools3-setools-3.3.8/libqpol/src/policy_define.c
===================================================================
--- setools3-setools-3.3.8.orig/libqpol/src/policy_define.c 2016-07-18 12:40:35.878964480 +0200
+++ setools3-setools-3.3.8/libqpol/src/policy_define.c 2016-07-18 12:40:35.930965312 +0200
@@ -1449,7 +1449,7 @@ int define_compute_type_helper(int which
return -1;
}
class_perm_node_init(perm);
- perm->class = i + 1;
+ perm->tclass = i + 1;
perm->data = datum->s.value;
perm->next = avrule->perms;
avrule->perms = perm;
@@ -1700,7 +1700,7 @@ int define_te_avtab_helper(int which, av
goto out;
}
class_perm_node_init(cur_perms);
- cur_perms->class = i + 1;
+ cur_perms->tclass = i + 1;
if (!perms)
perms = cur_perms;
if (tail)
Index: setools3-setools-3.3.8/libqpol/src/policy_extend.c
===================================================================
--- setools3-setools-3.3.8.orig/libqpol/src/policy_extend.c 2013-01-16 17:36:04.000000000 +0100
+++ setools3-setools-3.3.8/libqpol/src/policy_extend.c 2016-07-18 12:40:35.930965312 +0200
@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_se
for (class_node = rule->perms; class_node; class_node = class_node->next) {
key.rule_type = rule->specified;
key.source_val = key.target_val = i + 1;
- key.class_val = class_node->class;
+ key.class_val = class_node->tclass;
key.cond = cond;
if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
goto err;
@@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_se
key.rule_type = rule->specified;
key.source_val = i + 1;
key.target_val = j + 1;
- key.class_val = class_node->class;
+ key.class_val = class_node->tclass;
key.cond = cond;
if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
goto err;
Index: setools3-setools-3.3.8/libqpol/src/syn_rule_query.c
===================================================================
--- setools3-setools-3.3.8.orig/libqpol/src/syn_rule_query.c 2013-01-16 17:36:04.000000000 +0100
+++ setools3-setools-3.3.8/libqpol/src/syn_rule_query.c 2016-07-18 12:40:35.930965312 +0200
@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cu
return NULL;
}
- return db->class_val_to_struct[srcs->cur->class - 1];
+ return db->class_val_to_struct[srcs->cur->tclass - 1];
}
static int syn_rule_class_state_next(qpol_iterator_t * iter)
@@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const
}
for (node = internal_rule->perms; node; node = node->next) {
- for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) {
+ for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) {
if (!(node->data & (1 << i)))
continue;
- tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i));
+ tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i));
if (tmp) {
tmp++; /* remove prepended space */
for (cur = 0; cur < perm_list_sz; cur++)
Index: setools3-setools-3.3.8/secmds/replcon.cc
===================================================================
--- setools3-setools-3.3.8.orig/secmds/replcon.cc 2013-01-16 17:36:04.000000000 +0100
+++ setools3-setools-3.3.8/secmds/replcon.cc 2016-07-18 12:40:35.930965312 +0200
@@ -60,7 +60,7 @@ static struct option const longopts[] =
{NULL, 0, NULL, 0}
};
-extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
/**
* As that setools must work with older libselinux versions that may

34
setools.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Mon Jun 11 08:14:26 UTC 2018 - jsegitz@suse.com
- Added warning.patch in former change to prevent warnings from
stopping the build
-------------------------------------------------------------------
Wed May 16 07:28:39 UTC 2018 - mcepl@suse.com
- Upgrade to 4.1.1
-------------------------------------------------------------------
Wed Dec 20 12:23:39 UTC 2017 - jsegitz@suse.com
- Update to version 4.0.1. SETools was reimplemented in Python.
- Doesn't build
* setools-libs
* setools-java
* setools-tcl
* setools-devel
anymore since the files are not povided anymore
- Dropped
* add-to-header-define_cond_filename_trans.patch
* implicit-fortify-decl.patch
* setools-3.3.5-javacflags.patch
* setools-3.3.5-nonvoid.patch
* setools-3.3.5-strcmp.patch
* setools-am121.patch
* setools-libsepol.patch
* setools-setup_py-prefix.patch
* setools-swig-2.0.7.patch
* setools-swig-2x.patch
* setools-tclass.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 30 07:54:34 UTC 2017 - coolo@suse.com Sat Sep 30 07:54:34 UTC 2017 - coolo@suse.com

4
setools.pam
View File

@ -1,4 +0,0 @@
#%PAM-1.0
auth include common-auth
account include common-account
session include common-session

320
setools.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package setools # spec file for package setools
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,62 +16,27 @@
# #
%define dataversion 3.3
Name: setools Name: setools
Version: 3.3.8 Version: 4.1.1
Release: 0 Release: 0
Url: https://github.com/TresysTechnology/setools3/wiki Url: https://github.com/TresysTechnology/setools/
Summary: Policy analysis tools for SELinux Summary: Policy analysis tools for SELinux
License: GPL-2.0 License: GPL-2.0-only
Group: System/Base Group: System/Management
Source: https://github.com/TresysTechnology/setools3/archive/%{name}-%{version}.tar.gz Source: https://github.com/TresysTechnology/setools/archive/%{version}.tar.gz
Source1: setools.pam Patch0: warning.patch
Source2: apol.desktop
Source3: seaudit.desktop
Source4: sediffx.desktop
Patch0: %{name}-3.3.5-javacflags.patch
Patch1: %{name}-3.3.5-nonvoid.patch
Patch2: %{name}-3.3.5-strcmp.patch
Patch6: %{name}-setup_py-prefix.patch
Patch7: %{name}-swig-2x.patch
Patch8: %{name}-swig-2.0.7.patch
Patch9: %{name}-am121.patch
Patch10: %{name}-libsepol.patch
Patch23: add-to-header-define_cond_filename_trans.patch
Patch24: setools-tclass.patch
Patch25: implicit-fortify-decl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: libsepol-devel
BuildRequires: glibc-devel
BuildRequires: gtk2-devel
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: libbz2-devel
BuildRequires: libglade2-devel
BuildRequires: libselinux-devel
BuildRequires: libsepol-devel-static BuildRequires: libsepol-devel-static
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: sqlite3-devel BuildRequires: python-setuptools
BuildRequires: swig BuildRequires: swig
BuildRequires: tcl-devel
BuildRequires: tk-devel
BuildRequires: update-alternatives
BuildRequires: update-desktop-files
Requires: setools-console = %{version}-%{release} Requires: setools-console = %{version}-%{release}
Requires: setools-gui = %{version}-%{release} Requires: setools-gui = %{version}-%{release}
Requires: setools-libs = %{version}-%{release}
Requires: setools-libs-tcl = %{version}-%{release}
%description %description
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -80,107 +45,21 @@ libraries designed to facilitate SELinux policy analysis.
This meta-package depends upon the main packages necessary to run This meta-package depends upon the main packages necessary to run
SETools. SETools.
%package libs
Summary: Policy analysis support libraries for SELinux
License: LGPL-2.0
Group: System Environment/Libraries
%description libs
SETools is a collection of graphical tools, command-line tools, and
libraries designed to facilitate SELinux policy analysis.
This package includes the following run-time libraries:
libapol policy analysis library
libpoldiff semantic policy difference library
libqpol library that abstracts policy internals
libseaudit parse and filter SELinux audit messages in log files
libsefs SELinux file contexts library
%package -n python-setools %package -n python-setools
Summary: Python bindings for SELinux policy analysis Summary: Python bindings for SELinux policy analysis
License: LGPL-2.0 License: LGPL-2.0-only
Group: Development/Languages Group: Development/Languages/Python
Requires: python Requires: python
Requires: setools-libs = %{version}
%description -n python-setools %description -n python-setools
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
libraries designed to facilitate SELinux policy analysis. libraries designed to facilitate SELinux policy analysis.
This package includes Python bindings for the following libraries:
libapol policy analysis library
libpoldiff semantic policy difference library
libqpol library that abstracts policy internals
libseaudit parse and filter SELinux audit messages in log files
libsefs SELinux file contexts library
%package java
Summary: Java bindings for SELinux policy analysis
License: LGPL-2.0
Group: Development/Languages
Requires: java
Requires: setools-libs = %{version}
%description java
SETools is a collection of graphical tools, command-line tools, and
libraries designed to facilitate SELinux policy analysis.
This package includes Java bindings for the following libraries:
libapol policy analysis library
libpoldiff semantic policy difference library
libqpol library that abstracts policy internals
libseaudit parse and filter SELinux audit messages in log files
libsefs SELinux file contexts library
%package tcl
Summary: Tcl bindings for SELinux policy analysis
License: LGPL-2.0
Group: Development/Languages
Requires: setools-libs = %{version}
Requires: tcl
%description tcl
SETools is a collection of graphical tools, command-line tools, and
libraries designed to facilitate SELinux policy analysis.
This package includes Tcl bindings for the following libraries:
libapol policy analysis library
libpoldiff semantic policy difference library
libqpol library that abstracts policy internals
libseaudit parse and filter SELinux audit messages in log files
libsefs SELinux file contexts library
%package devel
Summary: Policy analysis development files for SELinux
License: LGPL-2.0
Group: Development/Libraries
Requires: libselinux-devel
Requires: libsepol-devel
Requires: setools-libs = %{version}
%description devel
SETools is a collection of graphical tools, command-line tools, and
libraries designed to facilitate SELinux policy analysis.
This package includes header files and archives for the following
libraries:
libapol policy analysis library
libpoldiff semantic policy difference library
libqpol library that abstracts policy internals
libseaudit parse and filter SELinux audit messages in log files
libsefs SELinux file contexts library
%package console %package console
Summary: Policy analysis command-line tools for SELinux Summary: Policy analysis command-line tools for SELinux
License: GPL-2.0 License: GPL-2.0-only
Group: System/Base Group: System/Base
Requires: setools-libs = %{version} Requires: python-setools = %{version}
%description console %description console
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -188,24 +67,20 @@ libraries designed to facilitate SELinux policy analysis.
This package includes the following console tools: This package includes the following console tools:
seaudit-report audit log analysis tool seinfo Provide information about policies
sechecker SELinux policy checking tool sesearch Tool to query policies
secmds command line tools: seinfo, sesearch, findcon, sedta Domain transition analysis tool
replcon, and indexcon seinfoflow Information flow analysis tool
sediff semantic policy difference tool sediff Semantic policy difference tool
%package gui %package gui
Summary: Policy analysis graphical tools for SELinux Summary: Policy analysis graphical tools for SELinux
License: GPL-2.0 License: GPL-2.0-only
Group: System/Base Group: System/Base
Requires: bwidget Requires: bwidget
Requires: glib2
Requires: gtk2 Requires: gtk2
Requires: setools-libs = %{version}
Requires: setools-tcl = %{version}
Requires: tcl Requires: tcl
Requires: tk Requires: tk
# Requires: usermode
%description gui %description gui
SETools is a collection of graphical tools, command-line tools, and SETools is a collection of graphical tools, command-line tools, and
@ -214,83 +89,16 @@ libraries designed to facilitate SELinux policy analysis.
This package includes the following graphical tools: This package includes the following graphical tools:
apol policy analysis tool apol policy analysis tool
seaudit audit log analysis tool
sediffx semantic policy difference tool
%define setoolsdir %{_datadir}/setools-%{dataversion}
%define tcllibdir %{_libdir}/setools
%prep %prep
%setup -q -n %{name}3-%{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 %patch0
%patch1
%patch2
%patch6 -p1
%patch7
%patch8
%patch9 -p1
%patch10 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%build %build
autoreconf -fi python setup.py build_ext -i
%configure \
--disable-bwidget-check \
--disable-selinux-check \
--enable-swig-python \
--enable-swig-java \
--enable-swig-tcl \
--with-java-prefix=%{java_home} \
--with-javac-flags="-source 1.6 -target 1.6"
make %{?jobs:-j%jobs}
%install %install
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install python setup.py install --prefix=%{_prefix} --root=%{buildroot}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/seaudit
# install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
# install -p -m 644 packages/rpm/seaudit.console $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/seaudit
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/applications
install -p -m 644 apol/apol.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/apol.png
install -p -m 644 seaudit/seaudit.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/seaudit.png
install -p -m 644 sediff/sediffx.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sediffx.png
%suse_update_desktop_file -i apol System Security
%suse_update_desktop_file -i seaudit System Security
%suse_update_desktop_file -i sediffx System
# replace absolute symlinks with relative symlinks
ln -sf ../setools-%{dataversion}/qpol.jar $RPM_BUILD_ROOT/%{_javadir}/qpol.jar
ln -sf ../setools-%{dataversion}/apol.jar $RPM_BUILD_ROOT/%{_javadir}/apol.jar
ln -sf ../setools-%{dataversion}/poldiff.jar $RPM_BUILD_ROOT/%{_javadir}/poldiff.jar
ln -sf ../setools-%{dataversion}/seaudit.jar $RPM_BUILD_ROOT/%{_javadir}/seaudit.jar
ln -sf ../setools-%{dataversion}/sefs.jar $RPM_BUILD_ROOT/%{_javadir}/sefs.jar
# remove static libs
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
# ensure permissions are correct
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so.*
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/%{name}/*/*.so.*
# chmod 0755 $RPM_BUILD_ROOT%{py_sitedir}/*.so.*
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*
chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/*
chmod 0755 $RPM_BUILD_ROOT%{setoolsdir}/seaudit-report-service
chmod 0644 $RPM_BUILD_ROOT%{tcllibdir}/*/pkgIndex.tcl
# workaround python bindings installer that install files in both locations - TODO: fix properly
if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then
mv $RPM_BUILD_ROOT%{python_sitelib}/setools/* $RPM_BUILD_ROOT%{python_sitearch}/setools/
fi
%files libs
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL KNOWN-BUGS NEWS README
%{_libdir}/libqpol.so.*
%{_libdir}/libapol.so.*
%{_libdir}/libpoldiff.so.*
%{_libdir}/libsefs.so.*
%{_libdir}/libseaudit.so.*
%dir %{setoolsdir}
%files -n python-setools %files -n python-setools
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -298,96 +106,24 @@ fi
%dir %{python_sitearch}/setools %dir %{python_sitearch}/setools
%{python_sitearch}/setools/* %{python_sitearch}/setools/*
%files java
%defattr(-,root,root,-)
%{_libdir}/libjqpol.so.*
%{_libdir}/libjapol.so.*
%{_libdir}/libjpoldiff.so.*
%{_libdir}/libjseaudit.so.*
%{_libdir}/libjsefs.so.*
%{setoolsdir}/*.jar
%{_javadir}/*.jar
%files tcl
%defattr(-,root,root,-)
%dir %{tcllibdir}
%{tcllibdir}/qpol/
%{tcllibdir}/apol/
%{tcllibdir}/poldiff/
%{tcllibdir}/seaudit/
%{tcllibdir}/sefs/
%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%{_includedir}/qpol/
%{_includedir}/apol/
%{_includedir}/poldiff/
%{_includedir}/seaudit/
%{_includedir}/sefs/
%files console %files console
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/seinfo %{_bindir}/seinfo
%{_bindir}/sesearch %{_bindir}/sesearch
%{_bindir}/indexcon %{_bindir}/sedta
%{_bindir}/findcon %{_bindir}/seinfoflow
%{_bindir}/replcon
%{_bindir}/sechecker
%{_bindir}/sediff %{_bindir}/sediff
%{_bindir}/seaudit-report %{_mandir}/man1/sedta.1.gz
%{setoolsdir}/sechecker-profiles/ %{_mandir}/man1/seinfoflow.1.gz
%{setoolsdir}/sechecker_help.txt
%{setoolsdir}/seaudit-report-service
%{setoolsdir}/seaudit-report.conf
%{setoolsdir}/seaudit-report.css
%{_mandir}/man1/findcon.1.gz
%{_mandir}/man1/indexcon.1.gz
%{_mandir}/man1/replcon.1.gz
%{_mandir}/man1/sechecker.1.gz
%{_mandir}/man1/sediff.1.gz %{_mandir}/man1/sediff.1.gz
%{_mandir}/man1/seinfo.1.gz %{_mandir}/man1/seinfo.1.gz
%{_mandir}/man1/sesearch.1.gz %{_mandir}/man1/sesearch.1.gz
%{_mandir}/man8/seaudit-report.8.gz
%files gui %files gui
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/sediffx %dir %{python_sitearch}/setoolsgui
%{python_sitearch}/setoolsgui/*
%{_bindir}/apol %{_bindir}/apol
%dir %{tcllibdir}
%{tcllibdir}/apol_tcl/
%{setoolsdir}/sediff_help.txt
%{setoolsdir}/apol_help.txt
%{setoolsdir}/domaintrans_help.txt
%{setoolsdir}/file_relabel_help.txt
%{setoolsdir}/infoflow_help.txt
%{setoolsdir}/types_relation_help.txt
%{setoolsdir}/apol_perm_mapping_*
%{setoolsdir}/seaudit_help.txt
%{setoolsdir}/*.glade
%{setoolsdir}/*.png
%{setoolsdir}/apol.gif
%{setoolsdir}/dot_seaudit
%{_mandir}/man1/apol.1.gz %{_mandir}/man1/apol.1.gz
%{_mandir}/man1/sediffx.1.gz
%{_mandir}/man8/seaudit.8.gz
%{_sbindir}/seaudit
%config(noreplace) %{_sysconfdir}/pam.d/seaudit
# %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit
%{_datadir}/applications/*
%attr(0644,root,root) %{_datadir}/pixmaps/*.png
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post java -p /sbin/ldconfig
%postun java -p /sbin/ldconfig
%post tcl -p /sbin/ldconfig
%postun tcl -p /sbin/ldconfig
%changelog %changelog

13
warning.patch Normal file
View File

@ -0,0 +1,13 @@
Index: setup.py
===================================================================
--- setup.py.orig
+++ setup.py
@@ -146,7 +146,7 @@ ext_py_mods = [Extension('setools.policy
'libqpol/policy_scan.c',
'libqpol/xen_query.c'],
include_dirs=include_dirs,
- extra_compile_args=['-Werror', '-Wextra',
+ extra_compile_args=['-Wextra',
'-Waggregate-return',
'-Wfloat-equal',
'-Wformat', '-Wformat=2',