summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetre Rodan <kaiowas@gentoo.org>2005-06-26 17:14:42 +0000
committerPetre Rodan <kaiowas@gentoo.org>2005-06-26 17:14:42 +0000
commit70ef5f4e36b44705a770e708ea1f6afebd3e22f4 (patch)
tree349386357d5a4b4bf8139b74022b5e2f17766811 /sec-policy/selinux-lvm
parentAdd 2.6.12 patch thanks to steev <threeway@gmail.com> in bug 96504 and gcc4 p... (diff)
downloadgentoo-2-70ef5f4e36b44705a770e708ea1f6afebd3e22f4.tar.gz
gentoo-2-70ef5f4e36b44705a770e708ea1f6afebd3e22f4.tar.bz2
gentoo-2-70ef5f4e36b44705a770e708ea1f6afebd3e22f4.zip
merge with upstream
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sec-policy/selinux-lvm')
-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-200505071
-rw-r--r--sec-policy/selinux-lvm/files/digest-selinux-lvm-200506051
-rw-r--r--sec-policy/selinux-lvm/selinux-lvm-20050605.ebuild (renamed from sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild)2
5 files changed, 11 insertions, 15 deletions
diff --git a/sec-policy/selinux-lvm/ChangeLog b/sec-policy/selinux-lvm/ChangeLog
index 20e221bf393c..0560adca02ae 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.3 2005/05/07 11:55:08 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.4 2005/06/26 17:10:24 kaiowas Exp $
+
+*selinux-lvm-20050605 (26 Jun 2005)
+
+ 26 Jun 2005; petre rodan <kaiowas@gentoo.org>
+ -selinux-lvm-20050507.ebuild, +selinux-lvm-20050605.ebuild:
+ merge with upstream
*selinux-lvm-20050507 (07 May 2005)
diff --git a/sec-policy/selinux-lvm/Manifest b/sec-policy/selinux-lvm/Manifest
index e44ad323efd7..07863c0e0712 100644
--- a/sec-policy/selinux-lvm/Manifest
+++ b/sec-policy/selinux-lvm/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 10fff2c5514f3c24a74a966852289586 ChangeLog 718
MD5 8a0bd1d41f0f9ff329ff416a18649ef8 metadata.xml 528
-MD5 f2a4065776d0edc7b09a6465f76b3ab9 selinux-lvm-20050507.ebuild 397
-MD5 abdfc499ebb564da45745497e0bfc11c files/digest-selinux-lvm-20050507 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCfKBvGSBEIeh4AEYRAlPNAJ463FuuNUY8NHB98I18X3jItc1fBQCeK6wr
-iral6LMi5UHjzMT7GythxqI=
-=zTR3
------END PGP SIGNATURE-----
+MD5 1dd8cd5ce657b0af6806d38ac1c9f378 selinux-lvm-20050605.ebuild 288
+MD5 213dcc6403fec16d2be7dfc07fb4573f files/digest-selinux-lvm-20050605 71
diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507
deleted file mode 100644
index 503ab4905b2a..000000000000
--- a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050507
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12d5a1c17188aeac6b7957510057a0f9 selinux-lvm-20050507.tar.bz2 2256
diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050605 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050605
new file mode 100644
index 000000000000..9e62fee27320
--- /dev/null
+++ b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050605
@@ -0,0 +1 @@
+MD5 9d61a93eb7ac8f0b4a5728d552ce84d7 selinux-lvm-20050605.tar.bz2 2398
diff --git a/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild b/sec-policy/selinux-lvm/selinux-lvm-20050605.ebuild
index b688aad5a8f4..abc482268c88 100644
--- a/sec-policy/selinux-lvm/selinux-lvm-20050507.ebuild
+++ b/sec-policy/selinux-lvm/selinux-lvm-20050605.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-20050507.ebuild,v 1.1 2005/05/07 11:55:08 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/selinux-lvm-20050605.ebuild,v 1.1 2005/06/26 17:10:24 kaiowas Exp $
inherit selinux-policy