merge with nsa policy

7 files changed, 32 insertions, 21 deletions

diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index daa524155f45..c74aa01d73ef 100644
--- a/sec-policy/selinux-postgresql/ChangeLog
+++ b/sec-policy/selinux-postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postgresql
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.1 2004/10/23 13:58:12 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.2 2004/11/13 19:00:29 kaiowas Exp $
+
+*selinux-postgresql-20041028 (13 Nov 2004)
+
+  13 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  +selinux-postgresql-20041028.ebuild:
+  merge with nsa policy
 
 *selinux-postgresql-20041002 (23 Oct 2004)
 
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-20041028.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-20041028.ebuild
new file mode 100644
index 000000000000..56895b2056ab
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-20041028.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-postgresql/selinux-postgresql-20041028.ebuild,v 1.1 2004/11/13 19:00:29 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="postgresql.te"
+FCFILES="postgresql.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for PostgreSQL"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+
diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 8514e9e5b109..d6724e218330 100644
--- a/sec-policy/selinux-squid/ChangeLog
+++ b/sec-policy/selinux-squid/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2004/10/27 11:02:12 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.5 2004/11/13 19:04:50 kaiowas Exp $
+
+*selinux-squid-20041109 (13 Nov 2004)
+
+  13 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-squid-20040925.ebuild, -selinux-squid-20041024.ebuild,
+  +selinux-squid-20041109.ebuild:
+  merge with nsa policy
 
 *selinux-squid-20041024 (27 Oct 2004)
 
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20040925 b/sec-policy/selinux-squid/files/digest-selinux-squid-20040925
deleted file mode 100644
index 30c324818342..000000000000
--- a/sec-policy/selinux-squid/files/digest-selinux-squid-20040925
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a732e053f6c8590113bd1b6269235bd8 selinux-squid-20040925.tar.bz2 1218
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20041024 b/sec-policy/selinux-squid/files/digest-selinux-squid-20041024
deleted file mode 100644
index 09bc2f8d3fc5..000000000000
--- a/sec-policy/selinux-squid/files/digest-selinux-squid-20041024
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 7ac5e2d72787..000000000000
--- a/sec-policy/selinux-squid/selinux-squid-20041024.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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"
-
diff --git a/sec-policy/selinux-squid/selinux-squid-20040925.ebuild b/sec-policy/selinux-squid/selinux-squid-20041109.ebuild
index ecba1dbd9a89..f1210f45d5a3 100644
--- a/sec-policy/selinux-squid/selinux-squid-20040925.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-20041109.ebuild
@@ -1,6 +1,6 @@
 # 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-20040925.ebuild,v 1.1 2004/10/23 13:38:50 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20041109.ebuild,v 1.1 2004/11/13 19:04:50 kaiowas Exp $
 
 inherit selinux-policy