merge with upstream policy

(Portage version: 2.0.51-r15)

10 files changed, 55 insertions, 28 deletions

diff --git a/sec-policy/selinux-logrotate/ChangeLog b/sec-policy/selinux-logrotate/ChangeLog
index 9958577b28dd..d9f47a7bb0aa 100644
--- a/sec-policy/selinux-logrotate/ChangeLog
+++ b/sec-policy/selinux-logrotate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-logrotate
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.8 2004/12/12 12:23:02 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.9 2005/02/25 08:01:09 kaiowas Exp $
+
+*selinux-logrotate-20050211 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-logrotate-20050211.ebuild:
+  merge with upstream policy
 
   12 Dec 2004; petre rodan <kaiowas@gentoo.org>
   -selinux-logrotate-20031129.ebuild, -selinux-logrotate-20041114.ebuild:
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 912ba2f57488..8738e8eee09d 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3d93dc504948c58d3a6dae5c5ddca184 ChangeLog 1176
 MD5 54528549c74096166938118f88d5dc1a metadata.xml 378
+MD5 ce7be60c6a438ace8ce21200fa495b10 selinux-logrotate-20050211.ebuild 284
 MD5 c32819178691d93c9d2785e62f79bf0f selinux-logrotate-20041120.ebuild 401
+MD5 a30030d733ad16c872bd4b1b8565eae9 files/digest-selinux-logrotate-20050211 77
 MD5 562588bbcb31c158672cc96e8600e623 files/digest-selinux-logrotate-20041120 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvC+KGSBEIeh4AEYRAiehAJ0Zrd9JezbRc3oknELsCy48ZtSPtACfZod0
-Cwh7+N9l36dEtw1jzU87Kwo=
-=54Oc
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-logrotate/files/digest-selinux-logrotate-20050211 b/sec-policy/selinux-logrotate/files/digest-selinux-logrotate-20050211
new file mode 100644
index 000000000000..218bfd01551f
--- /dev/null
+++ b/sec-policy/selinux-logrotate/files/digest-selinux-logrotate-20050211
@@ -0,0 +1 @@
+MD5 f6f62ffd966690fa555ec401a40ac6cb selinux-logrotate-20050211.tar.bz2 1898
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-20041120.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-20041120.ebuild
index 6031e567dee9..0772de5dae51 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-20041120.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-20041120.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/selinux-logrotate-20041120.ebuild,v 1.2 2004/11/23 17:08:45 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/selinux-logrotate-20041120.ebuild,v 1.3 2005/02/25 08:01:09 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-20050211.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-20050211.ebuild
new file mode 100644
index 000000000000..bac35aaad5c5
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-20050211.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-logrotate/selinux-logrotate-20050211.ebuild,v 1.1 2005/02/25 08:01:09 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="logrotate.te"
+FCFILES="logrotate.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for logrotate"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index 8cb85a83be66..1335748277ab 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.7 2004/12/12 12:26:19 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.8 2005/02/25 08:03:26 kaiowas Exp $
+
+*selinux-mysql-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-mysql-20050219.ebuild:
+  merge with upstream policy
 
   12 Dec 2004; petre rodan <kaiowas@gentoo.org>
   -selinux-mysql-20040514.ebuild, -selinux-mysql-20041006.ebuild,
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index ee4f66f798c7..bd3344b5e963 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 47152262d7e7bf72b5f3ef5a7b0edb47 ChangeLog 1163
 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
+MD5 66c1492980544ac92b9c2900cae8bf4f selinux-mysql-20050219.ebuild 326
 MD5 c7043f639608769e3bf6a3928a95ad26 selinux-mysql-20041119.ebuild 383
+MD5 052d831b524edd84395e1be93b9d170c files/digest-selinux-mysql-20050219 73
 MD5 baf24d99ecc9b5b05a152d10d8c5b3c0 files/digest-selinux-mysql-20041119 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvC/LGSBEIeh4AEYRAmZ+AJ9dndafTyjKBQ8H8nOc/eHQJ4z3sACeOPzF
-DEbIjBXw3AeoqtrMAs7N+OU=
-=ED8M
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050219 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050219
new file mode 100644
index 000000000000..c0bbf4353c82
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050219
@@ -0,0 +1 @@
+MD5 2fbcc6e2c70e3dbc98e126043f54e579 selinux-mysql-20050219.tar.bz2 1193
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20041119.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20041119.ebuild
index 90df6775a610..05a5fe6dbc2e 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-20041119.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-20041119.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20041119.ebuild,v 1.2 2004/11/23 17:10:16 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-20041119.ebuild,v 1.3 2005/02/25 08:03:26 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050219.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20050219.ebuild
new file mode 100644
index 000000000000..d55e60ac1794
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-20050219.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-20050219.ebuild,v 1.1 2005/02/25 08:03:26 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"
+