merge with nsa policy

5 files changed, 13 insertions, 15 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"