summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2006-03-24 04:18:12 +0000
committerChris PeBenito <pebenito@gentoo.org>2006-03-24 04:18:12 +0000
commitc2572929edf0556513ee3b01678ca0c632ece434 (patch)
tree2987864d9d872a074154221b97155c84ee6f9cd2 /sys-apps/checkpolicy/files
parent(#127306) Digests changed between release candidates and final release for th... (diff)
downloadhistorical-c2572929edf0556513ee3b01678ca0c632ece434.tar.gz
historical-c2572929edf0556513ee3b01678ca0c632ece434.tar.bz2
historical-c2572929edf0556513ee3b01678ca0c632ece434.zip
Upstream bugfix for require blocks in base module.
Package-Manager: portage-2.1_pre6-r6
Diffstat (limited to 'sys-apps/checkpolicy/files')
-rw-r--r--sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff26
-rw-r--r--sys-apps/checkpolicy/files/digest-checkpolicy-1.30-r1 (renamed from sys-apps/checkpolicy/files/digest-checkpolicy-1.30)0
2 files changed, 26 insertions, 0 deletions
diff --git a/sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff b/sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff
new file mode 100644
index 000000000000..1ffbbdc2ab9e
--- /dev/null
+++ b/sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff
@@ -0,0 +1,26 @@
+Index: module_compiler.c
+===================================================================
+RCS file: /cvsroot/selinux/nsa/selinux-usr/checkpolicy/module_compiler.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- a/module_compiler.c 13 Feb 2006 15:12:06 -0000 1.13
++++ b/module_compiler.c 22 Mar 2006 20:51:23 -0000 1.14
+@@ -702,7 +702,7 @@
+ char *id = queue_remove(id_queue);
+ role_datum_t *role = NULL;
+ int retval;
+- if (pass == 2) {
++ if (pass == 1) {
+ free(id);
+ return 0;
+ }
+@@ -816,7 +816,7 @@
+ char *id = queue_remove(id_queue);
+ user_datum_t *user = NULL;
+ int retval;
+- if (pass == 2) {
++ if (pass == 1) {
+ free(id);
+ return 0;
+ }
diff --git a/sys-apps/checkpolicy/files/digest-checkpolicy-1.30 b/sys-apps/checkpolicy/files/digest-checkpolicy-1.30-r1
index 9da87ff542ff..9da87ff542ff 100644
--- a/sys-apps/checkpolicy/files/digest-checkpolicy-1.30
+++ b/sys-apps/checkpolicy/files/digest-checkpolicy-1.30-r1