merge with upstream

Package-Manager: portage-2.0.51.22-r2

19 files changed, 119 insertions, 54 deletions

diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index 7876fc323d7e..0a91cffe5c0d 100644
--- a/sec-policy/selinux-gnupg/ChangeLog
+++ b/sec-policy/selinux-gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gnupg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.11 2005/06/26 17:04:15 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.12 2005/08/20 17:23:19 kaiowas Exp $
+
+*selinux-gnupg-20050813 (20 Aug 2005)
+
+  20 Aug 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-gnupg-20050813.ebuild:
+  merge with upstream
 
   26 Jun 2005; petre rodan <kaiowas@gentoo.org> ChangeLog:
   mark stable
diff --git a/sec-policy/selinux-gnupg/Manifest b/sec-policy/selinux-gnupg/Manifest
index 817361000c9a..4e4393a5c888 100644
--- a/sec-policy/selinux-gnupg/Manifest
+++ b/sec-policy/selinux-gnupg/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c12c47fb02b3f24cc911298788d8c955 ChangeLog 1785
 MD5 ead6a56acfba29bb5e0b072575e0c83d metadata.xml 383
+MD5 80794ce72f444e82e77972b6cb929e98 selinux-gnupg-20050813.ebuild 361
 MD5 1ff00bae9e29ef9aa75d5da0f661381d selinux-gnupg-20050408.ebuild 464
 MD5 82f15aba573673760dc75a874328f08d selinux-gnupg-20050626.ebuild 464
 MD5 21fc3844909bff919f6d9316940d84d2 files/digest-selinux-gnupg-20050626 73
 MD5 c871665ed83e620cf4add38e574efdcf files/digest-selinux-gnupg-20050408 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvsUXGSBEIeh4AEYRAoqeAJ41C5bY6CabB+oC73+0Kk58Olun7gCfWIp6
-CF/18zDrzghqTndOWK7Wc6k=
-=kNgd
------END PGP SIGNATURE-----
+MD5 11d46621f46a412799bf6ed1b0724920 files/digest-selinux-gnupg-20050813 73
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050813 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050813
new file mode 100644
index 000000000000..037b77ecc110
--- /dev/null
+++ b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050813
@@ -0,0 +1 @@
+MD5 88c5154af9e066af85a75ee4add8ecfd selinux-gnupg-20050813.tar.bz2 2728
diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20050813.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20050813.ebuild
new file mode 100644
index 000000000000..05c0b86e5e46
--- /dev/null
+++ b/sec-policy/selinux-gnupg/selinux-gnupg-20050813.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-gnupg/selinux-gnupg-20050813.ebuild,v 1.1 2005/08/20 17:23:19 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="gpg.te"
+FCFILES="gpg.fc"
+MACROS="gpg_macros.te"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050618"
+
+DESCRIPTION="SELinux policy for GNU privacy guard"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+
diff --git a/sec-policy/selinux-lvm/ChangeLog b/sec-policy/selinux-lvm/ChangeLog
index 5ddf14e70a9c..22e6423dd525 100644
--- a/sec-policy/selinux-lvm/ChangeLog
+++ b/sec-policy/selinux-lvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lvm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.5 2005/06/27 11:39:32 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lvm/ChangeLog,v 1.6 2005/08/20 17:27:55 kaiowas Exp $
+
+*selinux-lvm-20050813 (20 Aug 2005)
+
+  20 Aug 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-lvm-20050813.ebuild:
+  merge with upstream
 
   27 Jun 2005; petre rodan <kaiowas@gentoo.org> selinux-lvm-20050605.ebuild:
   mark stable
diff --git a/sec-policy/selinux-lvm/Manifest b/sec-policy/selinux-lvm/Manifest
index e9ab75931b2f..3bd516e3f24b 100644
--- a/sec-policy/selinux-lvm/Manifest
+++ b/sec-policy/selinux-lvm/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3bda390ce9fbbe84c688a9e5d084ae28 ChangeLog 980
 MD5 8a0bd1d41f0f9ff329ff416a18649ef8 metadata.xml 528
+MD5 4fbf532989a560e3e3d2d9cc6fa87336 selinux-lvm-20050813.ebuild 294
 MD5 d5297c2ea10a2ad2a9829d2af5f62615 selinux-lvm-20050605.ebuild 393
 MD5 213dcc6403fec16d2be7dfc07fb4573f files/digest-selinux-lvm-20050605 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCv9IiGSBEIeh4AEYRAmMpAJ9BJdx5WneCYlL180Id2VUOOf6D7wCfTl+8
-zBaObMrepo/hBhXSg2RfLjk=
-=4Dcf
------END PGP SIGNATURE-----
+MD5 5fa57af6bcae8e0f1bbe6786b5f93886 files/digest-selinux-lvm-20050813 71
diff --git a/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050813 b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050813
new file mode 100644
index 000000000000..b48254a95037
--- /dev/null
+++ b/sec-policy/selinux-lvm/files/digest-selinux-lvm-20050813
@@ -0,0 +1 @@
+MD5 9304410019473de2ae4bdb928a9a0e72 selinux-lvm-20050813.tar.bz2 2411
diff --git a/sec-policy/selinux-lvm/selinux-lvm-20050813.ebuild b/sec-policy/selinux-lvm/selinux-lvm-20050813.ebuild
new file mode 100644
index 000000000000..be2052a45f5f
--- /dev/null
+++ b/sec-policy/selinux-lvm/selinux-lvm-20050813.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-lvm/selinux-lvm-20050813.ebuild,v 1.1 2005/08/20 17:27:55 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="lvm.te"
+FCFILES="lvm.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for Logical Volume Management"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index f8f25ac01cd8..2e8d0ed70402 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 91e8dde46640931525a7a1ce2b0e9c48 ChangeLog 1973
 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
+MD5 ea5196136a2c32625683f62d0ed4a61f selinux-mysql-20050813.ebuild 332
 MD5 a9091c4fc27d6312a1942f60d0715047 selinux-mysql-20050605.ebuild 435
 MD5 67732ac78a96221074803ff71e701022 selinux-mysql-20050408.ebuild 435
+MD5 f21ad3e898fb3f64fec8d14949d0bd73 files/digest-selinux-mysql-20050813 73
 MD5 09338486450859ac1f90c8387ae03be0 files/digest-selinux-mysql-20050408 73
 MD5 95b181aed42460f40e3aabd98bf6bcbb files/digest-selinux-mysql-20050605 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCv9F9GSBEIeh4AEYRArbzAJ4rzQczoIinSqPIrXC6Rc+1jXoXggCfcf0t
-Ig497EJpHQDPUrTBROJHyAc=
-=VKag
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050813 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050813
new file mode 100644
index 000000000000..2e39784a5628
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050813
@@ -0,0 +1 @@
+MD5 1bdaa63ef8ec3ebb6dc290bbb64b7e80 selinux-mysql-20050813.tar.bz2 1190
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050813.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20050813.ebuild
new file mode 100644
index 000000000000..fb35565bf4c8
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-20050813.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-mysql/selinux-mysql-20050813.ebuild,v 1.1 2005/08/20 17:30:04 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="mysqld.te"
+FCFILES="mysqld.fc"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
+
+DESCRIPTION="SELinux policy for mysql"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+
diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index 042950e90e5a..dd6099e06384 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.11 2005/05/07 07:02:15 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.12 2005/08/20 17:32:23 kaiowas Exp $
+
+*selinux-postgresql-20050813 (20 Aug 2005)
+
+  20 Aug 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-postgresql-20050813.ebuild:
+  merge with upstream
 
   07 May 2005; petre rodan <kaiowas@gentoo.org>
   selinux-postgresql-20050408.ebuild:
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 9a4414e8d5a6..a8c7f0e4281b 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fe7879d5ce04b14e2ea9796630287ed2 ChangeLog 1937
 MD5 169761c63f66d24015db4b712ba378b6 metadata.xml 513
 MD5 c519f62cf24c2ca4cb417333fbeaea0a selinux-postgresql-20050219.ebuild 458
+MD5 02a5c55ebdeea58d5aeaed0cd9fc9b32 selinux-postgresql-20050813.ebuild 345
 MD5 413c85146399873f85635d5643d46d2f selinux-postgresql-20050408.ebuild 458
 MD5 bb44fcbe364e5daf5c167ab23abfd41d files/digest-selinux-postgresql-20050219 78
 MD5 94ca7cdaff211c7d63f091b3bd836052 files/digest-selinux-postgresql-20050408 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCfGazGSBEIeh4AEYRAp5PAKCLN//slcmBrptXJztBuIOUbL9LyQCbBnvn
-xu/vfpTMDLXsfAB33cGQqo8=
-=Wba+
------END PGP SIGNATURE-----
+MD5 1c6cd8797aa3231ec153b7283534dbcb files/digest-selinux-postgresql-20050813 78
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050813 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050813
new file mode 100644
index 000000000000..46958eec138e
--- /dev/null
+++ b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050813
@@ -0,0 +1 @@
+MD5 ca2b7bd62ce23d072db0a6bf22201ddf selinux-postgresql-20050813.tar.bz2 1697
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-20050813.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-20050813.ebuild
new file mode 100644
index 000000000000..dac04b280861
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-20050813.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-postgresql/selinux-postgresql-20050813.ebuild,v 1.1 2005/08/20 17:32:23 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="postgresql.te"
+FCFILES="postgresql.fc"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
+
+DESCRIPTION="SELinux policy for PostgreSQL"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+
diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog
index e9e4f2478659..b52f85efcf85 100644
--- a/sec-policy/selinux-spamassassin/ChangeLog
+++ b/sec-policy/selinux-spamassassin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2005/06/26 17:41:07 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.11 2005/08/20 17:36:52 kaiowas Exp $
+
+*selinux-spamassassin-20050813 (20 Aug 2005)
+
+  20 Aug 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-spamassassin-20050813.ebuild:
+  merge with upstream
 
   26 Jun 2005; petre rodan <kaiowas@gentoo.org>
   selinux-spamassassin-20050626.ebuild:
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 8e063759d961..cae9dd141846 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e2e6ac50f56c615f306349207f11e757 ChangeLog 1894
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
 MD5 18080462affd3a3fc122c8b13a59d3c0 selinux-spamassassin-20050219.ebuild 536
 MD5 0894f4a1f4ece543c952bad5ad946ee3 selinux-spamassassin-20050626.ebuild 537
+MD5 3078d07e2a13403d0b0cc23bbfd23faf selinux-spamassassin-20050813.ebuild 419
 MD5 7e66aa08556496f9ffdc252678e1d499 files/digest-selinux-spamassassin-20050219 80
 MD5 d0146c7441c2c356fa69f0c0373696a0 files/digest-selinux-spamassassin-20050626 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvstJGSBEIeh4AEYRAiSwAJ4slF/jnv90MgeT69VFgcvIgDjdSgCdGe2e
-mMLm87CT27Q14HhGYsxpTRw=
-=mvpU
------END PGP SIGNATURE-----
+MD5 6de8adf3e2560698eda37e4209e044ed files/digest-selinux-spamassassin-20050813 80
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050813 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050813
new file mode 100644
index 000000000000..3c110ebc3702
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050813
@@ -0,0 +1 @@
+MD5 d9181e1c99fc13a7889bdbb6b16cc414 selinux-spamassassin-20050813.tar.bz2 2294
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20050813.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050813.ebuild
new file mode 100644
index 000000000000..7d472bdd110e
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050813.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-20050813.ebuild,v 1.1 2005/08/20 17:36:52 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-20050618"
+
+DESCRIPTION="SELinux policy for SpamAssassin"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
+