merge with upstream policy

Package-Manager: portage-2.0.51-r15

10 files changed, 57 insertions, 31 deletions

diff --git a/sec-policy/selinux-asterisk/ChangeLog b/sec-policy/selinux-asterisk/ChangeLog
index dd247235cd89..86679de4f360 100644
--- a/sec-policy/selinux-asterisk/ChangeLog
+++ b/sec-policy/selinux-asterisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-asterisk
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.1 2004/12/12 11:42:35 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.2 2005/02/25 07:26:55 kaiowas Exp $
+
+*selinux-asterisk-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-asterisk-20050219.ebuild:
+  merge with upstream policy
 
 *selinux-asterisk-20041211 (12 Dec 2004)
 
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index c390632f2397..2f24811f9cc1 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f1d178de323826ac1ca724ebde19db00 ChangeLog 388
 MD5 cf770d71587c51d11992c592aa9980b6 metadata.xml 544
+MD5 f097373c546ba853b3a686256471c2a1 selinux-asterisk-20050219.ebuild 322
 MD5 90074002c18fd1e6e6b67d645849d80a selinux-asterisk-20041211.ebuild 441
+MD5 15af1d520147ec8624363e877e06a109 files/digest-selinux-asterisk-20050219 75
 MD5 7ad67216d3c19bac764ebbe868cd89c6 files/digest-selinux-asterisk-20041211 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvCxlGSBEIeh4AEYRAqTMAJwNL4faJ1Qa40ZBTM5dEPIO6Um0lwCfZW0p
-333LSekm3dQtZDha+SQWT38=
-=Onqn
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-asterisk/files/digest-selinux-asterisk-20050219 b/sec-policy/selinux-asterisk/files/digest-selinux-asterisk-20050219
new file mode 100644
index 000000000000..76b2153d8274
--- /dev/null
+++ b/sec-policy/selinux-asterisk/files/digest-selinux-asterisk-20050219
@@ -0,0 +1 @@
+MD5 2488e4d50863cdfc01f8028e5744b775 selinux-asterisk-20050219.tar.bz2 959
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-20041211.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-20041211.ebuild
index d830840ef5ad..46141816fc04 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-20041211.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-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-asterisk/selinux-asterisk-20041211.ebuild,v 1.1 2004/12/12 11:42:35 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-20041211.ebuild,v 1.2 2005/02/25 07:26:55 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-20050219.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-20050219.ebuild
new file mode 100644
index 000000000000..bad881ec887c
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-20050219.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-20050219.ebuild,v 1.1 2005/02/25 07:26:55 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="asterisk.te"
+FCFILES="asterisk.fc"
+IUSE=""
+
+DESCRIPTION="Gentoo SELinux policy for asterisk, a modular open-source PBX system"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-bind/ChangeLog b/sec-policy/selinux-bind/ChangeLog
index 27fcae392d6b..7d27818c8405 100644
--- a/sec-policy/selinux-bind/ChangeLog
+++ b/sec-policy/selinux-bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.8 2005/01/20 09:05:19 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.9 2005/02/25 07:30:11 kaiowas Exp $
+
+*selinux-bind-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-bind-20050219.ebuild:
+  merge with upstream policy
 
   20 Jan 2005; petre rodan <kaiowas@gentoo.org>
   selinux-bind-20041120.ebuild:
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index f53ff1feb783..8b141e283bd1 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b1c9eddd78480e06ed90f1d4cddb3fe4 ChangeLog 1181
 MD5 2578a997bc90b7068228ad83d664c215 metadata.xml 542
+MD5 5560a456d6e538cbe08ee455ad72952a selinux-bind-20050219.ebuild 271
 MD5 8e3b204a40a09b5675ae7785b01d7347 selinux-bind-20040428.ebuild 378
 MD5 3151a13402b0fa596cab605fccf9c574 selinux-bind-20040925.ebuild 431
 MD5 ca0a71da485729ff353c22588729cbf1 selinux-bind-20041120.ebuild 431
+MD5 644c3b6f3edad8ff3bf816a892abe52a files/digest-selinux-bind-20050219 72
 MD5 e3f94bd06c76ad3637716662af4c12cc files/digest-selinux-bind-20040428 72
 MD5 64511c68ecd55045e382366c578e797b files/digest-selinux-bind-20040925 72
 MD5 796de9cfba32ab842115ab3da83665e1 files/digest-selinux-bind-20041120 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB73owGSBEIeh4AEYRAoTwAJ9tdaGRA5Ds0LbQ8yww6IZuBLuVwwCcCNAG
-wEBJqI8IZPKMAZ9dKiN3N/M=
-=0AeH
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-bind/files/digest-selinux-bind-20050219 b/sec-policy/selinux-bind/files/digest-selinux-bind-20050219
new file mode 100644
index 000000000000..df7994c478fe
--- /dev/null
+++ b/sec-policy/selinux-bind/files/digest-selinux-bind-20050219
@@ -0,0 +1 @@
+MD5 595def133888ce431b523b95de737761 selinux-bind-20050219.tar.bz2 2127
diff --git a/sec-policy/selinux-bind/selinux-bind-20050219.ebuild b/sec-policy/selinux-bind/selinux-bind-20050219.ebuild
new file mode 100644
index 000000000000..6f357f058731
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-20050219.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-20050219.ebuild,v 1.1 2005/02/25 07:30:11 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="named.te"
+FCFILES="named.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for BIND"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-courier-imap/Manifest b/sec-policy/selinux-courier-imap/Manifest
index 5fe8499a0d0b..bbc21d969d2a 100644
--- a/sec-policy/selinux-courier-imap/Manifest
+++ b/sec-policy/selinux-courier-imap/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a3e141ea9e360f2cb410ab4198b384ec ChangeLog 1472
+MD5 8885a1711c28a54963c100277f978107 ChangeLog 1692
 MD5 005f0ae76809fe8924209542636647f2 metadata.xml 526
+MD5 c959df1e7171074a6a70b8fcd08f69d3 selinux-courier-imap-20050219.ebuild 420
 MD5 5cdb3cc79ae433ea5887841c40234c2b selinux-courier-imap-20050105.ebuild 416
-MD5 5bf992d4ba946b31fe33d8c91d974d94 selinux-courier-imap-20040928.ebuild 416
-MD5 de20b51f39f09fda5e9b39ee65ea293c files/digest-selinux-courier-imap-20040928 80
+MD5 88d6ccd4cdfbd4392a5ac9c4732b8474 files/digest-selinux-courier-imap-20050219 80
 MD5 213b22052a28351eed40cd12d394cb85 files/digest-selinux-courier-imap-20050105 80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB73IpGSBEIeh4AEYRAmx5AJ4jOfKMxBGB2woL2mmcvHa0TlBVIACeM1qL
-89xvbwfXDaZKAMFIbJmY3og=
-=YvDU
+iD8DBQFCHvwoGSBEIeh4AEYRArNAAJ0Tpd78Jz5aWSoUpF9pnnsJv5koRACfX3IQ
+ph2ZbivTDNhk5rWdHpxZ6fs=
+=zry1
 -----END PGP SIGNATURE-----