From 2d48852208e6ed8e211abeb6c0fcfc993a8a2b5c Mon Sep 17 00:00:00 2001
From: Petre Rodan <kaiowas@gentoo.org>
Date: Wed, 27 Oct 2004 11:02:12 +0000
Subject: [PATCH] merge with nsa policy

---
 sec-policy/selinux-squid/ChangeLog               |  8 +++++++-
 sec-policy/selinux-squid/Manifest                | 10 ++++++----
 .../files/digest-selinux-squid-20041024          |  1 +
 .../selinux-squid/selinux-squid-20041024.ebuild  | 16 ++++++++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 sec-policy/selinux-squid/files/digest-selinux-squid-20041024
 create mode 100644 sec-policy/selinux-squid/selinux-squid-20041024.ebuild

diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 45ff13838378..8514e9e5b109 100644
--- a/sec-policy/selinux-squid/ChangeLog
+++ b/sec-policy/selinux-squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-squid
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.3 2004/10/23 13:38:50 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.4 2004/10/27 11:02:12 kaiowas Exp $
+
+*selinux-squid-20041024 (27 Oct 2004)
+
+  27 Oct 2004; petre rodan <kaiowas@gentoo.org>
+  +selinux-squid-20041024.ebuild:
+  merge with nsa policy
 
 *selinux-squid-20040925 (23 Oct 2004)
 
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 49f8b322c956..de45246bcc90 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 95fc901064b5ee9b9691e1c7f2e1e99f ChangeLog 581
+MD5 7a4ac4d68d6fb903a0ae50fc940593e2 ChangeLog 727
 MD5 24c0cb2d4ce8da969c77f6ada1f8e60c metadata.xml 530
 MD5 49231dc4cb4889208fc1db99680122f4 selinux-squid-20040106.ebuild 382
 MD5 42c3157ddd60f3f0f9a24b10e07dfc51 selinux-squid-20040925.ebuild 438
+MD5 376740c6232fae3870e9b8d1f3718796 selinux-squid-20041024.ebuild 438
 MD5 f58029b1e34511ea86b828ba9c4932c2 files/digest-selinux-squid-20040106 73
 MD5 70523e3884014dadc28f37c3598bf0d6 files/digest-selinux-squid-20040925 73
+MD5 99d228c673b3254edd7f5df596465400 files/digest-selinux-squid-20041024 73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBehnmGSBEIeh4AEYRAknlAJ9tZ0snpFryvm9SRA9RP4WJNa+AFACeIuf0
-1jW+zXDHm+vY4i7mKQKdH/A=
-=ukvS
+iD8DBQFBfsjJGSBEIeh4AEYRAu5PAJoDtk5Y/ZGV6nge7WguhMag9kDS7wCfZm8s
+zg/4mI6G7Urr1OG+D/FYN+k=
+=vdUA
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20041024 b/sec-policy/selinux-squid/files/digest-selinux-squid-20041024
new file mode 100644
index 000000000000..09bc2f8d3fc5
--- /dev/null
+++ b/sec-policy/selinux-squid/files/digest-selinux-squid-20041024
@@ -0,0 +1 @@
+MD5 1e8e8162ba52dcb2a375db22f637e079 selinux-squid-20041024.tar.bz2 1229
diff --git a/sec-policy/selinux-squid/selinux-squid-20041024.ebuild b/sec-policy/selinux-squid/selinux-squid-20041024.ebuild
new file mode 100644
index 000000000000..7ac5e2d72787
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-20041024.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-squid/selinux-squid-20041024.ebuild,v 1.1 2004/10/27 11:02:12 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="squid.te"
+FCFILES="squid.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for squid"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+
-- 
2.26.2