From: Petre Rodan <kaiowas@gentoo.org>
Date: Mon, 22 Nov 2004 20:40:41 +0000 (+0000)
Subject: merge with nsa policy
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7afe374e0ec49fe0af2fdf510ee1d75a7079982;p=gentoo.git

merge with nsa policy
---

diff --git a/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20041120 b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20041120
new file mode 100644
index 000000000000..5f4102805efd
--- /dev/null
+++ b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20041120
@@ -0,0 +1 @@
+MD5 3175e20936534c864ddc25a95a9b2e59 selinux-ftpd-20041120.tar.bz2 1648
diff --git a/sec-policy/selinux-ftpd/selinux-ftpd-20041120.ebuild b/sec-policy/selinux-ftpd/selinux-ftpd-20041120.ebuild
new file mode 100644
index 000000000000..bfde85d04ae4
--- /dev/null
+++ b/sec-policy/selinux-ftpd/selinux-ftpd-20041120.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-ftpd/selinux-ftpd-20041120.ebuild,v 1.1 2004/11/22 20:40:41 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="ftpd.te"
+FCFILES="ftpd.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for ftp daemons"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-ipsec-tools/Manifest b/sec-policy/selinux-ipsec-tools/Manifest
index 732633752d4c..f52c5cf8282d 100644
--- a/sec-policy/selinux-ipsec-tools/Manifest
+++ b/sec-policy/selinux-ipsec-tools/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b648c48020498d031b6f7d35ee0510ef ChangeLog 617
+MD5 53f4fa16e40f62f7775a73415dc58a46 ChangeLog 781
 MD5 b457e59ce7e80c06bf1d5f0ae4eac12c metadata.xml 514
 MD5 d02e0f37a927abbf5fd7f0821d1ea415 selinux-ipsec-tools-20040703.ebuild 400
 MD5 764318bec7ef808df623ee3f11d5664c selinux-ipsec-tools-20041007.ebuild 403
 MD5 900f9bc043a771e9827f225f78d7ab2f selinux-ipsec-tools-20041026.ebuild 403
+MD5 521618e888cec2efbcf7e294c10070d0 selinux-ipsec-tools-20041113.ebuild 403
 MD5 4b5117b8e766c6b5a43c10e934f2642e files/digest-selinux-ipsec-tools-20040703 79
 MD5 e16f6f807fbb6a92ef57e5de2345e162 files/digest-selinux-ipsec-tools-20041007 79
 MD5 2c73de8c7f7447b940146d3d7834dbcf files/digest-selinux-ipsec-tools-20041026 78
+MD5 94ee02ec27f1d79f80da53f90d725d16 files/digest-selinux-ipsec-tools-20041113 78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBf+IgGSBEIeh4AEYRAh0kAJ9Ro28llB63tpg1VrV75Yd3aL1bpwCgifIX
-6tTQb/Ij8+cxw9G3MG7QuFA=
-=xJnC
+iD8DBQFBoj5nGSBEIeh4AEYRAj0DAJ9h+FlbbbKKYsnbztZw+RUYpKgJZQCeOqTf
+1tBDsLtxpLmeV7lLJ0KoCWg=
+=xOqD
 -----END PGP SIGNATURE-----