diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2006-03-24 04:18:12 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2006-03-24 04:18:12 +0000 |
| commit | 5c05ba5ee4d79d899ade56b1df6b7840f4eea561 (patch) | |
| tree | a4bf817856c8d63e6aed2d304205646eeac38cb3 /sys-apps | |
| parent | (#127306) Digests changed between release candidates and final release for th... (diff) | |
| download | gentoo-2-5c05ba5ee4d79d899ade56b1df6b7840f4eea561.tar.gz gentoo-2-5c05ba5ee4d79d899ade56b1df6b7840f4eea561.tar.bz2 gentoo-2-5c05ba5ee4d79d899ade56b1df6b7840f4eea561.zip | |
Upstream bugfix for require blocks in base module.
(Portage version: 2.1_pre6-r6)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/checkpolicy/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild (renamed from sys-apps/checkpolicy/checkpolicy-1.30.ebuild) | 3 | ||||
| -rw-r--r-- | sys-apps/checkpolicy/files/checkpolicy-1.30.1.diff | 26 | ||||
| -rw-r--r-- | sys-apps/checkpolicy/files/digest-checkpolicy-1.30-r1 (renamed from sys-apps/checkpolicy/files/digest-checkpolicy-1.30) | 0 |
4 files changed, 36 insertions, 2 deletions
diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog index dd7c9837b2ea..16c5e3ea7d7b 100644 --- a/sys-apps/checkpolicy/ChangeLog +++ b/sys-apps/checkpolicy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/checkpolicy # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.38 2006/03/18 14:57:38 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.39 2006/03/24 04:18:12 pebenito Exp $ + +*checkpolicy-1.30-r1 (24 Mar 2006) + + 24 Mar 2006; Chris PeBenito <pebenito@gentoo.org> + +files/checkpolicy-1.30.1.diff, -checkpolicy-1.30.ebuild, + +checkpolicy-1.30-r1.ebuild: + Upstream bugfix for require blocks in base module. *checkpolicy-1.30 (18 Mar 2006) diff --git a/sys-apps/checkpolicy/checkpolicy-1.30.ebuild b/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild index d9e5310b6070..7017bfbd611a 100644 --- a/sys-apps/checkpolicy/checkpolicy-1.30.ebuild +++ b/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.30.ebuild,v 1.1 2006/03/18 14:57:38 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.30-r1.ebuild,v 1.1 2006/03/24 04:18:12 pebenito Exp $ IUSE="" @@ -22,6 +22,7 @@ DEPEND="=sys-libs/libsemanage-${SEMNG_VER}* src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/checkpolicy-1.30.1.diff } src_compile() { 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 |