mergmerge with nsa policy

diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 2c7ebbacfbc41c2031d3a8442aaee39bb97a764c..aa297e133f812a7f01578a0d11f97738f8694f96 100644 (file)
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7793beb8f821b29f75d4d27167c149d0 ChangeLog 388
+MD5 30874d35fe4426fbd06b9e90cb010763 ChangeLog 540
 MD5 33ce69af63f7ed3517790f2af7695d3d metadata.xml 510
 MD5 e9354f830027d163d49574318ef53a65 selinux-arpwatch-20041114.ebuild 400
+MD5 95971aaeba3db1789ccfdeb0ecb8496b selinux-arpwatch-20041120.ebuild 400
 MD5 a172c3a352436cdc40f8582c1d7b6ea3 files/digest-selinux-arpwatch-20041114 75
+MD5 7c95cb31752f85a350f27d4286692fbb files/digest-selinux-arpwatch-20041120 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBl7ZCGSBEIeh4AEYRAkUjAJ4sMAjOVDyvorjzHiUkNK70eHpSEgCdEth/
-qw7n+DU/J4gfwGLmaQz03xg=
-=nU7t
+iD8DBQFBoj1iGSBEIeh4AEYRAsZjAJ9f+DY0ppyjKaewk0Yd1XRYlLV1sgCdHyQ5
+zzatQc4zONxweNKBMYLwKJw=
+=nu+z
 -----END PGP SIGNATURE-----

diff --git a/sec-policy/selinux-bind/ChangeLog b/sec-policy/selinux-bind/ChangeLog
index 1d95c2c47b33d58700b6625eac7ee77ec5432076..0012103ca1f9f678dd7a6953acb0500cb5b77ccb 100644 (file)
--- a/sec-policy/selinux-bind/ChangeLog
+++ b/sec-policy/selinux-bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bind
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.6 2004/10/23 13:43:01 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.7 2004/11/22 20:24:14 kaiowas Exp $
+
+*selinux-bind-20041120 (22 Nov 2004)
+
+  22 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  +selinux-bind-20041120.ebuild:
+  merge with nsa policy
 
 *selinux-bind-20040925 (23 Oct 2004)
 

diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index dca35217429d42af68681a3333bfd48bd992582c..bbc9ffff831fc3b90bdf0c8a2c5743c4aaee5f9f 100644 (file)
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b59d1491093e5664556dcc3218a209ce ChangeLog 942
+MD5 63bc60184e22e54e1d7b76fa6123f3f1 ChangeLog 1086
 MD5 2578a997bc90b7068228ad83d664c215 metadata.xml 542
 MD5 cef5c53c48709d5840140238b3fa61a0 selinux-bind-20040428.ebuild 379
 MD5 f38d1d39bd6310193d654a0cf4250284 selinux-bind-20040925.ebuild 435
+MD5 4fb6a5527ea2649036595a7d6e3a179f selinux-bind-20041120.ebuild 435
 MD5 e3f94bd06c76ad3637716662af4c12cc files/digest-selinux-bind-20040428 72
 MD5 64511c68ecd55045e382366c578e797b files/digest-selinux-bind-20040925 72
+MD5 796de9cfba32ab842115ab3da83665e1 files/digest-selinux-bind-20041120 72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBehqKGSBEIeh4AEYRAv1/AJ9dq6y/EinL6WNWC/VioU37kGdDyQCfVZSL
-RCYnSrR5HLWyPA78evdfADc=
-=Zveh
+iD8DBQFBoj03GSBEIeh4AEYRAk5cAJ0UyL9YX38SL84o9zrlvs1zeyTQuwCcDTTp
+d00+uG2Lw7V34GuhBV7lyCw=
+=81nQ
 -----END PGP SIGNATURE-----

diff --git a/sec-policy/selinux-bind/files/digest-selinux-bind-20041120 b/sec-policy/selinux-bind/files/digest-selinux-bind-20041120
new file mode 100644 (file)
index 0000000..d43c255
--- /dev/null
+++ b/sec-policy/selinux-bind/files/digest-selinux-bind-20041120
@@ -0,0 +1 @@
+MD5 e9d50e09737c4482c66d58fd3ebe9781 selinux-bind-20041120.tar.bz2 2058

diff --git a/sec-policy/selinux-bind/selinux-bind-20041120.ebuild b/sec-policy/selinux-bind/selinux-bind-20041120.ebuild
new file mode 100644 (file)
index 0000000..c831ff2
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-20041120.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-20041120.ebuild,v 1.1 2004/11/22 20:24:14 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="named.te"
+FCFILES="named.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for BIND"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+