merge with upstream

(Portage version: 2.0.51.22-r2)

7 files changed, 42 insertions, 21 deletions

diff --git a/sec-policy/selinux-lvm/ChangeLog b/sec-policy/selinux-lvm/ChangeLog
index 5ddf14e70a9c..22e6423dd525 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.5 2005/06/27 11:39:32 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.6 2005/08/20 17:27:55 kaiowas Exp $
+
+*selinux-lvm-20050813 (20 Aug 2005)
+
+  20 Aug 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-lvm-20050813.ebuild:
+  merge with upstream
 
   27 Jun 2005; petre rodan <kaiowas@gentoo.org> selinux-lvm-20050605.ebuild:
   mark stable
diff --git a/sec-policy/selinux-lvm/Manifest b/sec-policy/selinux-lvm/Manifest
index e9ab75931b2f..3bd516e3f24b 100644
--- a/sec-policy/selinux-lvm/Manifest
+++ b/sec-policy/selinux-lvm/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3bda390ce9fbbe84c688a9e5d084ae28 ChangeLog 980
 MD5 8a0bd1d41f0f9ff329ff416a18649ef8 metadata.xml 528
+MD5 4fbf532989a560e3e3d2d9cc6fa87336 selinux-lvm-20050813.ebuild 294
 MD5 d5297c2ea10a2ad2a9829d2af5f62615 selinux-lvm-20050605.ebuild 393
 MD5 213dcc6403fec16d2be7dfc07fb4573f files/digest-selinux-lvm-20050605 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCv9IiGSBEIeh4AEYRAmMpAJ9BJdx5WneCYlL180Id2VUOOf6D7wCfTl+8
-zBaObMrepo/hBhXSg2RfLjk=
-=4Dcf
------END PGP SIGNATURE-----
+MD5 5fa57af6bcae8e0f1bbe6786b5f93886 files/digest-selinux-lvm-20050813 71
diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050813 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050813
new file mode 100644
index 000000000000..b48254a95037
--- /dev/null
+++ b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050813
@@ -0,0 +1 @@
+MD5 9304410019473de2ae4bdb928a9a0e72 selinux-lvm-20050813.tar.bz2 2411
diff --git a/sec-policy/selinux-lvm/selinux-lvm-20050813.ebuild b/sec-policy/selinux-lvm/selinux-lvm-20050813.ebuild
new file mode 100644
index 000000000000..be2052a45f5f
--- /dev/null
+++ b/sec-policy/selinux-lvm/selinux-lvm-20050813.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-20050813.ebuild,v 1.1 2005/08/20 17:27:55 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="lvm.te"
+FCFILES="lvm.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for Logical Volume Management"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index f8f25ac01cd8..2e8d0ed70402 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 91e8dde46640931525a7a1ce2b0e9c48 ChangeLog 1973
 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
+MD5 ea5196136a2c32625683f62d0ed4a61f selinux-mysql-20050813.ebuild 332
 MD5 a9091c4fc27d6312a1942f60d0715047 selinux-mysql-20050605.ebuild 435
 MD5 67732ac78a96221074803ff71e701022 selinux-mysql-20050408.ebuild 435
+MD5 f21ad3e898fb3f64fec8d14949d0bd73 files/digest-selinux-mysql-20050813 73
 MD5 09338486450859ac1f90c8387ae03be0 files/digest-selinux-mysql-20050408 73
 MD5 95b181aed42460f40e3aabd98bf6bcbb files/digest-selinux-mysql-20050605 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCv9F9GSBEIeh4AEYRArbzAJ4rzQczoIinSqPIrXC6Rc+1jXoXggCfcf0t
-Ig497EJpHQDPUrTBROJHyAc=
-=VKag
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050813 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050813
new file mode 100644
index 000000000000..2e39784a5628
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050813
@@ -0,0 +1 @@
+MD5 1bdaa63ef8ec3ebb6dc290bbb64b7e80 selinux-mysql-20050813.tar.bz2 1190
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050813.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20050813.ebuild
new file mode 100644
index 000000000000..fb35565bf4c8
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-20050813.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-20050813.ebuild,v 1.1 2005/08/20 17:30:04 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="mysqld.te"
+FCFILES="mysqld.fc"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
+
+DESCRIPTION="SELinux policy for mysql"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+