| 1 |
commit: cac0f9671a3124eb616c74abd8f4bea2c26400cb |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 27 11:58:28 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 27 16:09:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac0f967 |
| 7 |
|
| 8 |
app-admin/setools: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/8608 |
| 11 |
|
| 12 |
.../files/setools-3.3.8-no-check-file.patch | 15 ----------- |
| 13 |
.../setools/files/setools-3.3.8-policy-max.patch | 29 ---------------------- |
| 14 |
.../setools/files/setools-4.0.1-remove-gui.patch | 17 ------------- |
| 15 |
3 files changed, 61 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 31848e9564b..00000000000 |
| 20 |
--- a/app-admin/setools/files/setools-3.3.8-no-check-file.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,15 +0,0 @@ |
| 23 |
-there's no real need to run AC_CHECK_FILE to see if a file exists. if the |
| 24 |
-static link fails later on, then the static lib didn't exist. this also |
| 25 |
-breaks cross-compiling. |
| 26 |
- |
| 27 |
---- a/configure.ac |
| 28 |
-+++ b/configure.ac |
| 29 |
-@@ -448,8 +448,6 @@ |
| 30 |
- sepol_srcdir="") |
| 31 |
- if test "x${sepol_srcdir}" = "x"; then |
| 32 |
- sepol_srcdir=${sepol_devel_libdir} |
| 33 |
-- AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],, |
| 34 |
-- AC_MSG_ERROR([make sure libsepol-static is installed])) |
| 35 |
- else |
| 36 |
- AC_MSG_CHECKING([for compatible sepol source tree]) |
| 37 |
- sepol_version=${sepol_srcdir}/VERSION |
| 38 |
|
| 39 |
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 |
| 40 |
deleted file mode 100644 |
| 41 |
index cf6917a671d..00000000000 |
| 42 |
--- a/app-admin/setools/files/setools-3.3.8-policy-max.patch |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,29 +0,0 @@ |
| 45 |
-trying to run compiled code fails when cross-compiling. |
| 46 |
-probe the value using the preprocessor instead. |
| 47 |
- |
| 48 |
---- a/configure.ac |
| 49 |
-+++ b/configure.ac |
| 50 |
-@@ -621,21 +621,8 @@ |
| 51 |
- sepol_new_errcodes="yes", |
| 52 |
- sepol_new_errcodes="no") |
| 53 |
- |
| 54 |
--AC_RUN_IFELSE( |
| 55 |
-- [AC_LANG_SOURCE([ |
| 56 |
--#include <sepol/policydb/policydb.h> |
| 57 |
--#include <stdio.h> |
| 58 |
--#include <stdlib.h> |
| 59 |
--int main(void) { |
| 60 |
-- FILE *f = fopen("conftest.data", "w"); |
| 61 |
-- if (f != NULL && fprintf(f, "%d", POLICYDB_VERSION_MAX) > 0) { |
| 62 |
-- fclose(f); |
| 63 |
-- exit(EXIT_SUCCESS); |
| 64 |
-- } |
| 65 |
-- exit(EXIT_FAILURE); |
| 66 |
--}])], |
| 67 |
-- sepol_policy_version_max=`cat conftest.data`, |
| 68 |
-- AC_MSG_FAILURE([could not determine maximum libsepol policy version])) |
| 69 |
-+printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c |
| 70 |
-+sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1` |
| 71 |
- AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol]) |
| 72 |
- CFLAGS="${sepol_save_CFLAGS}" |
| 73 |
- CPPFLAGS="${sepol_save_CPPFLAGS}" |
| 74 |
|
| 75 |
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 |
| 76 |
deleted file mode 100644 |
| 77 |
index bb93ff269b8..00000000000 |
| 78 |
--- a/app-admin/setools/files/setools-4.0.1-remove-gui.patch |
| 79 |
+++ /dev/null |
| 80 |
@@ -1,17 +0,0 @@ |
| 81 |
---- setools-4.0.1/setup.py.orig 2016-05-22 19:50:02.586000000 +0200 |
| 82 |
-+++ setools-4.0.1/setup.py 2016-05-22 19:50:56.107000000 +0200 |
| 83 |
-@@ -163,11 +163,10 @@ |
| 84 |
- 'build_lex': LexCommand, |
| 85 |
- 'build_ext': BuildExtCommand, |
| 86 |
- 'build_qhc': QtHelpCommand}, |
| 87 |
-- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], |
| 88 |
-- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], |
| 89 |
-+ packages=['setools', 'setools.diff', 'setools.policyrep'], |
| 90 |
-+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], |
| 91 |
- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ), |
| 92 |
-- (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") + |
| 93 |
-- ["data/perm_map", "qhc/apol.qhc"] )], |
| 94 |
-+ (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),], |
| 95 |
- ext_modules=ext_py_mods, |
| 96 |
- test_suite='tests', |
| 97 |
- license='GPLv2+, LGPLv2.1+', |
Archives