merge with upstream

(Portage version: 2.0.51.22-r1)

5 files changed, 29 insertions, 4 deletions

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/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"