merge with nsa policy

diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index 6053803df1e269750cee43504f80499532b8a020..e0d530580ab6cc03ce42fe24246edd8bff87106b 100644 (file)
--- 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 f55c38f19cf183ff4b4d5f7dbbecc1bf67df118a..97013fce5d4d1f55538bf657c838e46e2c63be30 100644 (file)
--- 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 (file)
index 62da05a..0000000
--- 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 (file)
index 0000000..ed6c187
--- /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
similarity index 83%
rename from sec-policy/selinux-gnupg/selinux-gnupg-20040703.ebuild
rename to sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild
index 4866d55bc70b645d80e5d2ebf06e9848d3a940d7..c9b37c7758180059dafb1dd765b20738d90a128b 100644 (file)
--- 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"

diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog
index 64c07ba04694aa3ed414c3bd5177539314edae78..b2a36a8c238ff30834f9a6b38e9c0e26c08575bd 100644 (file)
--- 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 1fa9ad54fa9c19ce206c44e1b4d0b52525931799..3ec1e6c4e7085139ff1745e337dbd109a98eca35 100644 (file)
--- 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 (file)
index b5176c3..0000000
--- 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 (file)
index 0000000..c2bcea7
--- /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
similarity index 83%
rename from sec-policy/selinux-gpm/selinux-gpm-20040429.ebuild
rename to sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild
index 0e046157b834ed29ee8dd036b4be753d6619d964..7444ef18b9daf98ac711d01647a11656c0f1f100 100644 (file)
--- 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 1954d838268142d7e08e78c1dee15a6988d29ee7..2bd966b4ba8363241f3e76bcb07eb45ab1109cf6 100644 (file)
--- 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 47000fc8241d86bf9510f597c9079d3a2342bc80..374609d3b305254006452cf8a0d397294e989f47 100644 (file)
--- 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 (file)
index 0000000..58a5b9c
--- /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 (file)
index 0000000..7458d34
--- /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"
+

diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index b6e54f69955b0ed7c44603cc9cfed5ea78d75048..6208255427368e3f39eb92340d6d13d56131c2e4 100644 (file)
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0b862f284eb93b9963c50dc78298b27e ChangeLog 828
+MD5 47830631c3be9966f67536c09ed1b10b ChangeLog 530
 MD5 74d53a3441e3e708148bf2f891f2c001 metadata.xml 507
-MD5 95a567dd3762d3d2d9dd0bfd9231f3d3 selinux-ntop-20040901.ebuild 377
-MD5 0fced8dd6f385ed849247c62ef624c2e selinux-ntop-20041016.ebuild 376
-MD5 c3c3824e0485400a9c57d1be1a3c48a4 files/digest-selinux-ntop-20040901 71
-MD5 5210e11bb8dff9cb300fb448fd6dd237 files/digest-selinux-ntop-20041016 71
+MD5 0d930c7c215ad52c602de6d6808391a3 selinux-ntop-20041113.ebuild 376
+MD5 0bbe8e10ca752bba4bb825f2dc759764 files/digest-selinux-ntop-20041113 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBeyRhGSBEIeh4AEYRAmc5AJ9wZCBjA2JN7omi+LTMk8O7PolycwCfVLk7
-oSxgaALY2CJm/cHfpshwFUQ=
-=T6/j
+iD8DBQFBljpDGSBEIeh4AEYRAj/0AJ4orCVenlXA+l4gRtRHDNk7j7zH+gCdH5vb
+r/CrxqEWDuHuGZAZH9F7Ov0=
+=tuG/
 -----END PGP SIGNATURE-----