summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetre Rodan <kaiowas@gentoo.org>2005-04-23 18:24:29 +0000
committerPetre Rodan <kaiowas@gentoo.org>2005-04-23 18:24:29 +0000
commitf41414ac2f58484e92ea114d288263afe6ece87e (patch)
tree4201bfbc51300c8cabff8462f984f15dc4935ca9
parentadded ~amd64 and ~ppc KEYWORDS (diff)
downloadgentoo-2-f41414ac2f58484e92ea114d288263afe6ece87e.tar.gz
gentoo-2-f41414ac2f58484e92ea114d288263afe6ece87e.tar.bz2
gentoo-2-f41414ac2f58484e92ea114d288263afe6ece87e.zip
merge with upstream
(Portage version: 2.0.51.19)
-rw-r--r--sec-policy/selinux-lvm/ChangeLog8
-rw-r--r--sec-policy/selinux-lvm/Manifest14
-rw-r--r--sec-policy/selinux-lvm/files/digest-selinux-lvm-200501301
-rw-r--r--sec-policy/selinux-lvm/files/digest-selinux-lvm-200504081
-rw-r--r--sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild (renamed from sec-policy/selinux-lvm/selinux-lvm-20050130.ebuild)2
5 files changed, 11 insertions, 15 deletions
diff --git a/sec-policy/selinux-lvm/ChangeLog b/sec-policy/selinux-lvm/ChangeLog
index c61f61bb0c7c..85dcbfd1499f 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.1 2005/02/25 11:31:32 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.2 2005/04/23 18:24:29 kaiowas Exp $
+
+*selinux-lvm-20050408 (23 Apr 2005)
+
+ 23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+ -selinux-lvm-20050130.ebuild, +selinux-lvm-20050408.ebuild:
+ tiny merge, no semantic diffs
*selinux-lvm-20050130 (25 Feb 2005)
diff --git a/sec-policy/selinux-lvm/Manifest b/sec-policy/selinux-lvm/Manifest
index 584bfbc089a1..77c1ae84d433 100644
--- a/sec-policy/selinux-lvm/Manifest
+++ b/sec-policy/selinux-lvm/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 d9a7166b6246a5bc3b22f60d2344d7ea ChangeLog 368
MD5 8a0bd1d41f0f9ff329ff416a18649ef8 metadata.xml 528
-MD5 717744e4843a561f9e3d436c191dac41 selinux-lvm-20050130.ebuild 397
-MD5 f4c19622ce3536adfaf5fde662bd4b75 files/digest-selinux-lvm-20050130 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCHwhwGSBEIeh4AEYRAroBAJ4/7T3ubg8za7v9JgSMAxzEvDAyFwCdFmkC
-EP5SwxTtjyqTqxgI0y6XDME=
-=5LIB
------END PGP SIGNATURE-----
+MD5 1dd8cd5ce657b0af6806d38ac1c9f378 selinux-lvm-20050408.ebuild 288
+MD5 03f0bf8da829ffc334e08f8ad4683826 files/digest-selinux-lvm-20050408 71
diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050130 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050130
deleted file mode 100644
index 6e181f70683b..000000000000
--- a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050130
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc5701baceef946311eb6dc90ce44e2a selinux-lvm-20050130.tar.bz2 2239
diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408
new file mode 100644
index 000000000000..cde0eaeee217
--- /dev/null
+++ b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050408
@@ -0,0 +1 @@
+MD5 7caf4268bb16f2e1c1d7e9b57145eb5e selinux-lvm-20050408.tar.bz2 2241
diff --git a/sec-policy/selinux-lvm/selinux-lvm-20050130.ebuild b/sec-policy/selinux-lvm/selinux-lvm-20050408.ebuild
index 9c36bbc2b9bd..4773c3919beb 100644
--- a/sec-policy/selinux-lvm/selinux-lvm-20050130.ebuild
+++ b/sec-policy/selinux-lvm/selinux-lvm-20050408.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-20050130.ebuild,v 1.1 2005/02/25 11:31:32 kaiowas Exp $
+# $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