From 8788c543b0cd01a26b2af1d3def3e0c253da7d1c Mon Sep 17 00:00:00 2001 From: Petre Rodan Date: Sat, 7 May 2005 11:55:08 +0000 Subject: merge with upstream (Portage version: 2.0.51.21-r1) --- sec-policy/selinux-lvm/ChangeLog | 8 +++++++- sec-policy/selinux-lvm/Manifest | 12 ++---------- sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408 | 1 - sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507 | 1 + sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild | 14 -------------- sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild | 14 ++++++++++++++ 6 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408 create mode 100644 sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507 delete mode 100644 sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild create mode 100644 sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild (limited to 'sec-policy/selinux-lvm') diff --git a/sec-policy/selinux-lvm/ChangeLog b/sec-policy/selinux-lvm/ChangeLog index 85dcbfd1499f..20e221bf393c 100644 --- a/sec-policy/selinux-lvm/ChangeLog +++ b/sec-policy/selinux-lvm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-lvm # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.2 2005/04/23 18:24:29 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.3 2005/05/07 11:55:08 kaiowas Exp $ + +*selinux-lvm-20050507 (07 May 2005) + + 07 May 2005; petre rodan + -selinux-lvm-20050408.ebuild, +selinux-lvm-20050507.ebuild: + merge with upstream *selinux-lvm-20050408 (23 Apr 2005) diff --git a/sec-policy/selinux-lvm/Manifest b/sec-policy/selinux-lvm/Manifest index 05a4665e30cf..ff186913cb40 100644 --- a/sec-policy/selinux-lvm/Manifest +++ b/sec-policy/selinux-lvm/Manifest @@ -1,14 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 ada812baea39cc4e6212338a8f91f6f2 ChangeLog 548 MD5 8a0bd1d41f0f9ff329ff416a18649ef8 metadata.xml 528 +MD5 1dd8cd5ce657b0af6806d38ac1c9f378 selinux-lvm-20050507.ebuild 288 MD5 363134bfbb03cae21715e70d181f8ab8 selinux-lvm-20050408.ebuild 397 MD5 03f0bf8da829ffc334e08f8ad4683826 files/digest-selinux-lvm-20050408 71 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFCao0aGSBEIeh4AEYRAj8FAJ9ZvT4KXN3Psx4Z/NWNRLARjXvoZwCfQFTD -PG0LXKLtxggxFlyujZ/w+D8= -=RC3h ------END PGP SIGNATURE----- +MD5 abdfc499ebb564da45745497e0bfc11c files/digest-selinux-lvm-20050507 71 diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408 deleted file mode 100644 index cde0eaeee217..000000000000 --- a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408 +++ /dev/null @@ -1 +0,0 @@ -MD5 7caf4268bb16f2e1c1d7e9b57145eb5e selinux-lvm-20050408.tar.bz2 2241 diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507 new file mode 100644 index 000000000000..503ab4905b2a --- /dev/null +++ b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507 @@ -0,0 +1 @@ +MD5 12d5a1c17188aeac6b7957510057a0f9 selinux-lvm-20050507.tar.bz2 2256 diff --git a/sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild b/sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild deleted file mode 100644 index 4773c3919beb..000000000000 --- a/sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild,v 1.1 2005/04/23 18:24:29 kaiowas Exp $ - -inherit selinux-policy - -TEFILES="lvm.te" -FCFILES="lvm.fc" -IUSE="" - -DESCRIPTION="SELinux policy for Logical Volume Management" - -KEYWORDS="~x86 ~ppc ~sparc ~amd64" - diff --git a/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild b/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild new file mode 100644 index 000000000000..b688aad5a8f4 --- /dev/null +++ b/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild,v 1.1 2005/05/07 11:55:08 kaiowas Exp $ + +inherit selinux-policy + +TEFILES="lvm.te" +FCFILES="lvm.fc" +IUSE="" + +DESCRIPTION="SELinux policy for Logical Volume Management" + +KEYWORDS="~x86 ~ppc ~sparc ~amd64" + -- cgit v1.2.3-65-gdbad