merge with nsa policy

5 files changed, 13 insertions, 15 deletions

diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index 6053803df1e2..e0d530580ab6 100644
--- a/sec-policy/selinux-gnupg/ChangeLog
+++ b/sec-policy/selinux-gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gnupg
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.1 2004/07/03 20:51:12 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.2 2004/11/13 19:48:01 kaiowas Exp $
+
+*selinux-gnupg-20041109 (13 Nov 2004)
+
+  13 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  +selinux-gnupg-20041109.ebuild:
+  merge with nsa policy
 
 *selinux-gnupg-20040703 (03 Jul 2004)
 
diff --git a/sec-policy/selinux-gnupg/Manifest b/sec-policy/selinux-gnupg/Manifest
index f55c38f19cf1..97013fce5d4d 100644
--- a/sec-policy/selinux-gnupg/Manifest
+++ b/sec-policy/selinux-gnupg/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ea56472015a123a5344d2153fa69c48c ChangeLog 381
 MD5 ead6a56acfba29bb5e0b072575e0c83d metadata.xml 383
 MD5 a589b6410738e7faf35beb3c94f53d3a selinux-gnupg-20040703.ebuild 413
+MD5 07b3efa96f8bb6acdf356b70e4233c5b selinux-gnupg-20041109.ebuild 303
 MD5 dc034de1e176fd94c0dc8bdf86242d1b files/digest-selinux-gnupg-20040703 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBTjjpGFJQsIJWJy4RAm5MAJ939OJSJrcoZX0h2Aki9P/Q02EHhACdHgRX
-BK1tgPw0oY4T9jJ+5vdQ5Ic=
-=IKdd
------END PGP SIGNATURE-----
+MD5 85659b1ffa22c0704e3f1362d0dc6c34 files/digest-selinux-gnupg-20041109 73
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20040703 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20040703
deleted file mode 100644
index 62da05a63d5a..000000000000
--- a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20040703
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dd9f7cf6088a26c3680f244995f6f56 selinux-gnupg-20040703.tar.bz2 1696
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041109 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041109
new file mode 100644
index 000000000000..ed6c187fcc37
--- /dev/null
+++ b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041109
@@ -0,0 +1 @@
+MD5 092598702d0ca4126712384026552bc9 selinux-gnupg-20041109.tar.bz2 2666
diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20040703.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild
index 4866d55bc70b..c9b37c775818 100644
--- a/sec-policy/selinux-gnupg/selinux-gnupg-20040703.ebuild
+++ b/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild
@@ -1,14 +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-gnupg/selinux-gnupg-20040703.ebuild,v 1.2 2004/09/20 01:55:47 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild,v 1.1 2004/11/13 19:48:01 kaiowas Exp $
+
+inherit selinux-policy
 
 TEFILES="gpg.te"
 FCFILES="gpg.fc"
 MACROS="gpg_macros.te"
 IUSE=""
 
-inherit selinux-policy
-
 DESCRIPTION="SELinux policy for GNU privacy guard"
 
 KEYWORDS="x86 ppc sparc amd64"