summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetre Rodan <kaiowas@gentoo.org>2005-05-07 11:55:08 +0000
committerPetre Rodan <kaiowas@gentoo.org>2005-05-07 11:55:08 +0000
commit8788c543b0cd01a26b2af1d3def3e0c253da7d1c (patch)
treeac7b0d39f393dc941e6311cd8c9ed5ac8f3708df /sec-policy
parentStable on ppc (diff)
downloadgentoo-2-8788c543b0cd01a26b2af1d3def3e0c253da7d1c.tar.gz
gentoo-2-8788c543b0cd01a26b2af1d3def3e0c253da7d1c.tar.bz2
gentoo-2-8788c543b0cd01a26b2af1d3def3e0c253da7d1c.zip
merge with upstream
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'sec-policy')
-rw-r--r--sec-policy/selinux-lvm/ChangeLog8
-rw-r--r--sec-policy/selinux-lvm/Manifest12
-rw-r--r--sec-policy/selinux-lvm/files/digest-selinux-lvm-200504081
-rw-r--r--sec-policy/selinux-lvm/files/digest-selinux-lvm-200505071
-rw-r--r--sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild (renamed from sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild)2
5 files changed, 11 insertions, 13 deletions
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 <kaiowas@gentoo.org>
+ -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-20050507.ebuild
index 4773c3919beb..b688aad5a8f4 100644
--- a/sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild
+++ b/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $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