Add in a patch for security bug #73759

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index caa18e464c3273fdfd9cd3ad9a363056d3da0b95..3b86ebfd32db5fbb603124235def03ecdd79df43 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdelibs
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.179 2004/12/29 19:02:41 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.180 2005/01/03 16:56:49 caleb Exp $
+
+*kdelibs-3.3.2-r2 (03 Jan 2005)
+
+  03 Jan 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdelibs-kioslave.patch,
+  +files/post-3.3.2-kdelibs-kioslave.patch, -kdelibs-3.2.3-r4.ebuild,
+  +kdelibs-3.2.3-r5.ebuild, -kdelibs-3.3.2-r1.ebuild,
+  +kdelibs-3.3.2-r2.ebuild:
+  Add a patch for security bug #73759
 
   29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
   kdelibs-3.3.2-r1.ebuild:

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 240c5defba92dd4823cb0866b3b6b47263771e0b..2f29dcf92c850899bcd77c3370c9a49f28ab618b 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,46 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1267c588e1027d99a4fefb1be079fa7d kdelibs-3.3.2-r1.ebuild 2935
-MD5 034c39345c86af36b0784adaaf64e484 ChangeLog 28643
-MD5 c959ecc95532887d4ee18aeccc5a3182 kdelibs-3.3.1-r2.ebuild 2988
-MD5 3157a477e6042a67ecc8050820e18132 kdelibs-3.1.5-r1.ebuild 2053
+MD5 dff2404043f0b92070d67e2cd97850fa kdelibs-3.2.0.ebuild 2402
+MD5 2403badf86dbdab95969479f45bcf18e kdelibs-3.3.2-r2.ebuild 2988
+MD5 6614720552a22692657612dc0ed2cd6d kdelibs-3.1.5-r1.ebuild 2053
+MD5 520abbe6032373c2dced7e9b0f912fa8 kdelibs-3.3.0.ebuild 3002
+MD5 4eb7815d6274026b1a56ee11e63a3e21 kdelibs-3.2.2-r1.ebuild 2611
+MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
+MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940
+MD5 846fe51e5827b506bcc31c9e588175a2 ChangeLog 28957
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 12cc1f6d6aa551317c27d8b0e2bca5a0 kdelibs-3.2.3-r4.ebuild 2886
-MD5 af2e54bcac343ccca49de05c43007f52 kdelibs-3.2.0.ebuild 2402
-MD5 e98f2bdfc7d629805c34eb0a586f9fee kdelibs-3.3.0.ebuild 3002
-MD5 6008825076f4c52e385eea679ef9972a kdelibs-3.2.2-r1.ebuild 2611
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r1 68
-MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
-MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68
+MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
+MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
+MD5 a639b7b592f005e911c454a0a8c9c542 files/post-3.2.3-kdelibs-kioslave.patch 549
 MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.patch 974
-MD5 76ef4c7d472a5e3659219ee223f12cb5 files/qt-3.3-printfix.patch 333
+MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
+MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
+MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
 MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
+MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442
 MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447
-MD5 bf08eeb18202c2640f0184420af9a19e files/digest-kdelibs-3.3.0 68
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
-MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
-MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
 MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.1-kdelibs-htmlframes2.patch 989
-MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882
-MD5 8fea98dc672d5c85b217bcb8bcec9214 files/post-3.1.5-kdelibs-kapplication.patch 653
-MD5 bde52aa0bba055c4f678540ec20bfe5a files/post-3.1.5-kdelibs-ktelnetservice.patch 968
-MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
 MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
+MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
+MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68
+MD5 bf08eeb18202c2640f0184420af9a19e files/digest-kdelibs-3.3.0 68
 MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r4 68
-MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442
-MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68
-MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
-MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
-MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
+MD5 fe67157b26a8cdf5bcfa1898cdf3b154 files/post-3.3.2-kdelibs-kioslave.patch 663
+MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882
+MD5 76ef4c7d472a5e3659219ee223f12cb5 files/qt-3.3-printfix.patch 333
+MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
+MD5 bde52aa0bba055c4f678540ec20bfe5a files/post-3.1.5-kdelibs-ktelnetservice.patch 968
+MD5 8fea98dc672d5c85b217bcb8bcec9214 files/post-3.1.5-kdelibs-kapplication.patch 653
 MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5-r1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB0v+XugEuf3OQ0akRAnwQAJ970RaT27CA7TljHr3KacJ/lkJWxACdE0YC
-KsyDokVyTlnx+MGT8xLKS0c=
-=tGH3
------END PGP SIGNATURE-----
+MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
+MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68

diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r4 b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r5
similarity index 100%
rename from kde-base/kdelibs/files/digest-kdelibs-3.2.3-r4
rename to kde-base/kdelibs/files/digest-kdelibs-3.2.3-r5

diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r2
similarity index 100%
rename from kde-base/kdelibs/files/digest-kdelibs-3.3.2-r1
rename to kde-base/kdelibs/files/digest-kdelibs-3.3.2-r2

diff --git a/kde-base/kdelibs/files/post-3.2.3-kdelibs-kioslave.patch b/kde-base/kdelibs/files/post-3.2.3-kdelibs-kioslave.patch
new file mode 100644 (file)
index 0000000..9f03b96
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.2.3-kdelibs-kioslave.patch
@@ -0,0 +1,18 @@
+diff -b -p -u -r1.192.2.3 -r1.192.2.4
+--- kioslave/ftp/ftp.cc        15 Feb 2004 21:15:27 -0000      1.192.2.3
++++ kioslave/ftp/ftp.cc        26 Dec 2004 00:31:31 -0000      1.192.2.4
+@@ -652,6 +652,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
+ {
+   assert( sControl > 0 );
+ 
++  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
++  {
++    kdWarning(7102) << "Invalid command received (contains CR or LF): "
++                    << cmd.data() << endl;
++    error( ERR_UNSUPPORTED_ACTION, m_host );
++    return false;
++  }
++
+   QCString buf = cmd;
+   buf += "\r\n";
+ 

diff --git a/kde-base/kdelibs/files/post-3.3.2-kdelibs-kioslave.patch b/kde-base/kdelibs/files/post-3.3.2-kdelibs-kioslave.patch
new file mode 100644 (file)
index 0000000..18dc66b
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.3.2-kdelibs-kioslave.patch
@@ -0,0 +1,18 @@
+diff -b -p -u -r1.213.2.1 -r1.213.2.2
+--- kioslave/ftp/ftp.cc        21 Sep 2004 16:17:56 -0000      1.213.2.1
++++ kioslave/ftp/ftp.cc        26 Dec 2004 00:29:54 -0000      1.213.2.2
+@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
+ {
+   assert(m_control != NULL);    // must have control connection socket
+ 
++  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
++  {
++    kdWarning(7102) << "Invalid command received (contains CR or LF): "
++                    << cmd.data() << endl;
++    error( ERR_UNSUPPORTED_ACTION, m_host );
++    return false;
++  }
++
+   // Don't print out the password...
+   bool isPassCmd = (cmd.left(4).lower() == "pass");
+   if ( !isPassCmd )

diff --git a/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild b/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild
index 6b1f1a3acd9403ccbabaf0d2990dfcdc5a1bc16e..88c97be061529a12b2feddfd812a6fe2782506a9 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1.5-r1.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/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild,v 1.5 2004/12/13 15:45:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.5-r1.ebuild,v 1.6 2005/01/03 16:56:49 caleb Exp $
 inherit kde eutils
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 

diff --git a/kde-base/kdelibs/kdelibs-3.2.0.ebuild b/kde-base/kdelibs/kdelibs-3.2.0.ebuild
index 779757823ac348874dc787c7c1f70c398d6097c2..984f504663ae497193958bc8337e84ebe944f1f3 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.2.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.0.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/kde-base/kdelibs/kdelibs-3.2.0.ebuild,v 1.17 2004/12/13 15:45:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0.ebuild,v 1.18 2005/01/03 16:56:49 caleb Exp $
 
 inherit kde eutils
 

diff --git a/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild
index fd822acdcb32593688951eec6e1326fc8d2cf4ca..049b7bc3403127de9bb1ee5bd2150a663aec4f0b 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.2-r1.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/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild,v 1.7 2004/12/13 15:45:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.2-r1.ebuild,v 1.8 2005/01/03 16:56:49 caleb Exp $
 
 inherit kde eutils
 

diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r5.ebuild
similarity index 95%
rename from kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild
rename to kde-base/kdelibs/kdelibs-3.2.3-r5.ebuild
index fafa39fc5e0cd3e8fcc7bb5f61e5c3dbf15719e2..698e35ad377fc3139ac456ecfcb6be077f84c172 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.3-r5.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/kde-base/kdelibs/kdelibs-3.2.3-r4.ebuild,v 1.2 2004/12/13 15:45:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r5.ebuild,v 1.1 2005/01/03 16:56:49 caleb Exp $
 
 inherit kde eutils
 
@@ -49,6 +49,7 @@ src_unpack() {
        epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes2.patch
        epatch ${FILESDIR}/post-3.2.3-kdelibs-kio.diff
        epatch ${FILESDIR}/post-3.2.3-kdelibs-khtml.diff
+       epatch ${FILESDIR}/post-3.2.3-kdelibs-kioslave.patch
        cd ${S}/dcop && patch -p0 < ${FILESDIR}/post-3.2.3-kdelibs-dcopserver.patch
        cd ${S} && aclocal -I ${S}
 }

diff --git a/kde-base/kdelibs/kdelibs-3.3.0.ebuild b/kde-base/kdelibs/kdelibs-3.3.0.ebuild
index aa9bbae671cccb320026e10cc0723d542aa08052..a988d748a975cb07ce8ad426c1e389b69f253511 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.3.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.0.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/kde-base/kdelibs/kdelibs-3.3.0.ebuild,v 1.16 2004/12/13 15:45:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.0.ebuild,v 1.17 2005/01/03 16:56:49 caleb Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3

diff --git a/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild
index d792a2f7bd48bbf069adac52bd85ef1771d90029..e4fa13cc9c72819481134777d6e98a68bdea5b97 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.1-r2.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/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild,v 1.3 2004/12/18 22:15:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.1-r2.ebuild,v 1.4 2005/01/03 16:56:49 caleb Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3

diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild
similarity index 95%
rename from kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild
rename to kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild
index 095f0b9599f3390a8724157415100c9864c2c088..7eae5d57fcaaeea48ec56a8b9f4584ec6e0968b5 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r2.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/kde-base/kdelibs/kdelibs-3.3.2-r1.ebuild,v 1.5 2004/12/29 19:02:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild,v 1.1 2005/01/03 16:56:49 caleb Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3
@@ -45,6 +45,7 @@ src_unpack() {
        kde_src_unpack
        epatch ${FILESDIR}/post-3.3.2-kdelibs-kio.diff
        epatch ${FILESDIR}/post-3.3.2-kdelibs-htmlframes2.patch
+       epatch ${FILESDIR}/post-3.3.2-kdelibs-kioslave.patch
 }
 
 src_compile() {