* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/files/
@ 2016-07-01 8:02 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-07-01 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 86c76e3ee488d05e5ef7f6de0adefe66b6bba052
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 30 17:51:06 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 07:34:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c76e3e
app-admin/setools: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/1803
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../fix-check-role_set_expand-libsepol-2.1.0.patch | 24 -----
.../setools/files/fix-implicit-def-fstat.patch | 13 ---
.../setools3-userspace-2.4-compatibility.patch | 114 ---------------------
3 files changed, 151 deletions(-)
diff --git a/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch b/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch
deleted file mode 100644
index 548f60b..0000000
--- a/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur setools-3.3.7.orig/configure.ac setools-3.3.7/configure.ac
---- setools-3.3.7.orig/configure.ac 2011-08-12 19:20:32.651000078 +0200
-+++ setools-3.3.7/configure.ac 2011-08-12 19:20:42.224000036 +0200
-@@ -503,7 +503,7 @@
- [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")
-diff -ur setools-3.3.7.orig/libqpol/src/policy_define.c setools-3.3.7/libqpol/src/policy_define.c
---- setools-3.3.7.orig/libqpol/src/policy_define.c 2011-08-12 19:20:32.657000013 +0200
-+++ setools-3.3.7/libqpol/src/policy_define.c 2011-08-12 19:20:53.907005864 +0200
-@@ -2133,7 +2133,7 @@
-
- /* This ebitmap business is just to ensure that there are not conflicting role_trans rules */
- #ifdef HAVE_SEPOL_USER_ROLE_MAPPING
-- if (role_set_expand(&roles, &e_roles, policydbp, NULL))
-+ if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL))
- #else
- if (role_set_expand(&roles, &e_roles, policydbp))
- #endif
diff --git a/app-admin/setools/files/fix-implicit-def-fstat.patch b/app-admin/setools/files/fix-implicit-def-fstat.patch
deleted file mode 100644
index 7276432..0000000
--- a/app-admin/setools/files/fix-implicit-def-fstat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur setools-3.3.7.orig/libqpol/src/policy.c setools-3.3.7/libqpol/src/policy.c
---- setools-3.3.7.orig/libqpol/src/policy.c 2011-08-12 19:48:13.793000029 +0200
-+++ setools-3.3.7/libqpol/src/policy.c 2011-08-12 19:49:32.880001229 +0200
-@@ -36,6 +36,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include <asm/types.h>
-
- #include <sepol/debug.h>
diff --git a/app-admin/setools/files/setools3-userspace-2.4-compatibility.patch b/app-admin/setools/files/setools3-userspace-2.4-compatibility.patch
deleted file mode 100644
index c8fc3f5..0000000
--- a/app-admin/setools/files/setools3-userspace-2.4-compatibility.patch
+++ /dev/null
@@ -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(-)
-
-diff --git a/configure.ac b/configure.ac
-index 80395e6..ae20da7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -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 ***
-
-diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c
-index 229779c..15f70ba 100644
---- a/libqpol/src/policy_define.c
-+++ b/libqpol/src/policy_define.c
-@@ -1661,7 +1661,7 @@ int define_compute_type_helper(int which, avrule_t ** rule)
- goto bad;
- }
- 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;
-@@ -1901,7 +1901,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule)
- 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)
-diff --git a/libqpol/src/policy_extend.c b/libqpol/src/policy_extend.c
-index 5325a87..1417271 100644
---- a/libqpol/src/policy_extend.c
-+++ b/libqpol/src/policy_extend.c
-@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
- 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_sepol_avrule(qpol_policy_t * policy, qpol_
- 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;
-diff --git a/libqpol/src/syn_rule_query.c b/libqpol/src/syn_rule_query.c
-index 3e63204..d7578f1 100644
---- a/libqpol/src/syn_rule_query.c
-+++ b/libqpol/src/syn_rule_query.c
-@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter)
- 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 qpol_policy_t * policy, const qpol_syn_a
- }
-
- 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++)
-diff --git a/secmds/replcon.cc b/secmds/replcon.cc
-index 34f7c1a..307c39f 100644
---- a/secmds/replcon.cc
-+++ b/secmds/replcon.cc
-@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/files/
@ 2018-03-15 22:56 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2018-03-15 22:56 UTC (permalink / raw
To: gentoo-commits
commit: db74a07251ce6f34cc04ca3854d4d0df84504c74
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 6 19:22:58 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 22:56:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db74a072
app-admin/setools: remove unused patch.
Closes: https://github.com/gentoo/gentoo/pull/7378
app-admin/setools/files/setools-4.1.0-remove-gui.patch | 18 ------------------
1 file changed, 18 deletions(-)
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
deleted file mode 100644
index 67d7fe5c6ee..00000000000
--- a/app-admin/setools/files/setools-4.1.0-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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+',
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/files/
@ 2018-05-27 16:11 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:11 UTC (permalink / raw
To: gentoo-commits
commit: cac0f9671a3124eb616c74abd8f4bea2c26400cb
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 11:58:28 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:09:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac0f967
app-admin/setools: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/8608
.../files/setools-3.3.8-no-check-file.patch | 15 -----------
.../setools/files/setools-3.3.8-policy-max.patch | 29 ----------------------
.../setools/files/setools-4.0.1-remove-gui.patch | 17 -------------
3 files changed, 61 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
deleted file mode 100644
index 31848e9564b..00000000000
--- a/app-admin/setools/files/setools-3.3.8-no-check-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index cf6917a671d..00000000000
--- a/app-admin/setools/files/setools-3.3.8-policy-max.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index bb93ff269b8..00000000000
--- a/app-admin/setools/files/setools-4.0.1-remove-gui.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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+',
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/files/
@ 2019-12-31 18:19 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2019-12-31 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 2ac13c5eae46dbc1115f4065412db50a5ed07657
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Dec 31 07:17:43 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 18:19:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac13c5e
app-admin/setools: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14193
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
app-admin/setools/files/setools-4.1.1-remove-gui.patch | 18 ------------------
1 file changed, 18 deletions(-)
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
deleted file mode 100644
index 1bb78f5fd96..00000000000
--- a/app-admin/setools/files/setools-4.1.1-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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+',
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-31 18:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-27 16:11 [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2019-12-31 18:19 Aaron Bauman
2018-03-15 22:56 Patrice Clement
2016-07-01 8:02 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox