From e58a4a714c63b70721c9a3e4bcff4bbeaf6a4c6d Mon Sep 17 00:00:00 2001 From: Petre Rodan Date: Fri, 25 Feb 2005 08:33:29 +0000 Subject: merge with upstream policy (Portage version: 2.0.51-r15) --- sec-policy/selinux-spamassassin/ChangeLog | 9 ++++++++- sec-policy/selinux-spamassassin/Manifest | 14 ++------------ .../files/digest-selinux-spamassassin-20040704 | 1 - .../files/digest-selinux-spamassassin-20050219 | 1 + .../selinux-spamassassin-20040704.ebuild | 15 --------------- .../selinux-spamassassin-20050219.ebuild | 16 ++++++++++++++++ 6 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20040704 create mode 100644 sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219 delete mode 100644 sec-policy/selinux-spamassassin/selinux-spamassassin-20040704.ebuild create mode 100644 sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild (limited to 'sec-policy/selinux-spamassassin') 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 + -selinux-spamassassin-20040704.ebuild, + +selinux-spamassassin-20050219.ebuild: + merge with upstream policy 20 Jan 2005; petre rodan 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-20040704.ebuild deleted file mode 100644 index 2325e63ae96f..000000000000 --- a/sec-policy/selinux-spamassassin/selinux-spamassassin-20040704.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# 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 $ - -TEFILES="spamassassin.te spamc.te spamd.te" -FCFILES="spamassassin.fc spamc.fc spamd.fc" -MACROS="spamassassin_macros.te" -IUSE="" - -inherit selinux-policy - -DESCRIPTION="SELinux policy for SpamAssassin" - -KEYWORDS="x86 ppc sparc amd64" - diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild new file mode 100644 index 000000000000..893c1a9cce66 --- /dev/null +++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild @@ -0,0 +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-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="" +RDEPEND=">=sec-policy/selinux-base-policy-20050224" + +DESCRIPTION="SELinux policy for SpamAssassin" + +KEYWORDS="~x86 ~ppc ~sparc ~amd64" + -- cgit v1.2.3-65-gdbad