merge with nsa policy

9 files changed, 37 insertions, 26 deletions

diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog
index 64c07ba04694..b2a36a8c238f 100644
--- a/sec-policy/selinux-gpm/ChangeLog
+++ b/sec-policy/selinux-gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpm
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.3 2004/06/28 00:10:37 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.4 2004/11/13 19:51:56 kaiowas Exp $
+
+*selinux-gpm-20041110 (13 Nov 2004)
+
+  13 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-gpm-20040429.ebuild, +selinux-gpm-20041110.ebuild:
+  merge with nsa policy
 
 *selinux-gpm-20040429 (29 Apr 2004)
 
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 1fa9ad54fa9c..3ec1e6c4e708 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 749fe999813adb88457df8d2894f2a52 ChangeLog 538
 MD5 3e6e642d7c225b0a478a79a65f1e3d03 metadata.xml 390
 MD5 a8a570dc7d4217fa797861799e17b95b selinux-gpm-20040429.ebuild 393
+MD5 a48c02131ff94594e11600812220856c selinux-gpm-20041110.ebuild 283
 MD5 9c5a6991dc6f69013afcd162dfe1e2b3 files/digest-selinux-gpm-20040429 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBTjj9GFJQsIJWJy4RAt5FAJ9DGgRBMQuc6hMfxp6az/q+TPJOewCfXndP
-0yNiUEqlj6RySlpriglp3+M=
-=tjoM
------END PGP SIGNATURE-----
+MD5 66f1ea5ef8c0b48898d67ed2269a6518 files/digest-selinux-gpm-20041110 70
diff --git a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20040429 b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20040429
deleted file mode 100644
index b5176c3a8c94..000000000000
--- a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20040429
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b58137a49cfe0635679e0cefabb7d643 selinux-gpm-20040429.tar.bz2 872
diff --git a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110
new file mode 100644
index 000000000000..c2bcea7ac8f5
--- /dev/null
+++ b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110
@@ -0,0 +1 @@
+MD5 ffe60e86518e5477665e05c748cf6192 selinux-gpm-20041110.tar.bz2 873
diff --git a/sec-policy/selinux-gpm/selinux-gpm-20040429.ebuild b/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild
index 0e046157b834..7444ef18b9da 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-20040429.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-20040429.ebuild,v 1.3 2004/09/20 01:55:47 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild,v 1.1 2004/11/13 19:51:56 kaiowas Exp $
+
+inherit selinux-policy
 
 TEFILES="gpm.te"
 FCFILES="gpm.fc"
 IUSE=""
 
-inherit selinux-policy
-
 DESCRIPTION="SELinux policy for the console mouse server"
 
 KEYWORDS="x86 ppc sparc amd64"
diff --git a/sec-policy/selinux-logrotate/ChangeLog b/sec-policy/selinux-logrotate/ChangeLog
index 1954d8382681..2bd966b4ba83 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.3 2004/06/28 00:25:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.4 2004/11/13 19:55:09 kaiowas Exp $
+
+*selinux-logrotate-20041109 (13 Nov 2004)
+
+  13 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  +selinux-logrotate-20041109.ebuild:
+  merge with nsa policy
 
 *selinux-logrotate-20031129 (29 Nov 2003)
 
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 47000fc8241d..374609d3b305 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d170a99ed667b064b6206d1e8ced679f ChangeLog 422
 MD5 54528549c74096166938118f88d5dc1a metadata.xml 378
 MD5 15bef20e791738765681c9feea16a3ce selinux-logrotate-20031129.ebuild 402
+MD5 6d9b1c44bfb19aec83805f7916b00297 selinux-logrotate-20041109.ebuild 284
 MD5 ba8727f969149526c6a20a13a9945058 files/digest-selinux-logrotate-20031129 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBTjjrGFJQsIJWJy4RApHKAJ4knOUEPLecghN4LQjMFpvmmtWYwQCeIahb
-y+jeA9f1TcylAKEw0G+YN8o=
-=es94
------END PGP SIGNATURE-----
+MD5 e5973853541b454d43bd7b5cda8ec1de files/digest-selinux-logrotate-20041109 77
diff --git a/sec-policy/selinux-logrotate/files/digest-selinux-logrotate-20041109 b/sec-policy/selinux-logrotate/files/digest-selinux-logrotate-20041109
new file mode 100644
index 000000000000..58a5b9cb5a70
--- /dev/null
+++ b/sec-policy/selinux-logrotate/files/digest-selinux-logrotate-20041109
@@ -0,0 +1 @@
+MD5 35080d925ab521abec15ff4da03da01c selinux-logrotate-20041109.tar.bz2 1865
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-20041109.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-20041109.ebuild
new file mode 100644
index 000000000000..7458d347e2f0
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-20041109.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-logrotate/selinux-logrotate-20041109.ebuild,v 1.1 2004/11/13 19:55:09 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="logrotate.te"
+FCFILES="logrotate.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for logrotate"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+