merge with nsa policy. updated primary maintainer

5 files changed, 36 insertions, 8 deletions

diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index 3af00c2a3b2f..3f1652ffaa47 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.2 2004/06/28 00:10:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.3 2004/10/23 09:55:14 kaiowas Exp $
+
+*selinux-mysql-20041006 (23 Oct 2004)
+
+  23 Oct 2004; petre rodan <kaiowas@gentoo.org> metadata.xml,
+  +selinux-mysql-20041006.ebuild:
+  merge with nsa policy. updated primary maintainer
 
 *selinux-mysql-20040514 (14 May 2004)
 
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index a1ac79d7c67b..425d8e0b6d66 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c86e8df4e40371fa56a67b380a928ef6 ChangeLog 418
-MD5 211019b02e38cec205defc9806d32da6 metadata.xml 370
+MD5 3abe4ea7f271cc6644b684739912f958 ChangeLog 605
+MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
 MD5 365f915e8ac220e6e0ec8c1ec90ea83a selinux-mysql-20040514.ebuild 384
+MD5 c3e5437cc273c02b154342e8062ee504 selinux-mysql-20041006.ebuild 387
 MD5 7eb8814200b2dba0a6821fa7e53cef94 files/digest-selinux-mysql-20040514 73
+MD5 fa151d863fd5a6fa5c25c504dec274b0 files/digest-selinux-mysql-20041006 73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBTjjxGFJQsIJWJy4RAgChAJ9GoIDwFzETjXKgkJan4ggQTsY2IwCcCXfe
-ALmPaD2oUpTiz9vxomytuv4=
-=WuF/
+iD8DBQFBefdLGSBEIeh4AEYRAnDGAJ9qyAI+fd2NP/45DGTuDnBr1hmjswCfc6dw
+XJq578YCqoANQS9sG2ORH3Q=
+=1Jin
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20041006 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20041006
new file mode 100644
index 000000000000..04e881bd0924
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20041006
@@ -0,0 +1 @@
+MD5 e8411edcd0b45d9c57ff3f6880ca5fda selinux-mysql-20041006.tar.bz2 1178
diff --git a/sec-policy/selinux-mysql/metadata.xml b/sec-policy/selinux-mysql/metadata.xml
index 2bcb8e20d83c..d2a719001e4d 100644
--- a/sec-policy/selinux-mysql/metadata.xml
+++ b/sec-policy/selinux-mysql/metadata.xml
@@ -3,9 +3,14 @@
 <pkgmetadata>
 <herd>hardened</herd>
 <maintainer>
+  <email>kaiowas@gentoo.org</email>
+  <name>Petre Rodan</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<maintainer>
   <email>pebenito@gentoo.org</email>
   <name>Chris PeBenito</name>
-  <description>Primary Maintainer</description>
+  <description>Backup Maintainer</description>
 </maintainer>
 <longdescription>Gentoo SELinux policy for mysql</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20041006.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20041006.ebuild
new file mode 100644
index 000000000000..435952069e98
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-20041006.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-20041006.ebuild,v 1.1 2004/10/23 09:55:14 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="mysqld.te"
+FCFILES="mysqld.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for mysql"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+