diff options
Diffstat (limited to 'app-admin/setools/files')
5 files changed, 97 insertions, 0 deletions
diff --git a/app-admin/setools/files/setools-3.3.8-no-check-file.patch b/app-admin/setools/files/setools-3.3.8-no-check-file.patch new file mode 100644 index 000000000000..31848e9564b8 --- /dev/null +++ b/app-admin/setools/files/setools-3.3.8-no-check-file.patch @@ -0,0 +1,15 @@ +there's no real need to run AC_CHECK_FILE to see if a file exists. if the +static link fails later on, then the static lib didn't exist. this also +breaks cross-compiling. + +--- a/configure.ac ++++ b/configure.ac +@@ -448,8 +448,6 @@ + sepol_srcdir="") + if test "x${sepol_srcdir}" = "x"; then + sepol_srcdir=${sepol_devel_libdir} +- AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],, +- AC_MSG_ERROR([make sure libsepol-static is installed])) + else + AC_MSG_CHECKING([for compatible sepol source tree]) + sepol_version=${sepol_srcdir}/VERSION diff --git a/app-admin/setools/files/setools-3.3.8-policy-max.patch b/app-admin/setools/files/setools-3.3.8-policy-max.patch new file mode 100644 index 000000000000..cf6917a671d1 --- /dev/null +++ b/app-admin/setools/files/setools-3.3.8-policy-max.patch @@ -0,0 +1,29 @@ +trying to run compiled code fails when cross-compiling. +probe the value using the preprocessor instead. + +--- a/configure.ac ++++ b/configure.ac +@@ -621,21 +621,8 @@ + sepol_new_errcodes="yes", + sepol_new_errcodes="no") + +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([ +-#include <sepol/policydb/policydb.h> +-#include <stdio.h> +-#include <stdlib.h> +-int main(void) { +- FILE *f = fopen("conftest.data", "w"); +- if (f != NULL && fprintf(f, "%d", POLICYDB_VERSION_MAX) > 0) { +- fclose(f); +- exit(EXIT_SUCCESS); +- } +- exit(EXIT_FAILURE); +-}])], +- sepol_policy_version_max=`cat conftest.data`, +- AC_MSG_FAILURE([could not determine maximum libsepol policy version])) ++printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c ++sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1` + AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol]) + CFLAGS="${sepol_save_CFLAGS}" + CPPFLAGS="${sepol_save_CPPFLAGS}" diff --git a/app-admin/setools/files/setools-4.0.1-remove-gui.patch b/app-admin/setools/files/setools-4.0.1-remove-gui.patch new file mode 100644 index 000000000000..bb93ff269b83 --- /dev/null +++ b/app-admin/setools/files/setools-4.0.1-remove-gui.patch @@ -0,0 +1,17 @@ +--- setools-4.0.1/setup.py.orig 2016-05-22 19:50:02.586000000 +0200 ++++ setools-4.0.1/setup.py 2016-05-22 19:50:56.107000000 +0200 +@@ -163,11 +163,10 @@ + 'build_lex': LexCommand, + 'build_ext': BuildExtCommand, + 'build_qhc': QtHelpCommand}, +- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], ++ packages=['setools', 'setools.diff', 'setools.policyrep'], ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], + data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ), +- (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") + +- ["data/perm_map", "qhc/apol.qhc"] )], ++ (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),], + ext_modules=ext_py_mods, + test_suite='tests', + license='GPLv2+, LGPLv2.1+', diff --git a/app-admin/setools/files/setools-4.1.0-remove-gui.patch b/app-admin/setools/files/setools-4.1.0-remove-gui.patch new file mode 100644 index 000000000000..67d7fe5c6eea --- /dev/null +++ b/app-admin/setools/files/setools-4.1.0-remove-gui.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 4e7645c..aa3895a 100644 +--- a/setup.py ++++ b/setup.py +@@ -180,10 +180,10 @@ setup(name='setools', + 'build_lex': LexCommand, + 'build_ext': BuildExtCommand, + 'build_qhc': QtHelpCommand}, +- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], ++ packages=['setools', 'setools.diff', 'setools.policyrep'], ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], + data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], +- package_data={'': ['*.ui', '*.qhc'], 'setools': ['perm_map']}, ++ package_data={'setools': ['perm_map']}, + ext_modules=ext_py_mods, + test_suite='tests', + license='GPLv2+, LGPLv2.1+', diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch new file mode 100644 index 000000000000..1bb78f5fd964 --- /dev/null +++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 2ca44c9..0c8a0d9 100644 +--- a/setup.py ++++ b/setup.py +@@ -180,10 +180,10 @@ setup(name='setools', + 'build_lex': LexCommand, + 'build_ext': BuildExtCommand, + 'build_qhc': QtHelpCommand}, +- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], ++ packages=['setools', 'setools.diff', 'setools.policyrep'], ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], + data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], +- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, ++ package_data={'setools': ['perm_map']}, + ext_modules=ext_py_mods, + test_suite='tests', + license='GPLv2+, LGPLv2.1+', |