Add ftrule*h in apol and qpol

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,21 +1 @@
 setools-3.3.7.tar.bz2
-setools-3.3.8.tar.bz2
-setools-3.3.8-f1e5b20.tar.bz2
-/4.1.0.tar.gz
-/4.1.1.tar.gz
-/4.2.0-beta.tar.gz
-/4.2.0-rc.tar.gz
-/4.2.0.tar.gz
-/4.2.1.tar.gz
-/4.2.2.tar.gz
-/4.3.0.tar.gz
-/05e90ee.tar.gz
-/16c0696.tar.gz
-/4.4.0.tar.gz
-/4.4.1.tar.gz
-/4.4.2.tar.gz
-/4.4.3.tar.gz
-/4.4.4.tar.gz
-/4.5.0.tar.gz
-/4.5.1.tar.gz
-/4.6.0.tar.gz

0002-setools-should-exit-with-an-error-status-if-it-gets-.patch

@@ -0,0 +1,133 @@
+From 667fe9187c203ffcba855e821dff11c8f71ef000 Mon Sep 17 00:00:00 2001
+From: Dan Walsh <dwalsh@redhat.com>
+Date: Tue, 20 Sep 2011 15:39:51 -0400
+Subject: [PATCH 2/6] setools-should-exit-with-an-error-status-if-it-gets-an
+ error
+
+---
+ secmds/seinfo.c |   51 +++++++++++++++++++++++++++------------------------
+ 1 files changed, 27 insertions(+), 24 deletions(-)
+
+diff --git a/secmds/seinfo.c b/secmds/seinfo.c
+index fdf23e9..3088f88 100644
+--- a/secmds/seinfo.c
++++ b/secmds/seinfo.c
+@@ -827,7 +827,7 @@ static int print_sens(FILE * fp, const char *name, int expand, const apol_policy
+  */
+ static int print_cats(FILE * fp, const char *name, int expand, const apol_policy_t * policydb)
+ {
+-	int retval = 0;
++	int retval = -1;
+ 	apol_cat_query_t *query = NULL;
+ 	apol_vector_t *v = NULL;
+ 	const qpol_cat_t *cat_datum = NULL;
+@@ -911,9 +911,10 @@ static int print_fsuse(FILE * fp, const char *type, const apol_policy_t * policy
+ 		fprintf(fp, "   %s\n", tmp);
+ 		free(tmp);
+ 	}
+-	if (type && !apol_vector_get_size(v))
++	if (type && !apol_vector_get_size(v)) {
+ 		ERR(policydb, "No fs_use statement for filesystem of type %s.", type);
+-
++		goto cleanup;
++	}
+ 	retval = 0;
+       cleanup:
+ 	apol_fs_use_query_destroy(&query);
+@@ -949,7 +950,6 @@ static int print_genfscon(FILE * fp, const char *type, const apol_policy_t * pol
+ 		ERR(policydb, "%s", strerror(ENOMEM));
+ 		goto cleanup;
+ 	}
+-
+ 	if (apol_genfscon_query_set_filesystem(policydb, query, type))
+ 		goto cleanup;
+ 	if (apol_genfscon_get_by_query(policydb, query, &v))
+@@ -967,8 +967,10 @@ static int print_genfscon(FILE * fp, const char *type, const apol_policy_t * pol
+ 		free(tmp);
+ 	}
+ 
+-	if (type && !apol_vector_get_size(v))
++	if (type && !apol_vector_get_size(v)) {
+ 		ERR(policydb, "No genfscon statement for filesystem of type %s.", type);
++		goto cleanup;
++	}
+ 
+ 	retval = 0;
+       cleanup:
+@@ -1646,6 +1648,7 @@ cleanup:	// close and destroy iterators etc.
+ 
+ int main(int argc, char **argv)
+ {
++	int rc = 0;
+ 	int classes, types, attribs, roles, users, all, expand, stats, rt, optc, isids, bools, sens, cats, fsuse, genfs, netif,
+ 		node, port, permissives, polcaps, constrain, linebreaks;
+ 	apol_policy_t *policydb = NULL;
+@@ -1851,46 +1854,46 @@ int main(int argc, char **argv)
+ 
+ 	/* display requested info */
+ 	if (stats || all)
+-		print_stats(stdout, policydb);
++		rc = print_stats(stdout, policydb);
+ 	if (classes || all)
+-		print_classes(stdout, class_name, expand, policydb);
++		rc = print_classes(stdout, class_name, expand, policydb);
+ 	if (types || all)
+-		print_types(stdout, type_name, expand, policydb);
++		rc = print_types(stdout, type_name, expand, policydb);
+ 	if (attribs || all)
+-		print_attribs(stdout, attrib_name, expand, policydb);
++		rc = print_attribs(stdout, attrib_name, expand, policydb);
+ 	if (roles || all)
+-		print_roles(stdout, role_name, expand, policydb);
++		rc = print_roles(stdout, role_name, expand, policydb);
+ 	if (users || all)
+-		print_users(stdout, user_name, expand, policydb);
++		rc = print_users(stdout, user_name, expand, policydb);
+ 	if (bools || all)
+-		print_booleans(stdout, bool_name, expand, policydb);
++		rc = print_booleans(stdout, bool_name, expand, policydb);
+ 	if (sens || all)
+-		print_sens(stdout, sens_name, expand, policydb);
++		rc = print_sens(stdout, sens_name, expand, policydb);
+ 	if (cats || all)
+-		print_cats(stdout, cat_name, expand, policydb);
++		rc = print_cats(stdout, cat_name, expand, policydb);
+ 	if (fsuse || all)
+-		print_fsuse(stdout, fsuse_type, policydb);
++		rc = print_fsuse(stdout, fsuse_type, policydb);
+ 	if (genfs || all)
+-		print_genfscon(stdout, genfs_type, policydb);
++		rc = print_genfscon(stdout, genfs_type, policydb);
+ 	if (netif || all)
+-		print_netifcon(stdout, netif_name, policydb);
++		rc = print_netifcon(stdout, netif_name, policydb);
+ 	if (node || all)
+-		print_nodecon(stdout, node_addr, policydb);
++		rc = print_nodecon(stdout, node_addr, policydb);
+ 	if (port || all)
+-		print_portcon(stdout, port_num, protocol, policydb);
++		rc = print_portcon(stdout, port_num, protocol, policydb);
+ 	if (isids || all)
+-		print_isids(stdout, isid_name, expand, policydb);
++		rc = print_isids(stdout, isid_name, expand, policydb);
+ 	if (permissives || all)
+-		print_permissives(stdout, permissive_name, expand, policydb);
++		rc = print_permissives(stdout, permissive_name, expand, policydb);
+ 	if (polcaps || all)
+-		print_polcaps(stdout, polcap_name, expand, policydb);
++		rc = print_polcaps(stdout, polcap_name, expand, policydb);
+ 	if (constrain || all)
+-		print_constraints(stdout, expand, policydb, linebreaks);
++		rc = print_constraints(stdout, expand, policydb, linebreaks);
+ 
+ 	apol_policy_destroy(&policydb);
+ 	apol_policy_path_destroy(&pol_path);
+ 	free(policy_file);
+-	exit(0);
++	exit(rc);
+ }
+ 
+ /**
+-- 
+1.7.6.2
+

0003-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch

@@ -0,0 +1,28 @@
+From 252b7c8bf311d615164a20f4f402767e5859d972 Mon Sep 17 00:00:00 2001
+From: Dan Walsh <dwalsh@redhat.com>
+Date: Tue, 20 Sep 2011 15:40:28 -0400
+Subject: [PATCH 3/6] Since-we-do-not-ship-neverallow-rules-all-always-fail
+
+---
+ libqpol/src/avrule_query.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libqpol/src/avrule_query.c b/libqpol/src/avrule_query.c
+index 749565b..76dcaa3 100644
+--- a/libqpol/src/avrule_query.c
++++ b/libqpol/src/avrule_query.c
+@@ -57,8 +57,9 @@ int qpol_policy_get_avrule_iter(const qpol_policy_t * policy, uint32_t rule_type
+ 
+ 	if ((rule_type_mask & QPOL_RULE_NEVERALLOW) && !qpol_policy_has_capability(policy, QPOL_CAP_NEVERALLOW)) {
+ 		ERR(policy, "%s", "Cannot get avrules: Neverallow rules requested but not available");
+-		errno = ENOTSUP;
+-		return STATUS_ERR;
++/*		errno = ENOTSUP;
++		return STATUS_ERR; */
++		return STATUS_SUCCESS;
+ 	}
+ 
+ 	db = &policy->p->p;
+-- 
+1.7.6.2
+

0004-Fix-man-pages-and-getoptions.patch

@@ -0,0 +1,78 @@
+From b3c8ef5822dbf3e3272fc29627ddac7e20e936d5 Mon Sep 17 00:00:00 2001
+From: Dan Walsh <dwalsh@redhat.com>
+Date: Tue, 20 Sep 2011 15:41:12 -0400
+Subject: [PATCH 4/6] Fix-man-pages-and-getoptions
+
+---
+ man/replcon.1            |    2 ++
+ man/seinfo.1             |    6 +++++-
+ seaudit/seaudit-report.c |    2 +-
+ sediff/sediff.c          |    2 +-
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/man/replcon.1 b/man/replcon.1
+index 8aca08a..478dc51 100644
+--- a/man/replcon.1
++++ b/man/replcon.1
+@@ -44,6 +44,8 @@ Search for files which include PATH.
+ .IP "-c CLASS, --class=CLASS"
+ Search only files of object class CLASS.
+ .SH OPTIONS
++.IP "-R, --regex"
++Enable regular expressions
+ .IP "-v, --verbose"
+ Display context info during replacement.
+ .IP "-h, --help"
+diff --git a/man/seinfo.1 b/man/seinfo.1
+index 8612119..6bc17db 100644
+--- a/man/seinfo.1
++++ b/man/seinfo.1
+@@ -76,6 +76,10 @@ There is no expanded information for this component.
+ .IP "--nodecon[=ADDR]"
+ Print a list of node contexts or, if ADDR is provided, print the statement for the node with address ADDR.
+ There is no expanded information for this component.
++.IP "--polcap"
++Print policy capabilities.
++.IP "--permissive"
++Print permissive types.
+ .IP "--portcon[=PORT]"
+ Print a list of port contexts or, if PORT is provided, print the statement for port PORT.
+ There is no expanded information for this component.
+@@ -93,7 +97,7 @@ These details include the types assigned to an attribute or role and the permiss
+ This option is not available for all component types; see the description of each component for the details this option will provide.
+ .IP "--stats"
+ Print policy statistics including policy type and version information and counts of all components and rules.
+-.IP "-l"
++.IP "-l, --line-breaks"
+ Print line breaks when displaying constraint statements.
+ .IP "-h, --help"
+ Print help information and exit.
+diff --git a/seaudit/seaudit-report.c b/seaudit/seaudit-report.c
+index af3c6fb..d436c18 100644
+--- a/seaudit/seaudit-report.c
++++ b/seaudit/seaudit-report.c
+@@ -100,7 +100,7 @@ static void seaudit_report_info_usage(const char *program_name, int brief)
+ 	printf("  -s, --stdin              read log data from standard input\n");
+ 	printf("  -m, --malformed          include malformed log messages\n");
+ 	printf("  -o FILE, --output=FILE   output to FILE\n");
+-	printf("  --config=FILE            read configuration from FILE\n");
++	printf("  -c FILE, --config=FILE   read configuration from FILE\n");
+ 	printf("  --html                   set output format to HTML\n");
+ 	printf("  --stylesheet=FILE        HTML style sheet for formatting HTML report\n");
+ 	printf("                           (ignored if --html is not given)\n");
+diff --git a/sediff/sediff.c b/sediff/sediff.c
+index 6022775..341c650 100644
+--- a/sediff/sediff.c
++++ b/sediff/sediff.c
+@@ -420,7 +420,7 @@ int main(int argc, char **argv)
+ 	poldiff_t *diff = NULL;
+ 	size_t total = 0;
+ 
+-	while ((optc = getopt_long(argc, argv, "ctarubANDLMCRqhV", longopts, NULL)) != -1) {
++	while ((optc = getopt_long(argc, argv, "ctarubAqhV", longopts, NULL)) != -1) {
+ 		switch (optc) {
+ 		case 0:
+ 			break;
+-- 
+1.7.6.2
+

0005-Fix-sepol-calls-to-work-with-latest-libsepol.patch

@@ -0,0 +1,34 @@
+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(-)
+
+diff --git a/configure.ac b/configure.ac
+index e837e03..3c11e23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -505,7 +505,7 @@ AC_COMPILE_IFELSE(
+                   [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")
+@@ -541,7 +541,7 @@ if test ${sepol_check_boolmap} = "yes"; then
+                          [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]))
+-- 
+1.7.6.2
+

0007-Remove-unused-variables.patch

@@ -0,0 +1,277 @@
+From e30036e358b8f1c3f56048b467e8646fa3bfffb6 Mon Sep 17 00:00:00 2001
+From: Dan Walsh <dwalsh@redhat.com>
+Date: Tue, 20 Sep 2011 16:40:26 -0400
+Subject: [PATCH 7/7] Remove unused variables
+
+---
+ libapol/src/ftrule-query.c |   11 ++----
+ libqpol/src/ftrule_query.c |    2 -
+ secmds/sesearch.c          |   86 +++++++++++++++++++++++++++++++++-----------
+ 3 files changed, 68 insertions(+), 31 deletions(-)
+
+diff --git a/libapol/src/ftrule-query.c b/libapol/src/ftrule-query.c
+index dc248de..9c7a23b 100644
+--- a/libapol/src/ftrule-query.c
++++ b/libapol/src/ftrule-query.c
+@@ -45,14 +45,11 @@ struct apol_filename_trans_query
+ int apol_filename_trans_get_by_query(const apol_policy_t * p, const apol_filename_trans_query_t * t, apol_vector_t ** v)
+ {
+ 	apol_vector_t *source_list = NULL, *target_list = NULL, *class_list = NULL, *default_list = NULL;
+-	int retval = -1, source_as_any = 0, is_regex = 0, append_filename_trans;
+-	char *bool_name = NULL;
++	int retval = -1, source_as_any = 0, is_regex = 0;
+ 	*v = NULL;
+-	unsigned int flags = 0;
+-	qpol_iterator_t *iter = NULL, *type_iter = NULL;
++	qpol_iterator_t *iter = NULL;
+ 
+ 	if (t != NULL) {
+-		flags = t->flags;
+ 		is_regex = t->flags & APOL_QUERY_REGEX;
+ 		if (t->source != NULL &&
+ 		    (source_list =
+@@ -104,7 +101,7 @@ int apol_filename_trans_get_by_query(const apol_policy_t * p, const apol_filenam
+ 		if (qpol_iterator_get_item(iter, (void **)&filename_trans) < 0) {
+ 			goto cleanup;
+ 		}
+-		int match_source = 0, match_target = 0, match_default = 0, match_bool = 0;
++		int match_source = 0, match_target = 0, match_default = 0;
+ 		size_t i;
+ 
+ 		if (source_list == NULL) {
+@@ -265,10 +262,8 @@ char *apol_filename_trans_render(const apol_policy_t * policy, const qpol_filena
+ {
+ 	char *tmp = NULL;
+ 	const char *tmp_name = NULL;
+-	const char *filename_trans_type_str;
+ 	int error = 0;
+ 	size_t tmp_sz = 0;
+-	uint32_t filename_trans_type = 0;
+ 	const qpol_type_t *type = NULL;
+ 	const qpol_class_t *obj_class = NULL;
+ 
+diff --git a/libqpol/src/ftrule_query.c b/libqpol/src/ftrule_query.c
+index d6db848..3148d30 100644
+--- a/libqpol/src/ftrule_query.c
++++ b/libqpol/src/ftrule_query.c
+@@ -254,7 +254,6 @@ int qpol_filename_trans_get_default_type(const qpol_policy_t * policy, const qpo
+ 
+ int qpol_filename_trans_get_filename(const qpol_policy_t * policy, const qpol_filename_trans_t * rule, const char ** name)
+ {
+-	policydb_t *db = NULL;
+ 	filename_trans_t *ft = NULL;
+ 
+ 	if (name) {
+@@ -267,7 +266,6 @@ int qpol_filename_trans_get_filename(const qpol_policy_t * policy, const qpol_fi
+ 		return STATUS_ERR;
+ 	}
+ 
+-	db = &policy->p->p;
+ 	ft = (filename_trans_t *) rule;
+ 
+ 	*name = ft->name;
+diff --git a/secmds/sesearch.c b/secmds/sesearch.c
+index e44b3bc..319ffe7 100644
+--- a/secmds/sesearch.c
++++ b/secmds/sesearch.c
+@@ -72,6 +72,7 @@ static struct option const longopts[] = {
+ 
+ 	{"source", required_argument, NULL, 's'},
+ 	{"target", required_argument, NULL, 't'},
++	{"default", required_argument, NULL, 'D'},
+ 	{"role_source", required_argument, NULL, EXPR_ROLE_SOURCE},
+ 	{"role_target", required_argument, NULL, EXPR_ROLE_TARGET},
+ 	{"class", required_argument, NULL, 'c'},
+@@ -92,6 +93,7 @@ typedef struct options
+ {
+ 	char *src_name;
+ 	char *tgt_name;
++	char *default_name;
+ 	char *src_role_name;
+ 	char *tgt_role_name;
+ 	char *class_name;
+@@ -293,7 +295,8 @@ static void print_syn_av_results(const apol_policy_t * policy, const options_t *
+ 				tmp = apol_cond_expr_render(policy, cond);
+ 				enable_char = (enabled ? 'E' : 'D');
+ 				branch_char = ((is_true && enabled) || (!is_true && !enabled) ? 'T' : 'F');
+-				asprintf(&expr, "[ %s ]", tmp);
++				if (asprintf(&expr, "[ %s ]", tmp) < 0)
++					goto cleanup;
+ 				free(tmp);
+ 				tmp = NULL;
+ 				if (!expr)
+@@ -356,7 +359,8 @@ static void print_av_results(const apol_policy_t * policy, const options_t * opt
+ 				qpol_iterator_destroy(&iter);
+ 				enable_char = (enabled ? 'E' : 'D');
+ 				branch_char = (list ? 'T' : 'F');
+-				asprintf(&expr, "[ %s ]", tmp);
++				if (asprintf(&expr, "[ %s ]", tmp) < 0)
++					goto cleanup;
+ 				free(tmp);
+ 				tmp = NULL;
+ 				if (!expr)
+@@ -488,7 +492,8 @@ static void print_syn_te_results(const apol_policy_t * policy, const options_t *
+ 				tmp = apol_cond_expr_render(policy, cond);
+ 				enable_char = (enabled ? 'E' : 'D');
+ 				branch_char = ((is_true && enabled) || (!is_true && !enabled) ? 'T' : 'F');
+-				asprintf(&expr, "[ %s ]", tmp);
++				if (asprintf(&expr, "[ %s ]", tmp) < 0)
++					goto cleanup;
+ 				free(tmp);
+ 				tmp = NULL;
+ 				if (!expr)
+@@ -553,7 +558,8 @@ static void print_te_results(const apol_policy_t * policy, const options_t * opt
+ 				qpol_iterator_destroy(&iter);
+ 				enable_char = (enabled ? 'E' : 'D');
+ 				branch_char = (list ? 'T' : 'F');
+-				asprintf(&expr, "[ %s ]", tmp);
++				if (asprintf(&expr, "[ %s ]", tmp) < 0)
++					goto cleanup;
+ 				free(tmp);
+ 				tmp = NULL;
+ 				if (!expr)
+@@ -586,7 +592,7 @@ static int perform_ft_query(const apol_policy_t * policy, const options_t * opt,
+ 		return -1;
+ 	}
+ 
+-	if (!opt->type == QPOL_RULE_TYPE_TRANS && !opt->all) {
++	if (!opt->type && !opt->all) {
+ 		*v = NULL;
+ 		return 0;	       /* no search to do */
+ 	}
+@@ -600,17 +606,44 @@ static int perform_ft_query(const apol_policy_t * policy, const options_t * opt,
+ 
+ 	apol_filename_trans_query_set_regex(policy, ftq, opt->useregex);
+ 	if (opt->src_name) {
+-		if (apol_filename_trans_query_set_source(policy, ftq, opt->src_name)) {
++		if (apol_filename_trans_query_set_source(policy, ftq, opt->src_name, opt->indirect)) {
+ 			error = errno;
+ 			goto err;
+ 		}
+ 	}
++
+ 	if (opt->tgt_name) {
+ 		if (apol_filename_trans_query_set_target(policy, ftq, opt->tgt_name, opt->indirect)) {
+ 			error = errno;
+ 			goto err;
+ 		}
+ 	}
++	if (opt->default_name) {
++		if (apol_filename_trans_query_set_default(policy, ftq, opt->default_name)) {
++			error = errno;
++			goto err;
++		}
++	}
++
++	if (opt->class_name) {
++		if (opt->class_vector == NULL) {
++			if (apol_filename_trans_query_append_class(policy, ftq, opt->class_name)) {
++				error = errno;
++				goto err;
++			}
++		} else {
++			for (size_t i = 0; i < apol_vector_get_size(opt->class_vector); ++i) {
++				char *class_name;
++				class_name = apol_vector_get_element(opt->class_vector, i);
++				if (!class_name)
++					continue;
++				if (apol_filename_trans_query_append_class(policy, ftq, class_name)) {
++					error = errno;
++					goto err;
++				}
++			}
++		}
++	}
+ 
+ 	if (apol_filename_trans_get_by_query(policy, ftq, v)) {
+ 		error = errno;
+@@ -630,37 +663,36 @@ static int perform_ft_query(const apol_policy_t * policy, const options_t * opt,
+ 
+ static void print_ft_results(const apol_policy_t * policy, const options_t * opt, const apol_vector_t * v)
+ {
+-	qpol_policy_t *q = apol_policy_get_qpol(policy);
+-	size_t i, num_rules = 0;
+-	const qpol_filename_trans_t *rule = NULL;
+-	char *tmp = NULL, *rule_str = NULL, *expr = NULL;
++	size_t i, num_filename_trans = 0;
++	const qpol_filename_trans_t *filename_trans = NULL;
++	char *tmp = NULL, *filename_trans_str = NULL, *expr = NULL;
+ 	char enable_char = ' ', branch_char = ' ';
+ 	qpol_iterator_t *iter = NULL;
+ 	const qpol_cond_t *cond = NULL;
+ 	uint32_t enabled = 0, list = 0;
+ 
+-	if (!(num_rules = apol_vector_get_size(v)))
++	if (!(num_filename_trans = apol_vector_get_size(v)))
+ 		goto cleanup;
+ 
+-	fprintf(stdout, "Found %zd named file transition rules:\n", num_rules);
++	fprintf(stdout, "Found %zd named file transition filename_trans:\n", num_filename_trans);
+ 
+-	for (i = 0; i < num_rules; i++) {
++	for (i = 0; i < num_filename_trans; i++) {
+ 		enable_char = branch_char = ' ';
+-		if (!(rule = apol_vector_get_element(v, i)))
++		if (!(filename_trans = apol_vector_get_element(v, i)))
+ 			goto cleanup;
+ 
+-		if (!(rule_str = apol_filename_trans_render(policy, rule)))
++		if (!(filename_trans_str = apol_filename_trans_render(policy, filename_trans)))
+ 			goto cleanup;
+-		fprintf(stdout, "%s %s\n", rule_str, expr ? expr : "");
+-		free(rule_str);
+-		rule_str = NULL;
++		fprintf(stdout, "%s %s\n", filename_trans_str, expr ? expr : "");
++		free(filename_trans_str);
++		filename_trans_str = NULL;
+ 		free(expr);
+ 		expr = NULL;
+ 	}
+ 
+       cleanup:
+ 	free(tmp);
+-	free(rule_str);
++	free(filename_trans_str);
+ 	free(expr);
+ }
+ 
+@@ -930,7 +962,7 @@ int main(int argc, char **argv)
+ 
+ 	memset(&cmd_opts, 0, sizeof(cmd_opts));
+ 	cmd_opts.indirect = true;
+-	while ((optc = getopt_long(argc, argv, "ATs:t:c:p:b:dRnSChV", longopts, NULL)) != -1) {
++	while ((optc = getopt_long(argc, argv, "ATs:t:c:p:b:dD:RnSChV", longopts, NULL)) != -1) {
+ 		switch (optc) {
+ 		case 0:
+ 			break;
+@@ -946,6 +978,18 @@ int main(int argc, char **argv)
+ 				exit(1);
+ 			}
+ 			break;
++		case 'D':	       /* source */
++			if (optarg == 0) {
++				usage(argv[0], 1);
++				printf("Missing source default type for -D (--default)\n");
++				exit(1);
++			}
++			cmd_opts.default_name = strdup(optarg);
++			if (!cmd_opts.default_name) {
++		
++				exit(1);
++			}
++			break;
+ 		case 't':	       /* target */
+ 			if (optarg == 0) {
+ 				usage(argv[0], 1);
+@@ -1218,7 +1262,7 @@ int main(int argc, char **argv)
+ 		fprintf(stdout, "\n");
+ 	}
+ 
+-	if (cmd_opts.all || cmd_opts.type == QPOL_RULE_TYPE_TRANS) {
++	if (cmd_opts.all || cmd_opts.type) {
+ 		apol_vector_destroy(&v);
+ 		if (perform_ft_query(policy, &cmd_opts, &v)) {
+ 			rt = 1;
+-- 
+1.7.6.2
+

0008-Fix-output-to-match-policy-lines.patch

@@ -0,0 +1,34 @@
+From 2f89d9acc12c0a7b50a94e4247b015242ce712c9 Mon Sep 17 00:00:00 2001
+From: Dan Walsh <dwalsh@redhat.com>
+Date: Wed, 21 Sep 2011 15:15:02 -0400
+Subject: [PATCH 8/8] Fix output to match policy lines
+
+---
+ libapol/src/ftrule-query.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libapol/src/ftrule-query.c b/libapol/src/ftrule-query.c
+index 9c7a23b..1d5f5c8 100644
+--- a/libapol/src/ftrule-query.c
++++ b/libapol/src/ftrule-query.c
+@@ -282,7 +282,7 @@ char *apol_filename_trans_render(const apol_policy_t * policy, const qpol_filena
+ 		error = errno;
+ 		goto err;
+ 	}
+-	if (apol_str_appendf(&tmp, &tmp_sz, "transition_type %s ", tmp_name)) {
++	if (apol_str_appendf(&tmp, &tmp_sz, "type_transition %s ", tmp_name)) {
+ 		error = errno;
+ 		ERR(policy, "%s", strerror(error));
+ 		goto err;
+@@ -338,7 +338,7 @@ char *apol_filename_trans_render(const apol_policy_t * policy, const qpol_filena
+ 		goto err;
+ 	}
+ 
+-	if (apol_str_appendf(&tmp, &tmp_sz, " %s", tmp_name)) {
++	if (apol_str_appendf(&tmp, &tmp_sz, " \"%s\"", tmp_name)) {
+ 		error = errno;
+ 		ERR(policy, "%s", strerror(error));
+ 		goto err;
+-- 
+1.7.6.2
+

156.patch

@@ -1,43 +0,0 @@
-From 39f7c88251925463c38f5000f6178fe70b484f44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 8 Apr 2025 11:22:47 +0200
-Subject: [PATCH] Remove redundant runtime requirement on setuptools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The dependency was dropped in 99a1cf3b50cd8bf502b5070293c4d1bf792d1566
-
-Add a build time dependency for setup.py build_ext on Python 3.12+
-which no longer contains distutils.
-
-Signed-off-by: Miro Hrončok <miro@hroncok.cz>
----
- pyproject.toml | 2 +-
- tox.ini        | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index f7815a15..28ae121a 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -39,7 +39,7 @@ classifiers = ["Development Status :: 5 - Production/Stable",
- 
- requires-python=">=3.10"
- # also requires libsepol.so and libselinux.so.
--dependencies = ["setuptools"]
-+dependencies = []
- 
- optional-dependencies.analysis = ["networkx>=2.6",
-                                   "pygraphviz"]
-diff --git a/tox.ini b/tox.ini
-index 8fa6954f..b2a21d6b 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -56,5 +56,6 @@ deps            = networkx>=2.6
-                   pygraphviz
-                   pytest-qt
-                   pytest-xvfb
-+                  setuptools;python_version>="3.12"
- commands_pre    = {envpython} setup.py build_ext -i
- commands        = {envpython} -m pytest tests

157.patch

@@ -1,42 +0,0 @@
-From a33a2e394435316f3822e89ac9c2a9aabab17252 Mon Sep 17 00:00:00 2001
-From: Pranav Lawate <pran.lawate@gmail.com>
-Date: Tue, 30 Sep 2025 22:29:10 +0530
-Subject: [PATCH] Fix seinfo argument parsing when policy path follows query
- options
-
-Signed-off-by: Pranav Lawate <pran.lawate@gmail.com>
----
- seinfo | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/seinfo b/seinfo
-index 99180c36..d04ec320 100755
---- a/seinfo
-+++ b/seinfo
-@@ -12,6 +12,7 @@ import logging
- import signal
- import ipaddress
- import warnings
-+from pathlib import Path
- from typing import Callable, List, Tuple
- 
- 
-@@ -102,6 +103,18 @@ xen.add_argument("--devicetreecon", help="Print all devicetreecon statements.",
- 
- args = parser.parse_args()
- 
-+# Fix argument misparsing: when policy is None and a query option is a string,
-+# check if the string is actually a policy file that is incorrectly consumed by the query option
-+if not args.policy:
-+    # Check all query options defined in the queries argument group
-+    for action in queries._group_actions:
-+        value = getattr(args, action.dest, None)
-+        if isinstance(value, str) and Path(value).exists():
-+            # This query argument consumed the policy path - fix it
-+            args.policy = value
-+            setattr(args, action.dest, True)
-+            break
-+
- if args.debug:
-     logging.basicConfig(level=logging.DEBUG,
-                         format='%(asctime)s|%(levelname)s|%(name)s|%(message)s')

apol.desktop

@@ -2,10 +2,11 @@
 Name=SELinux Policy Analysis
 GenericName=SELinux Policy Analysis Tool 
 Comment=This tool can examine, search, and relate policy components and policy rules 
-Icon=apol
+Icon=apol.png
 Exec=/usr/bin/apol
 Type=Application
 Terminal=false
+Encoding=UTF-8
 Categories=System;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true

gating.yaml

@@ -1,16 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-

plans/selinux.fmf

@@ -1,7 +0,0 @@
-summary: selinux tests - Tier 1 | policycoreutils | checkpolicy
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/selinux
-    filter: "tier: 1 | component: policycoreutils | component: checkpolicy"
-execute:
-    how: tmt

plans/tests.fmf

@@ -1,5 +0,0 @@
-summary: setools test plan
-discover:
-    how: fmf
-execute:
-    how: tmt

rpminspect.yaml

@@ -1,3 +0,0 @@
-emptyrpm:
-    expected_empty:
-        - setools

seaudit.desktop

@@ -6,6 +6,7 @@ Icon=seaudit.png
 Exec=/usr/bin/seaudit
 Type=Application
 Terminal=false
+Encoding=UTF-8
 Categories=System;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true

sediffx.desktop

@@ -5,6 +5,7 @@ Comment=This tool allows you to compare two policy files
 Exec=/usr/bin/sediffx
 Type=Application
 Terminal=false
+Encoding=UTF-8
 Categories=System;
 X-Desktop-File-Install-Version=0.2
 StartupNotify=true

setools-cmdline.patch

@@ -0,0 +1,59 @@
+diff -up setools-3.3.7/man/replcon.1.cmdline setools-3.3.7/man/replcon.1
+--- setools-3.3.7/man/replcon.1.cmdline	2007-08-02 17:16:33.000000000 -0400
++++ setools-3.3.7/man/replcon.1	2010-11-17 16:31:01.000000000 -0500
+@@ -44,6 +44,8 @@ Search for files which include PATH.
+ .IP "-c CLASS, --class=CLASS"
+ Search only files of object class CLASS.
+ .SH OPTIONS
++.IP "-R, --regex"
++Enable regular expressions
+ .IP "-v, --verbose"
+ Display context info during replacement.
+ .IP "-h, --help"
+diff -up setools-3.3.7/man/seinfo.1.cmdline setools-3.3.7/man/seinfo.1
+--- setools-3.3.7/man/seinfo.1.cmdline	2010-05-03 12:39:02.000000000 -0400
++++ setools-3.3.7/man/seinfo.1	2010-11-17 16:23:36.000000000 -0500
+@@ -76,6 +76,10 @@ There is no expanded information for thi
+ .IP "--nodecon[=ADDR]"
+ Print a list of node contexts or, if ADDR is provided, print the statement for the node with address ADDR.
+ There is no expanded information for this component.
++.IP "--polcap"
++Print policy capabilities.
++.IP "--permissive"
++Print permissive types.
+ .IP "--portcon[=PORT]"
+ Print a list of port contexts or, if PORT is provided, print the statement for port PORT.
+ There is no expanded information for this component.
+@@ -93,7 +97,7 @@ These details include the types assigned
+ This option is not available for all component types; see the description of each component for the details this option will provide.
+ .IP "--stats"
+ Print policy statistics including policy type and version information and counts of all components and rules.
+-.IP "-l"
++.IP "-l, --line-breaks"
+ Print line breaks when displaying constraint statements.
+ .IP "-h, --help"
+ Print help information and exit.
+diff -up setools-3.3.7/seaudit/seaudit-report.c.cmdline setools-3.3.7/seaudit/seaudit-report.c
+--- setools-3.3.7/seaudit/seaudit-report.c.cmdline	2010-11-17 16:09:48.000000000 -0500
++++ setools-3.3.7/seaudit/seaudit-report.c	2010-11-17 16:11:06.000000000 -0500
+@@ -100,7 +100,7 @@ static void seaudit_report_info_usage(co
+ 	printf("  -s, --stdin              read log data from standard input\n");
+ 	printf("  -m, --malformed          include malformed log messages\n");
+ 	printf("  -o FILE, --output=FILE   output to FILE\n");
+-	printf("  --config=FILE            read configuration from FILE\n");
++	printf("  -c FILE, --config=FILE   read configuration from FILE\n");
+ 	printf("  --html                   set output format to HTML\n");
+ 	printf("  --stylesheet=FILE        HTML style sheet for formatting HTML report\n");
+ 	printf("                           (ignored if --html is not given)\n");
+diff -up setools-3.3.7/sediff/sediff.c.cmdline setools-3.3.7/sediff/sediff.c
+--- setools-3.3.7/sediff/sediff.c.cmdline	2007-08-02 17:16:33.000000000 -0400
++++ setools-3.3.7/sediff/sediff.c	2010-11-17 16:20:01.000000000 -0500
+@@ -420,7 +420,7 @@ int main(int argc, char **argv)
+ 	poldiff_t *diff = NULL;
+ 	size_t total = 0;
+ 
+-	while ((optc = getopt_long(argc, argv, "ctarubANDLMCRqhV", longopts, NULL)) != -1) {
++	while ((optc = getopt_long(argc, argv, "ctarubAqhV", longopts, NULL)) != -1) {
+ 		switch (optc) {
+ 		case 0:
+ 			break;

setools-exitstatus.patch

@@ -0,0 +1,119 @@
+diff -up setools-3.3.7/secmds/seinfo.c.exitstatus setools-3.3.7/secmds/seinfo.c
+--- setools-3.3.7/secmds/seinfo.c.exitstatus	2010-05-03 12:39:02.000000000 -0400
++++ setools-3.3.7/secmds/seinfo.c	2010-11-05 09:54:39.000000000 -0400
+@@ -827,7 +827,7 @@ static int print_sens(FILE * fp, const c
+  */
+ static int print_cats(FILE * fp, const char *name, int expand, const apol_policy_t * policydb)
+ {
+-	int retval = 0;
++	int retval = -1;
+ 	apol_cat_query_t *query = NULL;
+ 	apol_vector_t *v = NULL;
+ 	const qpol_cat_t *cat_datum = NULL;
+@@ -911,9 +911,10 @@ static int print_fsuse(FILE * fp, const 
+ 		fprintf(fp, "   %s\n", tmp);
+ 		free(tmp);
+ 	}
+-	if (type && !apol_vector_get_size(v))
++	if (type && !apol_vector_get_size(v)) {
+ 		ERR(policydb, "No fs_use statement for filesystem of type %s.", type);
+-
++		goto cleanup;
++	}
+ 	retval = 0;
+       cleanup:
+ 	apol_fs_use_query_destroy(&query);
+@@ -949,7 +950,6 @@ static int print_genfscon(FILE * fp, con
+ 		ERR(policydb, "%s", strerror(ENOMEM));
+ 		goto cleanup;
+ 	}
+-
+ 	if (apol_genfscon_query_set_filesystem(policydb, query, type))
+ 		goto cleanup;
+ 	if (apol_genfscon_get_by_query(policydb, query, &v))
+@@ -967,8 +967,10 @@ static int print_genfscon(FILE * fp, con
+ 		free(tmp);
+ 	}
+ 
+-	if (type && !apol_vector_get_size(v))
++	if (type && !apol_vector_get_size(v)) {
+ 		ERR(policydb, "No genfscon statement for filesystem of type %s.", type);
++		goto cleanup;
++	}
+ 
+ 	retval = 0;
+       cleanup:
+@@ -1646,6 +1648,7 @@ cleanup:	// close and destroy iterators 
+ 
+ int main(int argc, char **argv)
+ {
++	int rc = 0;
+ 	int classes, types, attribs, roles, users, all, expand, stats, rt, optc, isids, bools, sens, cats, fsuse, genfs, netif,
+ 		node, port, permissives, polcaps, constrain, linebreaks;
+ 	apol_policy_t *policydb = NULL;
+@@ -1851,46 +1854,46 @@ int main(int argc, char **argv)
+ 
+ 	/* display requested info */
+ 	if (stats || all)
+-		print_stats(stdout, policydb);
++		rc = print_stats(stdout, policydb);
+ 	if (classes || all)
+-		print_classes(stdout, class_name, expand, policydb);
++		rc = print_classes(stdout, class_name, expand, policydb);
+ 	if (types || all)
+-		print_types(stdout, type_name, expand, policydb);
++		rc = print_types(stdout, type_name, expand, policydb);
+ 	if (attribs || all)
+-		print_attribs(stdout, attrib_name, expand, policydb);
++		rc = print_attribs(stdout, attrib_name, expand, policydb);
+ 	if (roles || all)
+-		print_roles(stdout, role_name, expand, policydb);
++		rc = print_roles(stdout, role_name, expand, policydb);
+ 	if (users || all)
+-		print_users(stdout, user_name, expand, policydb);
++		rc = print_users(stdout, user_name, expand, policydb);
+ 	if (bools || all)
+-		print_booleans(stdout, bool_name, expand, policydb);
++		rc = print_booleans(stdout, bool_name, expand, policydb);
+ 	if (sens || all)
+-		print_sens(stdout, sens_name, expand, policydb);
++		rc = print_sens(stdout, sens_name, expand, policydb);
+ 	if (cats || all)
+-		print_cats(stdout, cat_name, expand, policydb);
++		rc = print_cats(stdout, cat_name, expand, policydb);
+ 	if (fsuse || all)
+-		print_fsuse(stdout, fsuse_type, policydb);
++		rc = print_fsuse(stdout, fsuse_type, policydb);
+ 	if (genfs || all)
+-		print_genfscon(stdout, genfs_type, policydb);
++		rc = print_genfscon(stdout, genfs_type, policydb);
+ 	if (netif || all)
+-		print_netifcon(stdout, netif_name, policydb);
++		rc = print_netifcon(stdout, netif_name, policydb);
+ 	if (node || all)
+-		print_nodecon(stdout, node_addr, policydb);
++		rc = print_nodecon(stdout, node_addr, policydb);
+ 	if (port || all)
+-		print_portcon(stdout, port_num, protocol, policydb);
++		rc = print_portcon(stdout, port_num, protocol, policydb);
+ 	if (isids || all)
+-		print_isids(stdout, isid_name, expand, policydb);
++		rc = print_isids(stdout, isid_name, expand, policydb);
+ 	if (permissives || all)
+-		print_permissives(stdout, permissive_name, expand, policydb);
++		rc = print_permissives(stdout, permissive_name, expand, policydb);
+ 	if (polcaps || all)
+-		print_polcaps(stdout, polcap_name, expand, policydb);
++		rc = print_polcaps(stdout, polcap_name, expand, policydb);
+ 	if (constrain || all)
+-		print_constraints(stdout, expand, policydb, linebreaks);
++		rc = print_constraints(stdout, expand, policydb, linebreaks);
+ 
+ 	apol_policy_destroy(&policydb);
+ 	apol_policy_path_destroy(&pol_path);
+ 	free(policy_file);
+-	exit(0);
++	exit(rc);
+ }
+ 
+ /**

setools-neverallow.patch

@@ -0,0 +1,15 @@
+diff -up setools-3.3.7/libqpol/src/avrule_query.c~ setools-3.3.7/libqpol/src/avrule_query.c
+--- setools-3.3.7/libqpol/src/avrule_query.c~	2010-04-23 12:22:08.000000000 -0400
++++ setools-3.3.7/libqpol/src/avrule_query.c	2011-01-06 10:42:50.000000000 -0500
+@@ -57,8 +57,9 @@ int qpol_policy_get_avrule_iter(const qp
+ 
+ 	if ((rule_type_mask & QPOL_RULE_NEVERALLOW) && !qpol_policy_has_capability(policy, QPOL_CAP_NEVERALLOW)) {
+ 		ERR(policy, "%s", "Cannot get avrules: Neverallow rules requested but not available");
+-		errno = ENOTSUP;
+-		return STATUS_ERR;
++/*		errno = ENOTSUP;
++		return STATUS_ERR; */
++		return STATUS_SUCCESS;
+ 	}
+ 
+ 	db = &policy->p->p;

sources

@@ -1 +1 @@
-SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5
+206d1b31d1dda4ace2fbf6ce02d13814  setools-3.3.7.tar.bz2

tests/Regression/The-setools-package-doesn-t-install-any-tools/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
-#   Description: Make sure setools requires setools-console and setools-gui
-#   Author: Vit Mojzis <vmojzis@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Vit Mojzis <vmojzis@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Make sure setools requires setools-console and setools-gui" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          setools" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1820078" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/Regression/The-setools-package-doesn-t-install-any-tools/main.fmf

@@ -1,11 +0,0 @@
-summary: Make sure setools requires setools-console and setools-gui
-contact: Vit Mojzis <vmojzis@redhat.com>
-component:
-  - setools
-test: ./runtest.sh
-framework: beakerlib
-duration: 5m
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1820078
-extra-summary: /CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools
-extra-task: /CoreOS/setools/Regression/The-setools-package-doesn-t-install-any-tools

tests/Regression/The-setools-package-doesn-t-install-any-tools/runtest.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/setools/Regression/bz1820078-The-setools-package-doesn-t-install-any-tools
-#   Description: Make sure setools requires setools-console and setools-gui
-#   Author: Vit Mojzis <vmojzis@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="setools"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "dnf -y remove ${PACKAGE} ${PACKAGE}-gui ${PACKAGE}-console"
-        OUTPUT_FILE=`mktemp`
-    rlPhaseEnd
-
-    rlPhaseStartTest "bz#1820078"
-        rlRun "dnf -y install ${PACKAGE}" 0
-        rlAssertRpm "${PACKAGE}-gui"
-        rlAssertRpm "${PACKAGE}-console"
-        # make sure that setools-* packages do not require setools
-        rlRun "rpm -q --whatrequires ${PACKAGE} >& ${OUTPUT_FILE}" 0,1
-        rlRun "grep -i \"${PACKAGE}-\" ${OUTPUT_FILE}" 1
-        if [ $? -ne 1 ]; then rlRun "cat \"${OUTPUT_FILE}\""; fi
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/Sanity/sedta/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/setools/Sanity/sedta
-#   Description: Does sedta work as expected? Does it support all features?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/setools/Sanity/sedta
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE testpolicy.cil
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Does sedta work as expected? Does it support all features?" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        1h" >> $(METADATA)
-	@echo "RunFor:          setools" >> $(METADATA)
-	@echo "Requires:        policycoreutils setools-console-analyses" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHEL6 -RHEL7 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/Sanity/sedta/PURPOSE

@@ -1,3 +0,0 @@
-PURPOSE of /CoreOS/setools/Sanity/sedta
-Description: Does sedta work as expected? Does it support all features?
-Author: Milos Malik <mmalik@redhat.com>

tests/Sanity/sedta/main.fmf

@@ -1,30 +0,0 @@
-summary: Does sedta work as expected? Does it support all features?
-description: ''
-contact: Milos Malik <mmalik@redhat.com>
-component:
-  - setools
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - git
-  - policycoreutils
-  - setools-console-analyses
-duration: 1h
-enabled: true
-tag:
-  - CI-Tier-1
-  - NoRHEL4
-  - NoRHEL5
-  - NoRHEL6
-  - NoRHEL7
-  - TIPfail_Security
-  - f32friendly
-  - f33friendly
-  - targeted
-adjust:
-  - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
-    continue: false
-extra-nitrate: TC#0604139
-extra-summary: /CoreOS/setools/Sanity/sedta
-extra-task: /CoreOS/setools/Sanity/sedta

tests/Sanity/sedta/runtest.sh

@@ -1,87 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/setools/Sanity/sedta
-#   Description: Does sedta work as expected? Does it support all features?
-#   Author: Milos Malik <mmalik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="setools"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm ${PACKAGE}-console-analyses
-        OUTPUT_FILE=`mktemp`
-        rlRun "semodule -i testpolicy.cil"
-        rlRun "semodule -l | grep testpolicy"
-    rlPhaseEnd
-
-    rlPhaseStartTest "invalid values"
-        rlRun "sedta -s unknown_t >& ${OUTPUT_FILE}" 1
-        rlRun "grep -i 'not a valid type' ${OUTPUT_FILE}"
-        rlRun "sedta -s apmd_t -t unknown_t -S >& ${OUTPUT_FILE}" 1
-        rlRun "grep -i 'not a valid type' ${OUTPUT_FILE}"
-        rlRun "sedta -s unknown_t -p /etc/selinux/unknown/policy/policy.31 >& ${OUTPUT_FILE}" 1
-        rlRun "grep -i 'no such file or directory' ${OUTPUT_FILE}"
-        rlRun "sedta -s apmd_t -t var_lib_t -A -1 >& ${OUTPUT_FILE}" 1
-        rlRun "grep -i 'must be positive' ${OUTPUT_FILE}"
-        rlRun "sedta -s xyz_t >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^0.*transition.*found' ${OUTPUT_FILE}"
-    rlPhaseEnd
-
-    rlPhaseStartTest "valid values"
-        # transitivity
-        rlRun "sedta -s first_t -t second_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
-        rlRun "sedta -s second_t -t third_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
-        rlRun "sedta -s first_t -t third_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
-        # reflexivity
-        rlRun "sedta -s first_t -t first_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
-        rlRun "sedta -s second_t -t second_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
-        rlRun "sedta -s third_t -t third_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
-        # path is longer than limit
-        rlRun "sedta -s first_t -t third_t -A 1 >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^0 domain transition path.*found' ${OUTPUT_FILE}"
-        # non-existent relation
-        rlRun "sedta -s first_t -t third_t -S -r >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^0 domain transition path.*found' ${OUTPUT_FILE}"
-        # non-existent relation
-        rlRun "sedta -s third_t -t first_t -S >& ${OUTPUT_FILE}"
-        rlRun "grep -i '^0 domain transition path.*found' ${OUTPUT_FILE}"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "semodule -r testpolicy"
-        rlRun "semodule -l | grep testpolicy" 1
-        rm -f ${OUTPUT_FILE}
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-

tests/Sanity/sedta/testpolicy.cil

@@ -1,21 +0,0 @@
-( type xyz_t )
-
-( type first_t )
-( type first_exec_t )
-( type second_t )
-( type second_exec_t )
-( type third_t )
-( type third_exec_t )
-
-( typetransition first_t second_exec_t process second_t )
-( typetransition second_t third_exec_t process third_t )
-
-( allow first_t second_exec_t ( file ( getattr open read execute )))
-( allow first_t second_t ( process ( transition )))
-( allow second_t third_exec_t ( file ( getattr open read execute )))
-( allow second_t third_t ( process ( transition )))
-
-( allow first_t first_exec_t ( file ( entrypoint )))
-( allow second_t second_exec_t ( file ( entrypoint )))
-( allow third_t third_exec_t ( file ( entrypoint )))
-

tests/Sanity/seinfo-consistent-output/Makefile

@@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of Sanity/seinfo-consistent-output
-#   Description: Check whether different 2 or more runs of same seinfo commands produce same output
-#   Author: Petr Lautrbach <plautrba@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=Sanity/seinfo-consistent-output
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Petr Lautrbach <plautrba@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Check whether different 2 or more runs of same seinfo commands produce same output" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          setools" >> $(METADATA)
-	@echo "Requires:        setools-console" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             2019962" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/Sanity/seinfo-consistent-output/PURPOSE

@@ -1,3 +0,0 @@
-PURPOSE of Sanity/seinfo-consistent-output
-Description: Check whether different 2 or more runs of same seinfo commands produce same output
-Author: Petr Lautrbach <plautrba@redhat.com>

tests/Sanity/seinfo-consistent-output/main.fmf

@@ -1,15 +0,0 @@
-summary: Check whether different 2 or more runs of same seinfo commands produce same
-    output
-description: ''
-contact: Petr Lautrbach <plautrba@redhat.com>
-component:
-  - setools
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - setools-console
-duration: 5m
-link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2019962
-extra-summary: Sanity/seinfo-consistent-output
-extra-task: Sanity/seinfo-consistent-output

tests/Sanity/seinfo-consistent-output/runtest.sh

@@ -1,63 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of Sanity/seinfo-consistent-output
-#   Description: Check whether different 2 or more runs of same seinfo commands produce same output
-#   Author: Petr Lautrbach <plautrba@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="setools-console"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    commands=(
-        "seinfo --all -x"
-        "seinfo --constrain"
-        "seinfo --common"
-        "seinfo -c -x"
-        "seinfo -r -x"
-        "seinfo -u -x"
-    )
-
-    for c in "${commands[@]}"; do
-
-        rlPhaseStartTest "$c"
-            rlRun "$c > 1.out"
-            rlRun "$c > 2.out"
-            rlRun "cmp 1.out 2.out" 0
-        rlPhaseEnd
-    done
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd