From 6d636a126af5a0196e0e0377682bfc54c1fcf4e9 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Fri, 12 Aug 2011 18:37:42 +0000 Subject: [PATCH] Removed deprecated versions Package-Manager: portage-2.1.10.3/cvs/Linux x86_64 --- sys-libs/libsepol/ChangeLog | 6 ++- sys-libs/libsepol/Manifest | 13 ++---- .../files/libsepol-2.0.32-expand_rule.diff | 39 ---------------- sys-libs/libsepol/libsepol-2.0.32.ebuild | 44 ------------------- sys-libs/libsepol/libsepol-2.0.37.ebuild | 44 ------------------- 5 files changed, 9 insertions(+), 137 deletions(-) delete mode 100644 sys-libs/libsepol/files/libsepol-2.0.32-expand_rule.diff delete mode 100644 sys-libs/libsepol/libsepol-2.0.32.ebuild delete mode 100644 sys-libs/libsepol/libsepol-2.0.37.ebuild 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 -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/Manifest b/sys-libs/libsepol/Manifest index 74fcc277ee22..ce890adbb142 100644 --- a/sys-libs/libsepol/Manifest +++ b/sys-libs/libsepol/Manifest @@ -1,23 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libsepol-2.0.32-expand_rule.diff 1330 RMD160 751ee7e7bbb38a2e9b0773fe6e6d858590116e7a SHA1 3fd8b0f339fb90e4f00d2088a0fe252b764a41ac SHA256 2a7577eed0c2ba87936f8851d70b020f0ad0d16c5c66717ce2ec8cde7c2ba56d -DIST libsepol-2.0.32.tar.gz 189663 RMD160 7baf263024446f608eecd1ecc4d8106e01765688 SHA1 482b13b721da2954ffeef9f8ed3b2e4ea1953cad SHA256 ed6ca0e33b14fc5ffbf4aa5515131625248f307e7fc837b1e4fb9c717e6b8672 -DIST libsepol-2.0.37.tar.gz 192872 RMD160 74b2c0224050ec348019437fa6ba3b0064e44837 SHA1 839e0f1c71bac85d6435de8230ced3b8780ee954 SHA256 106859378bb23298705ee7c664b50d941e92c01696af6dd3b3b05843ba5e2fa4 DIST libsepol-2.0.41.tar.gz 194700 RMD160 ca93bb9b05ec3e144dc1015dfc60fb52ff12d97e SHA1 0afe6285e93092f6ca1c62d60ca0748b97279845 SHA256 a84c2d50684b0c33e5499fa442c5eda1638ba509aede712b813c64b1134d41ce DIST libsepol-2.0.42.tar.gz 194808 RMD160 f60f4e614fe00067dd4e7911d69a7ce00bbefad0 SHA1 369a3d0b4cd0611724712bea04803071a89c0c37 SHA256 083097a12b090ecdf1485aff51c81e2248d3b835596945ef26d0439c560de669 DIST libsepol-2.1.0.tar.gz 198808 RMD160 f4290e6d872fc69d53e02b608a6d8056c3d1832f SHA1 1ab3d3dc35da87a96f767979ef3303943a18602e SHA256 67fda7fc0944410fb021e6dc565d88714a7ccd3be276149ce518ab6086f129fe -EBUILD libsepol-2.0.32.ebuild 1082 RMD160 f6cacf26d7c8ef3f25aa3e18492a2c526dc64b33 SHA1 573f5aae447c6df33fa2efdd8d8805fe666a2b38 SHA256 ee76e7e51712004a381efd681b0c3e8003acb617d8eedf53c48ed68e0c6ced69 -EBUILD libsepol-2.0.37.ebuild 1085 RMD160 abcf558a9f56461fe8b124cbd9d172c7082c8b1e SHA1 ab61eae841dfbae85370a740c9f6eb202ef52e0a SHA256 7865f4eac9fafb5d5198eb1de9ad56fc2c8177ca17308d76fee9544b2b4834d3 EBUILD libsepol-2.0.41.ebuild 1004 RMD160 ac43e5e4ca1ec3d3a85c749fe6440281ebbc19c6 SHA1 5d82fe06d528e49e2f60483385b40e4c65e41d67 SHA256 1bd8690f0a70b4b2e7d1f9512b85d97697df66bae9d565f577ccf17612dddcfc EBUILD libsepol-2.0.42.ebuild 1006 RMD160 78ed16a980ce1f4947bdf3b97101c87cfe8a1622 SHA1 d22aac4657c05fbfd6db213254c5231ac8cf99da SHA256 d02f39399d3c68071687e8a395c29eb722cb90fa5785605851407e784468073c EBUILD libsepol-2.1.0.ebuild 1005 RMD160 a6b21e59040ed9859cf175cf3eebc9027a668bf6 SHA1 2a11e4f18c42aa11782c35c30e2dc82e70c0e81c SHA256 2a5fc7b9b2f06996645871ef15fc7fa256bb4fcc4a4527d7d4eccb432441fd0b -MISC ChangeLog 5844 RMD160 47e5fb5aeb2de178b6a91b0023bed6b48e6bbfc3 SHA1 ab18306655c3ccb515d71051b49f191455732f39 SHA256 a8b9af5606ee62c3bbf42f3661793dc1f8aaa61e05dc4a748f267169a62af08b +MISC ChangeLog 6023 RMD160 f495d82e0110e50bf2f18320cd8618f20508fc4b SHA1 378f15082d994b76a745a0dd351af41d9d3ce1de SHA256 ab56536742ba4201fcf37d5559cd2befaae19f79fd4e5f0b84a7b77767e937fe MISC metadata.xml 255 RMD160 63b24fd464aad68d53e3cfcc78a1ef87d77e6cd3 SHA1 9963929c485768b00c0d6cbbaad2193aa3c31149 SHA256 34be115c595485e6f130e95be8e55b8cad13a3a80a04b538c42f3544ad0936c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk45FI4ACgkQl5yvQNBFVTUS1wCgneZlzIOIhayGe7rlYUNXlXbi -HAgAn0TI4cD1cC9qHunYJIvELAbk1Bh7 -=imPb +iEYEAREIAAYFAk5FcwEACgkQl5yvQNBFVTWdGgCfX7SMXEbC3MYC5Am/NFXq5JFg +pJsAoKd2QW+tccNWO1HRlT0f3h6w7cJk +=HZaI -----END PGP SIGNATURE----- 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 -} -- 2.26.2