merge with upstream

Package-Manager: portage-2.0.53_rc7

23 files changed, 55 insertions, 95 deletions

diff --git a/sec-policy/selinux-dhcp/ChangeLog b/sec-policy/selinux-dhcp/ChangeLog
index 72e715d357ea..af2da3b59efb 100644
--- a/sec-policy/selinux-dhcp/ChangeLog
+++ b/sec-policy/selinux-dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-dhcp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.16 2005/10/27 18:57:35 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.17 2005/11/28 09:00:50 kaiowas Exp $
+
+*selinux-dhcp-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-dhcp-20050219.ebuild, -selinux-dhcp-20050626.ebuild,
+  +selinux-dhcp-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org>
   selinux-dhcp-20050918.ebuild:
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 49e9f38fa371..10344ad2e16f 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c759e2efc5805645f2f0c6abf33e8471 ChangeLog 2572
-MD5 c38614a55c5f54b18268f8c541434a7e files/digest-selinux-dhcp-20050219 72
-MD5 95a3f8ad38a7e50ec90cdca31019514d files/digest-selinux-dhcp-20050626 72
 MD5 630924bef3f1b5eed9aeeefc248f0da0 files/digest-selinux-dhcp-20050918 72
+MD5 16b8a57d107cd11d31d8422743e7b1b8 files/digest-selinux-dhcp-20051122 72
 MD5 30408c1d604aa79a5d18881b61cb68c7 metadata.xml 548
-MD5 4f095558e9e2ed863a787c1df9fb2ea4 selinux-dhcp-20050219.ebuild 385
-MD5 0b8870cddfcf292aba53930eef5e4085 selinux-dhcp-20050626.ebuild 437
 MD5 c5ff6e68f848fac7d322f663c933ba59 selinux-dhcp-20050918.ebuild 442
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYSQTGSBEIeh4AEYRAim4AKCBvF4n3ZXkWs3sqgxMnQXV8IkqPACaAsOt
-atR7Zj0c0QOvCyQLiysVKyk=
-=FDd1
------END PGP SIGNATURE-----
+MD5 b8ec861d8e641dd64416522d0252fd84 selinux-dhcp-20051122.ebuild 336
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219
deleted file mode 100644
index 7478c04daefd..000000000000
--- a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219
+++ /dev/null
@@ -1 +0,0 @@
-MD5 322f4a7a575c2d4d04562719e1b0d082 selinux-dhcp-20050219.tar.bz2 1503
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050626 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050626
deleted file mode 100644
index 636061bf7c0b..000000000000
--- a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ed7f762462601382d9dd892cd95a469 selinux-dhcp-20050626.tar.bz2 1493
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20051122 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20051122
new file mode 100644
index 000000000000..de7a276e1050
--- /dev/null
+++ b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20051122
@@ -0,0 +1 @@
+MD5 253ef0f65e307059b1011d42d405c104 selinux-dhcp-20051122.tar.bz2 1528
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild
deleted file mode 100644
index b80144d471ce..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild
+++ /dev/null
@@ -1,14 +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-dhcp/selinux-dhcp-20050219.ebuild,v 1.2 2005/03/23 07:38:05 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="dhcpd.te"
-FCFILES="dhcpd.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for dhcp server"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-20050626.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-20051122.ebuild
index 575f7a1dce3e..bc3420486c3e 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-20050626.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-20051122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-20050626.ebuild,v 1.2 2005/06/26 16:56:53 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-20051122.ebuild,v 1.1 2005/11/28 09:00:50 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for dhcp server"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 
diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index f15db2b7ca61..07002a1564b1 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.14 2005/09/18 10:04:26 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.15 2005/11/28 09:04:44 kaiowas Exp $
+
+*selinux-gnupg-20051023 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-gnupg-20050626.ebuild, +selinux-gnupg-20051023.ebuild:
+  merge with upstream
 
   18 Sep 2005; petre rodan <kaiowas@gentoo.org>
   selinux-gnupg-20050626.ebuild, selinux-gnupg-20050823.ebuild:
diff --git a/sec-policy/selinux-gnupg/Manifest b/sec-policy/selinux-gnupg/Manifest
index 41289f889a36..eef333bff272 100644
--- a/sec-policy/selinux-gnupg/Manifest
+++ b/sec-policy/selinux-gnupg/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 29386ca787c43e0a44ad713ebea2bd04 ChangeLog 2338
+MD5 2a4ba2ffdcc7c7e2daedfe3ef3254315 files/digest-selinux-gnupg-20050823 73
+MD5 f74cc929ec1ea0d326e586d3c60e5662 files/digest-selinux-gnupg-20051023 73
 MD5 ead6a56acfba29bb5e0b072575e0c83d metadata.xml 383
-MD5 5cd4d9f7812518964e09374be37a5fd0 selinux-gnupg-20050626.ebuild 469
 MD5 f8aca4c2f0c55aa258a917e35706a878 selinux-gnupg-20050823.ebuild 469
-MD5 21fc3844909bff919f6d9316940d84d2 files/digest-selinux-gnupg-20050626 73
-MD5 2a4ba2ffdcc7c7e2daedfe3ef3254315 files/digest-selinux-gnupg-20050823 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDLS9hGSBEIeh4AEYRAs+AAJ42lVh4G5SMPF5waXBFLDFPCbaXvgCfdLCR
-/TqU/jtOt3vRRrW1KLsZGLk=
-=a3wN
------END PGP SIGNATURE-----
+MD5 f9c9f9d0513f5c882d2c069803813440 selinux-gnupg-20051023.ebuild 361
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050626 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050626
deleted file mode 100644
index acaf7b6b9c17..000000000000
--- a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4e008230ceaf9744987c94b61a50a1b selinux-gnupg-20050626.tar.bz2 3009
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20051023 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20051023
new file mode 100644
index 000000000000..6ee9fd16a931
--- /dev/null
+++ b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20051023
@@ -0,0 +1 @@
+MD5 b63d9685478229925e497c84379c1fcc selinux-gnupg-20051023.tar.bz2 2934
diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20050626.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20051023.ebuild
index 08aac738f0eb..14e85730964d 100644
--- a/sec-policy/selinux-gnupg/selinux-gnupg-20050626.ebuild
+++ b/sec-policy/selinux-gnupg/selinux-gnupg-20051023.ebuild
@@ -1,6 +1,6 @@
 # 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-20050626.ebuild,v 1.4 2005/09/18 10:04:26 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/selinux-gnupg-20051023.ebuild,v 1.1 2005/11/28 09:04:44 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -12,5 +12,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for GNU privacy guard"
 
-KEYWORDS="amd64 mips ppc sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 
diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index 412a02b3b1da..04a4f22f65c2 100644
--- a/sec-policy/selinux-mysql/ChangeLog
+++ b/sec-policy/selinux-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mysql
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.15 2005/10/27 19:01:38 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.16 2005/11/28 09:07:19 kaiowas Exp $
+
+*selinux-mysql-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-mysql-20050605.ebuild, +selinux-mysql-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org>
   selinux-mysql-20051023.ebuild:
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 6ae1430c5a29..4b491b13fd0f 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fa9807bad61f09a5308c88dda08e3c6c ChangeLog 2337
-MD5 95b181aed42460f40e3aabd98bf6bcbb files/digest-selinux-mysql-20050605 73
 MD5 2080fa4a60e9b1e15f533a6685124fb8 files/digest-selinux-mysql-20051023 73
+MD5 d30135f78d0f9a4110b760747512e19b files/digest-selinux-mysql-20051122 73
 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
-MD5 a9091c4fc27d6312a1942f60d0715047 selinux-mysql-20050605.ebuild 435
 MD5 7af3ba42bb882d2f6ab17db4d5bf167c selinux-mysql-20051023.ebuild 440
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYST2GSBEIeh4AEYRAu4/AJ4/J+CKyzNHWdMAteWihLRk/q4fHgCfTIaI
-TwXD1x9QFvz1iq41pQCbM0w=
-=Ssb3
------END PGP SIGNATURE-----
+MD5 fd3f989400f72c073d2050f72d0fac12 selinux-mysql-20051122.ebuild 332
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605
deleted file mode 100644
index f60d1aba5865..000000000000
--- a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605
+++ /dev/null
@@ -1 +0,0 @@
-MD5 caf039db9bb2085462e10c7740542067 selinux-mysql-20050605.tar.bz2 1168
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122
new file mode 100644
index 000000000000..13294f5882f8
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122
@@ -0,0 +1 @@
+MD5 925cdc451364a2870320990220abc93a selinux-mysql-20051122.tar.bz2 1235
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild
index 161a850ab571..48b9775bda48 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild
@@ -1,6 +1,6 @@
 # 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-20050605.ebuild,v 1.2 2005/06/27 11:34:54 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild,v 1.1 2005/11/28 09:07:19 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for mysql"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 
diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index db992d352440..0dbace0b2966 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.17 2005/10/27 19:03:26 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.18 2005/11/28 09:09:55 kaiowas Exp $
+
+*selinux-ntp-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-ntp-20050918.ebuild, +selinux-ntp-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org> selinux-ntp-20051023.ebuild:
   mark stable on amd64 mips ppc sparc x86
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 17002325d349..2433f153c70c 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 64fb8645db41149e5692179069015307 ChangeLog 2364
-MD5 61c66db11638dd8eb879fa487fa4750b files/digest-selinux-ntp-20050918 71
 MD5 e0719cd21ec4ffcd66c3c1d57cbcc596 files/digest-selinux-ntp-20051023 71
+MD5 6874234b1f5a59a5f421fd50c8a56bdc files/digest-selinux-ntp-20051122 71
 MD5 ed58290361b061defc07c7f48ee829af metadata.xml 532
-MD5 8f7d71e14e5f15877334aef6bfb809d1 selinux-ntp-20050918.ebuild 459
 MD5 848b9309a916d59d15da445e5759749f selinux-ntp-20051023.ebuild 459
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYSVuGSBEIeh4AEYRAgDrAJ9hYpq0I/oHqgliKw44M8p8xjeVkgCggUus
-8F69oY4XeqljhWBDOqNI1AQ=
-=fWxG
------END PGP SIGNATURE-----
+MD5 9462ef5eebc48ad0691093b9fd576b0b selinux-ntp-20051122.ebuild 355
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918
deleted file mode 100644
index ebb302ea7ed9..000000000000
--- a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62b7c72ba016b7cb32d19860fd1eb666 selinux-ntp-20050918.tar.bz2 1437
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122
new file mode 100644
index 000000000000..0e81caa0b1e9
--- /dev/null
+++ b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122
@@ -0,0 +1 @@
+MD5 70378c6a643440032eee2961da70a39c selinux-ntp-20051122.tar.bz2 1483
diff --git a/sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild
index 94e3ca70f2c6..a455151fcc84 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild
@@ -1,6 +1,6 @@
 # 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-20050918.ebuild,v 1.2 2005/10/18 10:42:19 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild,v 1.1 2005/11/28 09:09:55 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for the network time protocol daemon"
 
-KEYWORDS="amd64 mips ppc sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 
diff --git a/sec-policy/selinux-openldap/Manifest b/sec-policy/selinux-openldap/Manifest
index 3da8e9dcf731..6689f7d5047b 100644
--- a/sec-policy/selinux-openldap/Manifest
+++ b/sec-policy/selinux-openldap/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 46ab9e9695e0f9bf7a070c64e8cd70ec ChangeLog 388
-MD5 a5bea22a8c01550a4e15eafb2e91bb78 metadata.xml 522
-MD5 0be51f3075370df9637077a9e210a1a2 selinux-openldap-20050626.ebuild 453
+MD5 b608d9bf60f75bbf230a63959e0b658b ChangeLog 615
 MD5 345366230c8459cb246f52f09be78d5a files/digest-selinux-openldap-20050626 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvvdfGSBEIeh4AEYRAmW4AJoCWX67S2NpbY+Q0gn+OuU1jAFKsQCdHCa1
-CdoRRRk3OFW8kZ6IYfLk1fY=
-=Wwl7
------END PGP SIGNATURE-----
+MD5 447a5b942f75c925db5020c5f684b693 files/digest-selinux-openldap-20051122 76
+MD5 a5bea22a8c01550a4e15eafb2e91bb78 metadata.xml 522
+MD5 5258eee88394ed387b2ca3520d4209a8 selinux-openldap-20050626.ebuild 454
+MD5 3be359c3f6eba7111b13f099b405eb9f selinux-openldap-20051122.ebuild 459