diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2011-08-12 18:37:42 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2011-08-12 18:37:42 +0000 |
commit | 02d09e35abf24e431199c7a8c8013f7ceb2bdc80 (patch) | |
tree | bff8aed6d541b6e80f2794efac8e18c8c5bd98df /sys-libs | |
parent | Fix failed gpg signing of Manifest (diff) | |
download | gentoo-2-02d09e35abf24e431199c7a8c8013f7ceb2bdc80.tar.gz gentoo-2-02d09e35abf24e431199c7a8c8013f7ceb2bdc80.tar.bz2 gentoo-2-02d09e35abf24e431199c7a8c8013f7ceb2bdc80.zip |
Removed deprecated versions
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/libsepol/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff | 39 | ||||
-rw-r--r-- | sys-libs/libsepol/libsepol-2.0.32.ebuild | 44 | ||||
-rw-r--r-- | sys-libs/libsepol/libsepol-2.0.37.ebuild | 44 |
4 files changed, 5 insertions, 128 deletions
diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog index 37117f1c5756..6c0325f46d87 100644 --- a/sys-libs/libsepol/ChangeLog +++ b/sys-libs/libsepol/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libsepol # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.42 2011/08/03 09:27:32 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.43 2011/08/12 18:37:42 blueness Exp $ + + 12 Aug 2011; Anthony G. Basile <blueness@gentoo.org> -libsepol-2.0.32.ebuild, + -files/libsepol-2.0.32-expand_rule.diff, -libsepol-2.0.37.ebuild: + Removed deprecated versions *libsepol-2.1.0 (03 Aug 2011) diff --git a/sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff b/sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff deleted file mode 100644 index a9e1b77d1b19..000000000000 --- a/sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -purN libsepol-2.0.32.orig/src/expand.c libsepol-2.0.32/src/expand.c ---- libsepol-2.0.32.orig/src/expand.c 2008-08-26 09:40:22.000000000 -0400 -+++ libsepol-2.0.32/src/expand.c 2008-09-19 19:36:39.918510539 -0400 -@@ -1917,6 +1917,35 @@ int expand_convert_type_set(policydb_t * - return 0; - } - -+/* Expand a rule into a given avtab - checking for conflicting type -+ * rules. Return 1 on success, 0 if the rule conflicts with something -+ * (and hence was not added), or -1 on error. */ -+int expand_rule(sepol_handle_t * handle, -+ policydb_t * source_pol, -+ avrule_t * source_rule, avtab_t * dest_avtab, -+ cond_av_list_t ** cond, cond_av_list_t ** other, int enabled) -+{ -+ int retval; -+ ebitmap_t stypes, ttypes; -+ -+ if (source_rule->specified & AVRULE_NEVERALLOW) -+ return 1; -+ -+ ebitmap_init(&stypes); -+ ebitmap_init(&ttypes); -+ -+ if (type_set_expand(&source_rule->stypes, &stypes, source_pol, 1)) -+ return -1; -+ if (type_set_expand(&source_rule->ttypes, &ttypes, source_pol, 1)) -+ return -1; -+ retval = expand_rule_helper(handle, source_pol, NULL, -+ source_rule, dest_avtab, -+ cond, other, enabled, &stypes, &ttypes); -+ ebitmap_destroy(&stypes); -+ ebitmap_destroy(&ttypes); -+ return retval; -+} -+ - int role_set_expand(role_set_t * x, ebitmap_t * r, policydb_t * p, uint32_t * rolemap) - { - unsigned int i; diff --git a/sys-libs/libsepol/libsepol-2.0.32.ebuild b/sys-libs/libsepol/libsepol-2.0.32.ebuild deleted file mode 100644 index b0bea31946f7..000000000000 --- a/sys-libs/libsepol/libsepol-2.0.32.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.0.32.ebuild,v 1.4 2011/05/28 06:07:19 blueness Exp $ - -IUSE="" - -inherit multilib eutils - -BUGFIX_PATCH="${FILESDIR}/libsepol-2.0.32-expand_rule.diff" - -DESCRIPTION="SELinux binary policy representation library" -HOMEPAGE="http://userspace.selinuxproject.org" -SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="" -RDEPEND="" - -# tests are not meant to be run outside of the -# full SELinux userland repo -RESTRICT="test" - -src_unpack() { - unpack ${A} - cd "${S}" - - [ ! -z "$BUGFIX_PATCH" ] && epatch "${BUGFIX_PATCH}" - - # fix up paths for multilib - sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \ - || die "Fix for multilib LIBDIR failed." - sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \ - || die "Fix for multilib SHLIBDIR failed." -} - -src_compile() { - emake || die -} - -src_install() { - make DESTDIR="${D}" install -} diff --git a/sys-libs/libsepol/libsepol-2.0.37.ebuild b/sys-libs/libsepol/libsepol-2.0.37.ebuild deleted file mode 100644 index c5a95a9a5bc3..000000000000 --- a/sys-libs/libsepol/libsepol-2.0.37.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.0.37.ebuild,v 1.3 2011/05/28 06:07:19 blueness Exp $ - -IUSE="" - -inherit multilib eutils - -#BUGFIX_PATCH="${FILESDIR}/libsepol-2.0.32-expand_rule.diff" - -DESCRIPTION="SELinux binary policy representation library" -HOMEPAGE="http://userspace.selinuxproject.org" -SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="" -RDEPEND="" - -# tests are not meant to be run outside of the -# full SELinux userland repo -RESTRICT="test" - -src_unpack() { - unpack ${A} - cd "${S}" - - [ ! -z "$BUGFIX_PATCH" ] && epatch "${BUGFIX_PATCH}" - - # fix up paths for multilib - sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \ - || die "Fix for multilib LIBDIR failed." - sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \ - || die "Fix for multilib SHLIBDIR failed." -} - -src_compile() { - emake || die -} - -src_install() { - make DESTDIR="${D}" install -} |