merge with upstream policy

(Portage version: 2.0.51-r15)

10 files changed, 44 insertions, 32 deletions

diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog
index 3913483d1d56..f86efb4b0cf4 100644
--- a/sec-policy/selinux-spamassassin/ChangeLog
+++ b/sec-policy/selinux-spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-spamassassin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.3 2005/01/20 09:38:58 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.4 2005/02/25 08:30:04 kaiowas Exp $
+
+*selinux-spamassassin-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-spamassassin-20040704.ebuild,
+  +selinux-spamassassin-20050219.ebuild:
+  merge with upstream policy
 
   20 Jan 2005; petre rodan <kaiowas@gentoo.org>
   selinux-spamassassin-20041119.ebuild:
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 79833d43e1e4..8eb56d6b8a98 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ba4c4c69374f85b2f3e823b10f5ae5cc ChangeLog 671
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
-MD5 1906e7ba7c0783f2d37fc4321febca0a selinux-spamassassin-20040704.ebuild 484
+MD5 9e1e1976b6c35c4416412e199f8ec1e4 selinux-spamassassin-20050219.ebuild 413
 MD5 4e088bbdc738907c10dfb49d9aa2f0ad selinux-spamassassin-20041119.ebuild 484
-MD5 db611ee47b7b0bac22cf6f366b0e4e93 files/digest-selinux-spamassassin-20040704 80
+MD5 7e66aa08556496f9ffdc252678e1d499 files/digest-selinux-spamassassin-20050219 80
 MD5 a84b040682f569a6f8da4b9d5077e4d0 files/digest-selinux-spamassassin-20041119 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB73bAGSBEIeh4AEYRAvnWAJ9jpNkMZ5J4SA/ETKYs2WJRXwuEwwCeJSg7
-jBkPUT49QK7CKmt+QlIxPpE=
-=ahO1
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20040704 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20040704
deleted file mode 100644
index dd7f010d8b68..000000000000
--- a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20040704
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e4af2e831507f75cde7f5b31ac6bbaa selinux-spamassassin-20040704.tar.bz2 2215
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219
new file mode 100644
index 000000000000..c7aab1590797
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219
@@ -0,0 +1 @@
+MD5 d52c8dcf5439b56287cc723a2a976d70 selinux-spamassassin-20050219.tar.bz2 2212
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20040704.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild
index 2325e63ae96f..893c1a9cce66 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-20040704.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-20040704.ebuild,v 1.3 2005/01/20 09:38:58 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild,v 1.1 2005/02/25 08:30:04 kaiowas Exp $
+
+inherit selinux-policy
 
 TEFILES="spamassassin.te spamc.te spamd.te"
 FCFILES="spamassassin.fc spamc.fc spamd.fc"
 MACROS="spamassassin_macros.te"
 IUSE=""
-
-inherit selinux-policy
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for SpamAssassin"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 1169567c5cb8..a7588e7752b7 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.8 2004/12/12 12:49:54 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.9 2005/02/25 08:33:29 kaiowas Exp $
+
+*selinux-squid-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-squid-20050219.ebuild:
+  merge with upstream policy
 
   12 Dec 2004; petre rodan <kaiowas@gentoo.org>
   -selinux-squid-20040106.ebuild, -selinux-squid-20041109.ebuild:
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 610cc80c7bf1..417950562a52 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 67defbdc51619480f1e5fa9583248bee ChangeLog 1317
 MD5 24c0cb2d4ce8da969c77f6ada1f8e60c metadata.xml 530
+MD5 9e09549e1fd851382017a11f58759554 selinux-squid-20050219.ebuild 324
 MD5 5b0f859f7f7c798852d340cd83f5a82f selinux-squid-20041120.ebuild 434
+MD5 7c0e7cb107511ece967aad7ee227d280 files/digest-selinux-squid-20050219 73
 MD5 3bd772328886d221f62b99987b9e079a files/digest-selinux-squid-20041120 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvDFSGSBEIeh4AEYRAoAEAJ9bX4PTrZnpgELILxt+13NmlDoZ3ACcCvWX
-ePqzW3CNqdH4jpy6c7XiSko=
-=srLn
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20050219 b/sec-policy/selinux-squid/files/digest-selinux-squid-20050219
new file mode 100644
index 000000000000..3eb3c38b2be2
--- /dev/null
+++ b/sec-policy/selinux-squid/files/digest-selinux-squid-20050219
@@ -0,0 +1 @@
+MD5 78f29f6cc9e585437a6e44ceeffb6169 selinux-squid-20050219.tar.bz2 1284
diff --git a/sec-policy/selinux-squid/selinux-squid-20041120.ebuild b/sec-policy/selinux-squid/selinux-squid-20041120.ebuild
index 4513f5540100..f5d16ce18cb9 100644
--- a/sec-policy/selinux-squid/selinux-squid-20041120.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-20041120.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20041120.ebuild,v 1.2 2004/11/23 17:19:57 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20041120.ebuild,v 1.3 2005/02/25 08:33:29 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-squid/selinux-squid-20050219.ebuild b/sec-policy/selinux-squid/selinux-squid-20050219.ebuild
new file mode 100644
index 000000000000..347b672c4c1f
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-20050219.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20050219.ebuild,v 1.1 2005/02/25 08:33:29 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="squid.te"
+FCFILES="squid.fc"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+
+DESCRIPTION="SELinux policy for squid"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+