Added two security patches for konqueror. Fixes bug 185603.

Package-Manager: portage-2.1.3.9

9 files changed, 251 insertions, 73 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 8c8b2a5193ae..ee36040bdefe 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Gentoo_Bugzilla.desktop 283 RMD160 84ec8315ffead9bc04bc358d971e7ab653971f17 SHA1 65d287acd1d1dfc0ce158891fb555877cbad559e SHA256 6c72e294f8e11d2e3fe6ca26d004d6926530e9ed919c2ed4c8f7b1361ef18ddf
 MD5 623e6822f901f18407fc96b8ac0daa30 files/Gentoo_Bugzilla.desktop 283
 RMD160 84ec8315ffead9bc04bc358d971e7ab653971f17 files/Gentoo_Bugzilla.desktop 283
@@ -38,6 +41,14 @@ AUX kdesktop-3.5.3-screensaver.patch 3336 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f
 MD5 c1c21846f3ff96630e1faebbd6a450c8 files/kdesktop-3.5.3-screensaver.patch 3336
 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f5e0f26bd2 files/kdesktop-3.5.3-screensaver.patch 3336
 SHA256 0e6fa9e399914805c72042ddb358ea3760f30f6d1b2b782f744a3fe20d9c18d8 files/kdesktop-3.5.3-screensaver.patch 3336
+AUX kdm-3.5.7-login.diff 1605 RMD160 4322545997610c528e56d6b810ebbda8ff4095d0 SHA1 b270a1d5b3980f49a274308bec7fc649be1bd315 SHA256 c1edb2d2377f1f090262cce6cd92504a6a49cb15089e195778acae5e9b2ed384
+MD5 ee6c57046902c5b5a32a4699558baafc files/kdm-3.5.7-login.diff 1605
+RMD160 4322545997610c528e56d6b810ebbda8ff4095d0 files/kdm-3.5.7-login.diff 1605
+SHA256 c1edb2d2377f1f090262cce6cd92504a6a49cb15089e195778acae5e9b2ed384 files/kdm-3.5.7-login.diff 1605
+AUX konqueror-3.5.7-185603-spoofing.diff 1901 RMD160 bb59c1e78e5709d72b123c5b3b5a538fc09f564e SHA1 3868392701ebe9fce14567a1f52d458d00f31287 SHA256 70a5022b38aa93616032c02518b66a9b938f17aa42c14a9b1de71d0ee73d1e72
+MD5 e15d6b5580c5a20ab935f8e553d113e0 files/konqueror-3.5.7-185603-spoofing.diff 1901
+RMD160 bb59c1e78e5709d72b123c5b3b5a538fc09f564e files/konqueror-3.5.7-185603-spoofing.diff 1901
+SHA256 70a5022b38aa93616032c02518b66a9b938f17aa42c14a9b1de71d0ee73d1e72 files/konqueror-3.5.7-185603-spoofing.diff 1901
 AUX konqueror-3.5.7-location.patch 454 RMD160 868630c762c1c35174fc3d7c0b1de83711c31c13 SHA1 79be2ce4f11a0c0054952cf279a08ab9ca3f1b4a SHA256 f22aaf1dcb994f5e2fb87483489184527f0ff9b1f42162e56ed37c79c668236c
 MD5 c4ab2990ca8270c5fbe13d5d3bdb933f files/konqueror-3.5.7-location.patch 454
 RMD160 868630c762c1c35174fc3d7c0b1de83711c31c13 files/konqueror-3.5.7-location.patch 454
@@ -101,14 +112,18 @@ EBUILD kdebase-3.5.7-r3.ebuild 6924 RMD160 806ea57dcccc13288d61189b2fd8cf6a52719
 MD5 53e410e5605521b3c64b92f96e7fc40c kdebase-3.5.7-r3.ebuild 6924
 RMD160 806ea57dcccc13288d61189b2fd8cf6a52719337 kdebase-3.5.7-r3.ebuild 6924
 SHA256 bdf0050f28fe28c99daab7e9eab000f4e2e717a8c483d397bd3de9c5c3586483 kdebase-3.5.7-r3.ebuild 6924
+EBUILD kdebase-3.5.7-r4.ebuild 7033 RMD160 f83359ed8549172f964a7c2892d7cb69e859e11c SHA1 9ac050329edbf71bc66dd02c32d330435eddce00 SHA256 a04214e329853a7df6b6b65299a12c0dfb316d679baeaaf4611c13e4707fdf83
+MD5 a835fdf67b918579b4b0a62b8a6fa45c kdebase-3.5.7-r4.ebuild 7033
+RMD160 f83359ed8549172f964a7c2892d7cb69e859e11c kdebase-3.5.7-r4.ebuild 7033
+SHA256 a04214e329853a7df6b6b65299a12c0dfb316d679baeaaf4611c13e4707fdf83 kdebase-3.5.7-r4.ebuild 7033
 EBUILD kdebase-3.5.7.ebuild 6847 RMD160 1590a7650da88fe4f803bca917607486c359ce60 SHA1 4198e372ec9f923a49615fac7808f84a9539cfef SHA256 2d99aa76a3685bf1a3b734fb7653a99aeee5e110721ba668ed180b8691f84a2a
 MD5 6a4ddfc4f66484c756001dc2b3442d5d kdebase-3.5.7.ebuild 6847
 RMD160 1590a7650da88fe4f803bca917607486c359ce60 kdebase-3.5.7.ebuild 6847
 SHA256 2d99aa76a3685bf1a3b734fb7653a99aeee5e110721ba668ed180b8691f84a2a kdebase-3.5.7.ebuild 6847
-MISC ChangeLog 65408 RMD160 cb7decb84e3b07d630b784423da5942928288d1f SHA1 1600e08024b1f6542faf5a3d289aff3efa905eb1 SHA256 25a469b38991a7a65578367fd51bb7f5e7c6b4e07d63bc76f70c807fa21eddf3
-MD5 c11674bf4189fe76fa266526b069582e ChangeLog 65408
-RMD160 cb7decb84e3b07d630b784423da5942928288d1f ChangeLog 65408
-SHA256 25a469b38991a7a65578367fd51bb7f5e7c6b4e07d63bc76f70c807fa21eddf3 ChangeLog 65408
+MISC ChangeLog 65732 RMD160 827e5d01183525ad114466673590370c3bf36fce SHA1 adf757028b8ed4bc6329d37a36d5a4d068a52b41 SHA256 89224538bed9ec38a532ee669b0d08ddb1487c7183f5f61f60d07f9c3a332cb6
+MD5 4955b0ac8116f88fa3c07de8b81bfddc ChangeLog 65732
+RMD160 827e5d01183525ad114466673590370c3bf36fce ChangeLog 65732
+SHA256 89224538bed9ec38a532ee669b0d08ddb1487c7183f5f61f60d07f9c3a332cb6 ChangeLog 65732
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -146,3 +161,13 @@ SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/di
 MD5 91031e1db8acedf8afd843e7ba6b0a2b files/digest-kdebase-3.5.7-r3 521
 RMD160 24faa4a41734d82086e89a067beb842df88fef78 files/digest-kdebase-3.5.7-r3 521
 SHA256 b2ab263435b90f12fd375094bcf566dd243d79fac6262318859828f5dcdcd01c files/digest-kdebase-3.5.7-r3 521
+MD5 91031e1db8acedf8afd843e7ba6b0a2b files/digest-kdebase-3.5.7-r4 521
+RMD160 24faa4a41734d82086e89a067beb842df88fef78 files/digest-kdebase-3.5.7-r4 521
+SHA256 b2ab263435b90f12fd375094bcf566dd243d79fac6262318859828f5dcdcd01c files/digest-kdebase-3.5.7-r4 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG6HR+CkvF58q80IkRAnL7AJ9+5X1DqebJRViDqs5RBSr/6BLa4ACfdgZH
+AX2Sh84ORxsVWtr4TUQFi1o=
+=J2Y1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 4ec07f8ad5e6..c239de1e41a7 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.482 2007/08/30 22:22:46 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.483 2007/09/12 23:18:53 philantrop Exp $
+
+*kdelibs-3.5.7-r3 (12 Sep 2007)
+
+  12 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/konqueror-3.5.7-185603-spoofing.diff,
+  +files/kdelibs-3.5.7-kcookiejar.diff, -kdelibs-3.5.5-r4.ebuild,
+  +kdelibs-3.5.7-r3.ebuild:
+  Added two security patches for konqueror. Fixes bug 185603. Removed obsolete
+  version.
 
   30 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
   kdelibs-3.5.5-r10.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 2ef69f9cbdd2..e873579c7721 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -49,6 +49,14 @@ AUX kdelibs-3.5.7-html-style.patch 517 RMD160 99e287e3629e0eb8533ef56006005f3c58
 MD5 5fb43f01985f8e8cfabe2864f2285276 files/kdelibs-3.5.7-html-style.patch 517
 RMD160 99e287e3629e0eb8533ef56006005f3c588460d8 files/kdelibs-3.5.7-html-style.patch 517
 SHA256 f306c01fa0da370ecfec9887e9b8c4828437e4bfbc30c84cf5ff2bc5939a1c18 files/kdelibs-3.5.7-html-style.patch 517
+AUX kdelibs-3.5.7-kcookiejar.diff 2004 RMD160 aa7c9bb3666554b8a921c4e6ca03a7504cdceaf8 SHA1 049d2c19e73f311626072e89e2c2356a7607188e SHA256 f2bc23b37e37739cd4cbb8e5a661a368eb0a7ffcf862f2990e3c2f5297184d38
+MD5 5a4f0c1b7c39bdaa3e6721b88d3cabca files/kdelibs-3.5.7-kcookiejar.diff 2004
+RMD160 aa7c9bb3666554b8a921c4e6ca03a7504cdceaf8 files/kdelibs-3.5.7-kcookiejar.diff 2004
+SHA256 f2bc23b37e37739cd4cbb8e5a661a368eb0a7ffcf862f2990e3c2f5297184d38 files/kdelibs-3.5.7-kcookiejar.diff 2004
+AUX konqueror-3.5.7-185603-spoofing.diff 1099 RMD160 4c870aa06611163ebcd57a1a0857f9decbbe5620 SHA1 de60f5f62aceb5faf522e22c5fa160bf08e80fe3 SHA256 bc74315716148b4b088de127ff3586680698ced775c3fe5792597f09e8f732d6
+MD5 4c0fb2576875ded606f276421fc49752 files/konqueror-3.5.7-185603-spoofing.diff 1099
+RMD160 4c870aa06611163ebcd57a1a0857f9decbbe5620 files/konqueror-3.5.7-185603-spoofing.diff 1099
+SHA256 bc74315716148b4b088de127ff3586680698ced775c3fe5792597f09e8f732d6 files/konqueror-3.5.7-185603-spoofing.diff 1099
 DIST kdelibs-3.5-patchset-05.tar.bz2 36423 RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 SHA1 138232cf05ab131a51f3b3febfdd8a3cbc42d45f SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a
 DIST kdelibs-3.5-patchset-08.tar.bz2 19973 RMD160 ea2edb4973cca353baabc89559f11c3db76c9ab2 SHA1 4c17a0b5577e98e28444f5e038ed06e3b2382c12 SHA256 24461470100d91c1374f5257be5e73767389df9ce8fb9e26af8b6b2030c3963a
 DIST kdelibs-3.5-patchset-09.tar.bz2 19635 RMD160 c4b60c466ba1625c61259b075fd2b7815b5c1b06 SHA1 7bb4d04c5256d2ca2dc5acc8ea12d4b35a1c347c SHA256 d48a856f2fefe79d3b2064b506ba24cf37b5071cdbbb4eea3cdd78c65a38a94b
@@ -62,10 +70,6 @@ EBUILD kdelibs-3.5.5-r10.ebuild 6466 RMD160 9f8614e25835648132eaf4d80b9635b502a5
 MD5 a5beb9cddbe2d16afe2036c8f13d61e5 kdelibs-3.5.5-r10.ebuild 6466
 RMD160 9f8614e25835648132eaf4d80b9635b502a5ee32 kdelibs-3.5.5-r10.ebuild 6466
 SHA256 e774caf21c5f7d0dee157f2ac5929933b63f3623004029f10579411a8a8fa10f kdelibs-3.5.5-r10.ebuild 6466
-EBUILD kdelibs-3.5.5-r4.ebuild 5789 RMD160 cb1dba510ecc6c984401b86ccf9fc94aa64d190b SHA1 1de85934665131805a2b3141772115d6454caf6a SHA256 16a1da8ad3d1f9d358956c04d56792b216739db68c488ff3db59d437a550dc80
-MD5 12710193caa5fb503a4e2bf11141c61c kdelibs-3.5.5-r4.ebuild 5789
-RMD160 cb1dba510ecc6c984401b86ccf9fc94aa64d190b kdelibs-3.5.5-r4.ebuild 5789
-SHA256 16a1da8ad3d1f9d358956c04d56792b216739db68c488ff3db59d437a550dc80 kdelibs-3.5.5-r4.ebuild 5789
 EBUILD kdelibs-3.5.6-r10.ebuild 5970 RMD160 104b94245e7bd8817c8b67f894b6feef96b2280d SHA1 a5ba0a632a540675630152965f13791edbf5d03c SHA256 c137170556923651f01fcbf04a2f1383dae7701695e7dcd20d7b201cc74d7f06
 MD5 4bcf9a66e512780fa92d6345a19b8c8c kdelibs-3.5.6-r10.ebuild 5970
 RMD160 104b94245e7bd8817c8b67f894b6feef96b2280d kdelibs-3.5.6-r10.ebuild 5970
@@ -90,14 +94,18 @@ EBUILD kdelibs-3.5.7-r2.ebuild 5971 RMD160 be52fc296adc902371702080340029b096cce
 MD5 9fc9d3575034ea09849baa6a741ed1b2 kdelibs-3.5.7-r2.ebuild 5971
 RMD160 be52fc296adc902371702080340029b096cceb9c kdelibs-3.5.7-r2.ebuild 5971
 SHA256 43f80f9872278c65d2f100426ed1841858a59028ee7558c7dac2a346b88d38d1 kdelibs-3.5.7-r2.ebuild 5971
+EBUILD kdelibs-3.5.7-r3.ebuild 6081 RMD160 8d7b1156efaa444e22b4b8d7564ca4973cf65a9e SHA1 8ab99cc81dd588d4bd581cf85d20fb23bb3f50c8 SHA256 47a820fd3d54f02ac8d7cbb9b4e9e6faec58299cda3c8f1279e78596ccaa5e2d
+MD5 828ea13baaaa144482721441c17b2e9f kdelibs-3.5.7-r3.ebuild 6081
+RMD160 8d7b1156efaa444e22b4b8d7564ca4973cf65a9e kdelibs-3.5.7-r3.ebuild 6081
+SHA256 47a820fd3d54f02ac8d7cbb9b4e9e6faec58299cda3c8f1279e78596ccaa5e2d kdelibs-3.5.7-r3.ebuild 6081
 EBUILD kdelibs-3.5.7.ebuild 6010 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 SHA1 fe2cd018d634674f793aa38ebdc13d8dec6708a7 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9
 MD5 36327ad34df10d38d9db0845cae8b5a3 kdelibs-3.5.7.ebuild 6010
 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 kdelibs-3.5.7.ebuild 6010
 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9 kdelibs-3.5.7.ebuild 6010
-MISC ChangeLog 77946 RMD160 75747b2e96be75a7a7f0b14c3fe478704c39f117 SHA1 f1ea642dd7cfe54c7009a7130c4b577e50cf7199 SHA256 53754ecb62043114c6ed44b9bfdc6e5beb1bf55305452c2f8881475b9df880d0
-MD5 1fadcf133c44c8a002037392c2568c56 ChangeLog 77946
-RMD160 75747b2e96be75a7a7f0b14c3fe478704c39f117 ChangeLog 77946
-SHA256 53754ecb62043114c6ed44b9bfdc6e5beb1bf55305452c2f8881475b9df880d0 ChangeLog 77946
+MISC ChangeLog 78266 RMD160 9ee8e465b2f316240fa37519fcded27eb3c79fc5 SHA1 13e000d40d2dae265b0f994a69b731caec551712 SHA256 c4825a8a62dc53422298c7e0d9fa642f313e3e6fd81150d4c68ddab5deaeea16
+MD5 64ac43c9f0aaaba04588eb079360bd08 ChangeLog 78266
+RMD160 9ee8e465b2f316240fa37519fcded27eb3c79fc5 ChangeLog 78266
+SHA256 c4825a8a62dc53422298c7e0d9fa642f313e3e6fd81150d4c68ddab5deaeea16 ChangeLog 78266
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -105,9 +113,6 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 b3407b1b16a060400ebc8b3bcd89eef4 files/digest-kdelibs-3.5.5-r10 807
 RMD160 65dd009a5c3e9f9b44e7d277d761a586184f1c20 files/digest-kdelibs-3.5.5-r10 807
 SHA256 9180e5499945c7011b584d592a892bc3ecc4a2cfcc703ede9619ab6238639387 files/digest-kdelibs-3.5.5-r10 807
-MD5 4e084c981a53be48eb4df82f46649e60 files/digest-kdelibs-3.5.5-r4 521
-RMD160 b35a8ed3374893328cf91746946b98d833051692 files/digest-kdelibs-3.5.5-r4 521
-SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/digest-kdelibs-3.5.5-r4 521
 MD5 88f14e63fa00f46231fe54b6f00b06e0 files/digest-kdelibs-3.5.6-r10 807
 RMD160 56a896f6119083542fc5cf4a151bd3bf09c77b52 files/digest-kdelibs-3.5.6-r10 807
 SHA256 a3ed9fdd2abfa853f3ced0ac799aef42f959be09b763dc4ce405683f619b1f31 files/digest-kdelibs-3.5.6-r10 807
@@ -129,10 +134,13 @@ SHA256 d3a2c8324dcefa65441e567e04ee6433e738901062ade18d9f9c3ce1ce0aa294 files/di
 MD5 e8176359c956fdc46a08a89a47a65c1f files/digest-kdelibs-3.5.7-r2 807
 RMD160 3273e9ba2053fea20ecb33d32a551a87b1311b3a files/digest-kdelibs-3.5.7-r2 807
 SHA256 7420f254fcd924e81010df1070f7311e63fe02931a44332de1fbf7a51adb66a9 files/digest-kdelibs-3.5.7-r2 807
+MD5 e8176359c956fdc46a08a89a47a65c1f files/digest-kdelibs-3.5.7-r3 807
+RMD160 3273e9ba2053fea20ecb33d32a551a87b1311b3a files/digest-kdelibs-3.5.7-r3 807
+SHA256 7420f254fcd924e81010df1070f7311e63fe02931a44332de1fbf7a51adb66a9 files/digest-kdelibs-3.5.7-r3 807
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG10M/CkvF58q80IkRAj+wAJ4zcbmd7lNMQmprXySD7Jh9ojQSGQCgoLzL
-iWZjyqX/t69U524rJ8VdfiA=
-=ppUu
+iD8DBQFG6HPpCkvF58q80IkRAloCAJ9kVyi3ZnN+NoSpoyXI9eSrvrFQwgCeKrAm
+oOKpz8BS6k41vg7Mrzkcqlc=
+=IZqw
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r4 b/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r4
deleted file mode 100644
index 79c37c4a8348..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
-RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
-SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
-MD5 2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 15486690
-RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 kdelibs-3.5.5.tar.bz2 15486690
-SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 kdelibs-3.5.5.tar.bz2 15486690
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.7-r3 b/kde-base/kdelibs/files/digest-kdelibs-3.5.7-r3
new file mode 100644
index 000000000000..78f590de0575
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.7-r3
@@ -0,0 +1,9 @@
+MD5 1ebab8b66b53b8469e92752f128802ce kdelibs-3.5-patchset-10.tar.bz2 19407
+RMD160 ae0617dbff497751b51859d55ae45a756e69b0c0 kdelibs-3.5-patchset-10.tar.bz2 19407
+SHA256 6fca1c1718bb628c5980da797858eeef003e57ae0f1ba89ffbd1afe20d9df975 kdelibs-3.5-patchset-10.tar.bz2 19407
+MD5 34110d31ae3f56fb37c8a789bffdf65d kdelibs-3.5.7-seli-xinerama.patch.bz2 5226
+RMD160 9eab19cc60cb71d66c0e074242b691c5e8c0c391 kdelibs-3.5.7-seli-xinerama.patch.bz2 5226
+SHA256 6f710ca8d0b3c4789751a1e4630442d04830a8f5aef163d9fd6823bbd6e4e202 kdelibs-3.5.7-seli-xinerama.patch.bz2 5226
+MD5 50ed644f2ec91963570fe2b155652957 kdelibs-3.5.7.tar.bz2 15576038
+RMD160 006c57ef85956ed3903749cace254bdfdf2f347e kdelibs-3.5.7.tar.bz2 15576038
+SHA256 05bc5d0d18b787d964f7c45cc078b047d450d3ddc28b1bde839a26a2eda2c5d9 kdelibs-3.5.7.tar.bz2 15576038
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.7-kcookiejar.diff b/kde-base/kdelibs/files/kdelibs-3.5.7-kcookiejar.diff
new file mode 100644
index 000000000000..5ff4a8da3686
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.7-kcookiejar.diff
@@ -0,0 +1,59 @@
+Index: kcookiejar.cpp
+===================================================================
+--- kdelibs-3.5.7.orig/kioslave/http/kcookiejar/kcookiejar.cpp	(revision 707307)
++++ kdelibs-3.5.7/kioslave/http/kcookiejar/kcookiejar.cpp	(working copy)
+@@ -981,44 +981,27 @@
+ //
+ KCookieAdvice KCookieJar::cookieAdvice(KHttpCookiePtr cookiePtr)
+ {
+-    QStringList domains;
+-
+     if (m_rejectCrossDomainCookies && cookiePtr->isCrossDomain())
+        return KCookieReject;
+ 
+-    if (m_autoAcceptSessionCookies && (cookiePtr->expireDate() == 0 ||
+-        m_ignoreCookieExpirationDate))
+-       return KCookieAccept;
++    QStringList domains;
+ 
+     extractDomains(cookiePtr->host(), domains);
+ 
+-    // If the cookie specifies a domain, check whether it is valid and
+-    // correct otherwise.
++    // If the cookie specifies a domain, check whether it is valid. Otherwise,
++    // accept the cookie anyways but removes the domain="" value to prevent
++    // cross-site cookie injection.
+     if (!cookiePtr->domain().isEmpty())
+     {
+-       bool valid = false;
+-
+-       // This checks whether the cookie is valid based on
+-       // what ::extractDomains returns
+-       if (!valid)
+-       {
+-          if (domains.contains(cookiePtr->domain()))
+-             valid = true;
+-       }
+-
+-       if (!valid)
+-       {
+-          // Maybe it points to a sub-domain
+-          if (cookiePtr->domain().endsWith("."+cookiePtr->host()))
+-             valid = true;
+-       }
+-
+-       if (!valid)
+-       {
++      if (!domains.contains(cookiePtr->domain()) && 
++          !cookiePtr->domain().endsWith("."+cookiePtr->host()))
+           cookiePtr->fixDomain(QString::null);
+-       }
+     }
+ 
++    if (m_autoAcceptSessionCookies && (cookiePtr->expireDate() == 0 ||
++        m_ignoreCookieExpirationDate))
++       return KCookieAccept;
++
+     KCookieAdvice advice = KCookieDunno;
+     bool isFQDN = true; // First is FQDN
+     QStringList::Iterator it = domains.begin(); // Start with FQDN which first in the list.
diff --git a/kde-base/kdelibs/files/konqueror-3.5.7-185603-spoofing.diff b/kde-base/kdelibs/files/konqueror-3.5.7-185603-spoofing.diff
new file mode 100644
index 000000000000..50a9ed17e1dc
--- /dev/null
+++ b/kde-base/kdelibs/files/konqueror-3.5.7-185603-spoofing.diff
@@ -0,0 +1,34 @@
+--- kdecore/kurl.cpp
++++ kdecore/kurl.cpp
+@@ -30,6 +30,7 @@
+ #include <kglobal.h>
+ #include <kidna.h>
+ #include <kprotocolinfo.h>
++#include <kstringhandler.h>
+ #endif
+ 
+ #include <stdio.h>
+@@ -183,7 +184,7 @@ static QString lazy_encode( const QStrin
+         (character == '?') || // Start of query delimiter
+         ((character == '@') && encodeAt) || // Username delimiter
+         (character == '#') || // Start of reference delimiter
+-        ((character == 32) && (i+1 == old_length))) // A trailing space
++        ((character == 32) && (i+1 == old_length || segment[i+1] == ' '))) // A trailing space
+     {
+       new_segment[ new_length++ ] = '%';
+ 
+@@ -1540,7 +1541,13 @@ QString KURL::prettyURL( int _trailing )
+     u += "//";
+     if ( hasUser() )
+     {
+-      u += lazy_encode(m_strUser);
++      QString s = m_strUser;
++#ifndef KDE_QT_ONLY
++      // shorten the username, its unlikely to be valid without password anyway
++      if (!hasPass())
++          s = KStringHandler::csqueeze(s, 16);
++#endif
++      u += encode(s, 0, 0);
+       // Don't show password!
+       u += "@";
+     }
diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
index eb46efc1650a..8f21eb7594ab 100644
--- a/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild,v 1.12 2007/07/22 10:50:03 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild,v 1.1 2007/09/12 23:18:53 philantrop Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -8,43 +8,44 @@ set-kdedir 3.5
 DESCRIPTION="KDE libraries needed by all KDE programs."
 HOMEPAGE="http://www.kde.org/"
 SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-05.tar.bz2"
+	mirror://gentoo/kdelibs-3.5-patchset-10.tar.bz2
+	mirror://gentoo/${PN}-3.5.7-seli-xinerama.patch.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
-KEYWORDS="alpha ~amd64 ~hppa ia64 mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
-zeroconf kernel_linux fam lua kdehiddenvisibility"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+avahi kernel_linux fam lua kdehiddenvisibility"
 
 # Added aspell-en as dependency to work around bug 131512.
+# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
 RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( ~kde-base/arts-${PV} )
+	arts? ( >=kde-base/arts-3.5.5 )
 	app-arch/bzip2
 	>=media-libs/freetype-2
 	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.15
+	>=dev-libs/libxslt-1.1.16
 	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
+	>=dev-libs/libpcre-6.6
 	media-libs/libart_lgpl
 	net-dns/libidn
+	>=dev-libs/openssl-0.9.7d
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
 	alsa? ( media-libs/alsa-lib )
 	cups? ( >=net-print/cups-1.1.19 )
 	tiff? ( media-libs/tiff )
 	kerberos? ( virtual/krb5 )
 	jpeg2k? ( media-libs/jasper )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	zeroconf? (	net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
+	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
 	fam? ( virtual/fam )
 	virtual/ghostscript
 	utempter? ( sys-libs/libutempter )
 	!kde-base/kde-env
 	lua? ( dev-lang/lua )
-	spell? ( app-text/aspell app-dicts/aspell-en )"
+	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
+	>=sys-apps/portage-2.1.2.11
+	!kde-base/ksync"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -54,9 +55,14 @@ RDEPEND="${RDEPEND}
 	x11-apps/rgb
 	x11-apps/iceauth"
 
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
+
 # Testing code is rather broken and merely for developer purposes, so disable it.
 RESTRICT="test"
 
+PATCHES="${FILESDIR}/konqueror-3.5.7-185603-spoofing.diff
+		${FILESDIR}/${P}-kcookiejar.diff"
+
 pkg_setup() {
 	if use legacyssl ; then
 		echo ""
@@ -65,9 +71,10 @@ pkg_setup() {
 		elog "For more information, see bug #128922."
 		echo ""
 	fi
+
 	if ! use utempter ; then
 		echo ""
-		elog "On some setups that relies on the correct update of utmp records, not using"
+		elog "On some setups, which rely on the correct update of utmp records, not using"
 		elog "utempter might not update them correctly. If you experience unexpected"
 		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
 		echo ""
@@ -85,40 +92,47 @@ pkg_setup() {
 
 src_unpack() {
 	kde_src_unpack
+
 	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch" || die "Patch did not apply."
+		# This patch won't be included upstream, see bug #128922.
+		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
 	fi
 
-	# Apply the following patch on the next revision of kdelibs-3.5.5 (fixes kde
-	# bug #135409), which corrects a nasty regression in the cstyle indenter.
-	epatch "${FILESDIR}/${P}-kate-cstyle-indenter-fix.diff"
-
-	# Fix kdeprint timeout when trying to connect to cupsd. Bug #151261.
-	epatch "${FILESDIR}/${P}-kdeprint-cupsd-timeout-fix.patch"
+	if use utempter ; then
+		# Bug #135818 is the eternal reference.
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
+	fi
 
-	# Fix rendering (see upstream bug #135639).
-	epatch "${FILESDIR}/${P}-khtml.patch"
+	if use branding ; then
+		# Add "(Gentoo)" to khtml user agent.
+		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+	fi
 
-	# Allow notification with arts disabled
-	epatch "${FILESDIR}/${P}-noarts.patch"
-	epatch "${FILESDIR}/${P}-noarts-2.patch"
+	# Xinerama patch from Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${DISTDIR}/${PN}-3.5.7-seli-xinerama.patch.bz2"
 }
 
 src_compile() {
 	rm -f "${S}/configure"
 
 	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			--with-libart --with-libidn --with-ssl
+			--without-hspell
 			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			--with-libart --with-libidn
-			$(use_with acl) $(use_with ssl)
-			$(use_with alsa) $(use_with arts)
+			$(use_with acl) $(use_with alsa)
+			$(use_with arts) $(use_enable cups)
 			$(use_with kerberos gssapi) $(use_with tiff)
 			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_enable cups) $(use_enable zeroconf dnssd)
 			$(use_with utempter) $(use_with lua)
 			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell) --without-hspell"
+			$(use_with spell aspell)"
+
+	if ! use avahi; then
+		myconf="${myconf} --enable-dnssd"
+	else
+		myconf="${myconf} --disable-dnssd"
+	fi
 
 	if has_version x11-apps/rgb; then
 		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
@@ -155,6 +169,11 @@ src_install() {
 		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
 	fi
 
+	# Get rid of the disabled version of the kdnsd libraries
+	if use avahi; then
+		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+	fi
+
 	dodir /etc/env.d
 
 	# List all the multilib libdirs
@@ -163,23 +182,23 @@ src_install() {
 		libdirs="${libdirs}:${PREFIX}/${libdir}"
 	done
 
+	# Please note that the KDE install path has to be the last value in KDEDIRS.
 	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
 PATH=${PREFIX}/bin
 ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
 LDPATH=${libdirs:1}
+MANPATH=${PREFIX}/share/man
 CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="${PREFIX}:/usr:/usr/local"
+KDEDIRS="/usr:/usr/local:${PREFIX}"
 #KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
 EOF
-}
 
-pkg_postinst() {
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-	fi
+	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
+	dodir /etc/revdep-rebuild
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
 }
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 02f15394675d..cdf02495766c 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdm-3.5.5-grub-patch.diff 941 RMD160 cec8ba370bc44c47c17ed3d12ffb42bcf5238344 SHA1 01b804deaffe0de66fe4c6843a21d1d0a87a4a2d SHA256 b8fdfe7df2bbc1854ce40f576e8310a95ef312c2749504caf7343c1c921d734b
 MD5 f8645dc5d0044476a01c9c6a95c4853f files/kdm-3.5.5-grub-patch.diff 941
 RMD160 cec8ba370bc44c47c17ed3d12ffb42bcf5238344 files/kdm-3.5.5-grub-patch.diff 941
@@ -6,6 +9,10 @@ AUX kdm-3.5.7-bsd-shutdown.patch 486 RMD160 da3ef89c1783f9eb357a9404f083d696df0e
 MD5 631bc916784b41da93be5bb6aa0f8b60 files/kdm-3.5.7-bsd-shutdown.patch 486
 RMD160 da3ef89c1783f9eb357a9404f083d696df0e51fa files/kdm-3.5.7-bsd-shutdown.patch 486
 SHA256 e7b1123b597f260ebbba5337a74648591bce19e332e6aaa61f9ea27f3f0bd8d8 files/kdm-3.5.7-bsd-shutdown.patch 486
+AUX kdm-3.5.7-login.diff 1605 RMD160 4322545997610c528e56d6b810ebbda8ff4095d0 SHA1 b270a1d5b3980f49a274308bec7fc649be1bd315 SHA256 c1edb2d2377f1f090262cce6cd92504a6a49cb15089e195778acae5e9b2ed384
+MD5 ee6c57046902c5b5a32a4699558baafc files/kdm-3.5.7-login.diff 1605
+RMD160 4322545997610c528e56d6b810ebbda8ff4095d0 files/kdm-3.5.7-login.diff 1605
+SHA256 c1edb2d2377f1f090262cce6cd92504a6a49cb15089e195778acae5e9b2ed384 files/kdm-3.5.7-login.diff 1605
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
@@ -27,14 +34,18 @@ EBUILD kdm-3.5.7-r1.ebuild 2412 RMD160 62e990d37428c0bd63d57c1d2d4618901cb1ba48
 MD5 4747d7708587273aaa20e4ada2018f03 kdm-3.5.7-r1.ebuild 2412
 RMD160 62e990d37428c0bd63d57c1d2d4618901cb1ba48 kdm-3.5.7-r1.ebuild 2412
 SHA256 536285b9372018cbe534fccb378103de8fd8e897f9663813b341a3717642bd8b kdm-3.5.7-r1.ebuild 2412
+EBUILD kdm-3.5.7-r2.ebuild 2444 RMD160 e34da09b1a1b885db85eefc7b4bf044ad5fba134 SHA1 c7adb0cc50e049421aae5e9646b17f51c59666d3 SHA256 4a57e35b3ead4e08f7994f65193eeb863d1575e7fea4b0cae34e9a53a913a0b7
+MD5 547006c46d92b06670f1ee07df6ba70f kdm-3.5.7-r2.ebuild 2444
+RMD160 e34da09b1a1b885db85eefc7b4bf044ad5fba134 kdm-3.5.7-r2.ebuild 2444
+SHA256 4a57e35b3ead4e08f7994f65193eeb863d1575e7fea4b0cae34e9a53a913a0b7 kdm-3.5.7-r2.ebuild 2444
 EBUILD kdm-3.5.7.ebuild 2354 RMD160 9e059db1dcade624c5e6fad6a7e70d73595aaeb9 SHA1 29cc4da5c738d2a113124337d5afcd009537f383 SHA256 19ec4f334b04dd17ab2fda0b17397afa572ee12df274ff7ff1db1a7fc8d8f3f6
 MD5 1e62f24e2ff07c8fcd09ba7c771848f6 kdm-3.5.7.ebuild 2354
 RMD160 9e059db1dcade624c5e6fad6a7e70d73595aaeb9 kdm-3.5.7.ebuild 2354
 SHA256 19ec4f334b04dd17ab2fda0b17397afa572ee12df274ff7ff1db1a7fc8d8f3f6 kdm-3.5.7.ebuild 2354
-MISC ChangeLog 13346 RMD160 ca5445acd835d1c0c36c0fe525d71c517c198ed1 SHA1 83c9422662d6e58481e90c9fabd8486c755581d7 SHA256 881d1a2187d5be84b9b8c921af74e1ef05b4e67c0b8bf561552d7db9b4829e63
-MD5 328587a3ba55a0dce181874a0e2cef1e ChangeLog 13346
-RMD160 ca5445acd835d1c0c36c0fe525d71c517c198ed1 ChangeLog 13346
-SHA256 881d1a2187d5be84b9b8c921af74e1ef05b4e67c0b8bf561552d7db9b4829e63 ChangeLog 13346
+MISC ChangeLog 13548 RMD160 45fe7d167cf215247ae1185578c0f6274b9a20b5 SHA1 d38abf8a4c8bcea3f4aa8eb90e1afd657ea8cc3c SHA256 a807e22a67eb5a678d445a125a44edd6b13d84e14755652d7d7629a13ae8f5c6
+MD5 ce65acffc4bd049038af26531113b023 ChangeLog 13548
+RMD160 45fe7d167cf215247ae1185578c0f6274b9a20b5 ChangeLog 13548
+SHA256 a807e22a67eb5a678d445a125a44edd6b13d84e14755652d7d7629a13ae8f5c6 ChangeLog 13548
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -54,3 +65,13 @@ SHA256 3b07ea351c218e033eabd349b829b573e4421a012340943c23b3f2ddc59aa369 files/di
 MD5 4426f920b00d786345c6ce929244f5a3 files/digest-kdm-3.5.7-r1 518
 RMD160 3b410df08626da5caee30fef7c7b8ed46cb1535e files/digest-kdm-3.5.7-r1 518
 SHA256 3b07ea351c218e033eabd349b829b573e4421a012340943c23b3f2ddc59aa369 files/digest-kdm-3.5.7-r1 518
+MD5 4426f920b00d786345c6ce929244f5a3 files/digest-kdm-3.5.7-r2 518
+RMD160 3b410df08626da5caee30fef7c7b8ed46cb1535e files/digest-kdm-3.5.7-r2 518
+SHA256 3b07ea351c218e033eabd349b829b573e4421a012340943c23b3f2ddc59aa369 files/digest-kdm-3.5.7-r2 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG6HTMCkvF58q80IkRAhubAKCUEspjrYfdOvmtyq9jBX5/iwsRMACeJVhQ
+YUdlg2xh/VEVuyAudolHEzs=
+=r/TB
+-----END PGP SIGNATURE-----