merge with upstream

Package-Manager: portage-2.0.51.22-r1

11 files changed, 42 insertions, 29 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
 
diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index d2788d026db1..252caf0138b3 100644
--- a/sec-policy/selinux-mysql/ChangeLog
+++ b/sec-policy/selinux-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mysql
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.11 2005/05/07 06:58:03 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.12 2005/06/26 17:14:42 kaiowas Exp $
+
+*selinux-mysql-20050605 (26 Jun 2005)
+
+  26 Jun 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-mysql-20050605.ebuild:
+  merge with upstream
 
   07 May 2005; petre rodan <kaiowas@gentoo.org>
   selinux-mysql-20050408.ebuild:
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index a8d194b379ba..ac388a8ed2b8 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bffd474a2ea3fb68476fdb5c795db1e0 ChangeLog 1701
 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
 MD5 a09b8b05f11f56bbb5ddd07f46d58996 selinux-mysql-20050219.ebuild 435
+MD5 66c1492980544ac92b9c2900cae8bf4f selinux-mysql-20050605.ebuild 326
 MD5 67732ac78a96221074803ff71e701022 selinux-mysql-20050408.ebuild 435
 MD5 052d831b524edd84395e1be93b9d170c files/digest-selinux-mysql-20050219 73
 MD5 09338486450859ac1f90c8387ae03be0 files/digest-selinux-mysql-20050408 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD4DBQFCfGYMGSBEIeh4AEYRAvQpAJ0cbZ7nN4WuSIs7RNb4W7abEGcSpwCYwidw
-VJQzR1GRtDt0jb1Zbh/EZg==
-=0MzL
------END PGP SIGNATURE-----
+MD5 95b181aed42460f40e3aabd98bf6bcbb files/digest-selinux-mysql-20050605 73
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605
new file mode 100644
index 000000000000..f60d1aba5865
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605
@@ -0,0 +1 @@
+MD5 caf039db9bb2085462e10c7740542067 selinux-mysql-20050605.tar.bz2 1168
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild
new file mode 100644
index 000000000000..a0403f148b52
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-20050605.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-20050605.ebuild,v 1.1 2005/06/26 17:14:42 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"
+
diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index 963f8bce7677..5663bb2a711a 100644
--- a/sec-policy/selinux-ntp/ChangeLog
+++ b/sec-policy/selinux-ntp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sec-policy/selinux-ntp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.12 2005/06/26 12:35:02 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.13 2005/06/26 17:17:37 kaiowas Exp $
+
+  26 Jun 2005; petre rodan <kaiowas@gentoo.org> selinux-ntp-20050626.ebuild:
+  mark stable
 
 *selinux-ntp-20050626 (26 Jun 2005)
 
diff --git a/sec-policy/selinux-ntp/selinux-ntp-20050626.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20050626.ebuild
index a76ac32becab..fc39a54af250 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-20050626.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-20050626.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-ntp/selinux-ntp-20050626.ebuild,v 1.1 2005/06/26 12:35:02 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-20050626.ebuild,v 1.2 2005/06/26 17:17:37 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for the network time protocol daemon"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"