merge with upstream policy

(Portage version: 2.0.51-r15)

10 files changed, 43 insertions, 32 deletions

diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index f40dac6e77ec..7941ee2f2537 100644
--- a/sec-policy/selinux-ntp/ChangeLog
+++ b/sec-policy/selinux-ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ntp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.7 2005/01/20 09:29:41 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.8 2005/02/25 08:06:48 kaiowas Exp $
+
+*selinux-ntp-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-ntp-20031101.ebuild, +selinux-ntp-20050219.ebuild:
+  merge with upstream policy
 
   20 Jan 2005; petre rodan <kaiowas@gentoo.org>
   -selinux-ntp-20041014.ebuild, selinux-ntp-20041120.ebuild:
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 14175c131e9d..186613627164 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1d03ea469720ef99ede21471a5b13871 ChangeLog 951
 MD5 ed58290361b061defc07c7f48ee829af metadata.xml 532
-MD5 3256886efef5e2bc85f6e2a8718a5bd7 selinux-ntp-20031101.ebuild 402
+MD5 3e8c258c741159b24b8c1ebf330d9fd6 selinux-ntp-20050219.ebuild 349
 MD5 f385f0396f14b7c0f9bdec25748d4e52 selinux-ntp-20041120.ebuild 455
-MD5 6ccfd49733cea7789e63d7771e8423f9 files/digest-selinux-ntp-20031101 71
+MD5 391a449cd2498f951e7c3e16549d2dff files/digest-selinux-ntp-20050219 71
 MD5 c2734fd896b769d91847de9977f3e303 files/digest-selinux-ntp-20041120 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB73VVGSBEIeh4AEYRAgQYAJwO1TyQtTJSUMKDVFl4Nu2j44nCDACfaCxp
-oppg6/7JqoCaG5ZnCoHtIq8=
-=LWoQ
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20031101 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20031101
deleted file mode 100644
index b307d4eedf4b..000000000000
--- a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20031101
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5939abf9183a8862ede175f39414a51 selinux-ntp-20031101.tar.bz2 1175
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050219 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050219
new file mode 100644
index 000000000000..e7523a5cd563
--- /dev/null
+++ b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050219
@@ -0,0 +1 @@
+MD5 05a5cd054fee94b761bf612d4ca9fe43 selinux-ntp-20050219.tar.bz2 1384
diff --git a/sec-policy/selinux-ntp/selinux-ntp-20031101.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20050219.ebuild
index 580a2e9fcb6f..b6baaf1843a1 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-20031101.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-20050219.ebuild
@@ -1,14 +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-ntp/selinux-ntp-20031101.ebuild,v 1.6 2005/01/20 09:29:41 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-20050219.ebuild,v 1.1 2005/02/25 08:06:48 kaiowas Exp $
+
+inherit selinux-policy
 
 TEFILES="ntpd.te"
 FCFILES="ntpd.fc"
 IUSE=""
-
-inherit selinux-policy
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
 
 DESCRIPTION="SELinux policy for the network time protocol daemon"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
diff --git a/sec-policy/selinux-postfix/ChangeLog b/sec-policy/selinux-postfix/ChangeLog
index 3fad03044133..c577c812490b 100644
--- a/sec-policy/selinux-postfix/ChangeLog
+++ b/sec-policy/selinux-postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postfix
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.7 2004/12/12 12:39:11 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.8 2005/02/25 08:09:05 kaiowas Exp $
+
+*selinux-postfix-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-postfix-20050219.ebuild:
+  merge with upstream policy
 
 *selinux-postfix-20041211 (12 Dec 2004)
 
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 55616efec7e4..b4c0a242de44 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 89311d75a74bd25010086d123a75c787 ChangeLog 1258
 MD5 0b8ee728a701b048ddb9e62d6c08ee02 metadata.xml 381
+MD5 986739549a5668b62104147055a7280f selinux-postfix-20050219.ebuild 330
 MD5 600a25115f6ebeab04109915f2e57015 selinux-postfix-20041211.ebuild 391
+MD5 332631acf09a7bcb5ee7b9f1994525ec files/digest-selinux-postfix-20050219 75
 MD5 019734c900f298c6144fcb9fd9239b33 files/digest-selinux-postfix-20041211 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvDC+GSBEIeh4AEYRAi+SAKCNj815APEcwJPfexv3zzpDzd86owCcDVoj
-AxDI8DGGU02zMA1u95iXrIE=
-=0K0o
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050219 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050219
new file mode 100644
index 000000000000..cd8a94b731a9
--- /dev/null
+++ b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050219
@@ -0,0 +1 @@
+MD5 401e5c111d55c78d75792c0e1017e3d5 selinux-postfix-20050219.tar.bz2 3441
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild
index 316f9cf34c7f..d078e9ca1a8f 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-20041211.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-postfix/selinux-postfix-20041211.ebuild,v 1.1 2004/12/12 12:39:11 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild,v 1.2 2005/02/25 08:09:05 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20050219.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20050219.ebuild
new file mode 100644
index 000000000000..adcf57e4b5c2
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-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-postfix/selinux-postfix-20050219.ebuild,v 1.1 2005/02/25 08:09:05 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="postfix.te"
+FCFILES="postfix.fc"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
+
+DESCRIPTION="SELinux policy for postfix"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+