Add patch from upstream to fix MSN filetransfer bug.

Package-Manager: portage-2.1_pre5-r4

5 files changed, 187 insertions, 2 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 037aba201069..a5cb67e47af5 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.188 2006/02/21 18:51:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.189 2006/03/05 22:31:01 flameeyes Exp $
+
+*kdenetwork-3.5.1-r1 (05 Mar 2006)
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-3.5.x-msn-filetransfer.patch, +kdenetwork-3.5.1-r1.ebuild:
+  Add patch from upstream to fix MSN filetransfer bug.
 
   21 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
   -files/kdenetwork-3.3.2-kopete-msn.patch, kdenetwork-3.3.2-r2.ebuild:
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 4cf56d71cb95..5babf646d9b9 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,24 +1,91 @@
-MD5 22c3f1be305e7c80ab792a62f1304095 ChangeLog 24630
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 19ff1feb23e083684562d026385bd873 ChangeLog 24854
+RMD160 9ab9364a8619a800052e736fa419b03cdf490733 ChangeLog 24854
+SHA256 1439ffccbf77882ab30f245d2aceb89fe4651fca2b1e7342b146efb6043e0e96 ChangeLog 24854
 MD5 c6db44a9df98a9927235b28065adb065 files/digest-kdenetwork-3.3.2-r2 149
+RMD160 4b80037ca2c6007f616ed23141ff56fe1a852dd6 files/digest-kdenetwork-3.3.2-r2 149
+SHA256 d7447e6c9992a6c87a49158e8038856a3ec3f21883ca98ba41f111cfbbc1779c files/digest-kdenetwork-3.3.2-r2 149
 MD5 7e1dab8dea5082d73c25c6ae6b4251b1 files/digest-kdenetwork-3.4.1-r1 149
+RMD160 f1fdde2d47df26240d1b3116bd060933a50d2bd8 files/digest-kdenetwork-3.4.1-r1 149
+SHA256 6b1f23bcb5db63cd085ce464383c9220253122242d3ecd0db3a0fc39c69aa3d5 files/digest-kdenetwork-3.4.1-r1 149
 MD5 a4f0ff59ade2b98019bd0968a4615141 files/digest-kdenetwork-3.4.2 70
+RMD160 4967c567b628fb1581654104f5eeca4d1c4f794d files/digest-kdenetwork-3.4.2 70
+SHA256 b18272eaad89167ad47ab3f9898b40552dc8de365773106a375a0ea1a6aa4eaa files/digest-kdenetwork-3.4.2 70
 MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kdenetwork-3.4.3 70
+RMD160 97f3713f820ecfc60438b413d4bd0f2c3eb2de15 files/digest-kdenetwork-3.4.3 70
+SHA256 213d8e05a8d4b79f787279540d568fd5535467aaf68062b9cc2b8915ac8893ac files/digest-kdenetwork-3.4.3 70
 MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdenetwork-3.5.0 70
+RMD160 fa2a243e9c180fe7419757101f4df1dd7d5b45cf files/digest-kdenetwork-3.5.0 70
+SHA256 59915d646e813cd8177079862657255615e1a6a784f96bdd548ced17fc8fe325 files/digest-kdenetwork-3.5.0 70
 MD5 4747b54355e84108037b9fd2986a8f87 files/digest-kdenetwork-3.5.1 70
+RMD160 487d1fa7aea4938a3300839f91ffb6c7f3ef36c7 files/digest-kdenetwork-3.5.1 70
+SHA256 bafa5962d219caa3bff5e7d29a5370f04638bb698052ab29ece6ff03bea6e66c files/digest-kdenetwork-3.5.1 70
+MD5 ffaca36bfbd76fcaf0bff81fc18abbb5 files/digest-kdenetwork-3.5.1-r1 256
+RMD160 25ce9154ed2cd689026bea70bb3df69de5995986 files/digest-kdenetwork-3.5.1-r1 256
+SHA256 637f95bb86f559d4234523dedd762f0e9292d34b2918240e331e4d47159d59a8 files/digest-kdenetwork-3.5.1-r1 256
 MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
+RMD160 e97ecb2f463f98a14857352647800d6402629146 files/disable-meanwhile.diff 351
+SHA256 4331c4edfe1e81ad1372dee39940e2fb12bf35b12dc298ebe5b8fb435ad35434 files/disable-meanwhile.diff 351
 MD5 e07566eb35cec7afdfa2e38edf7cdcd1 files/kdenetwork-3.3.2-kwifimanager-configlocation.patch 720
+RMD160 60c858ce2baab04f30e35a1008caccbc3967a8a4 files/kdenetwork-3.3.2-kwifimanager-configlocation.patch 720
+SHA256 de29cca2d9c5b789f5cc458bce7e5c0f2d4dc451f89354c6f7018ef5625c8c51 files/kdenetwork-3.3.2-kwifimanager-configlocation.patch 720
 MD5 e9d8998d39d625a80749a027a9a8e303 files/kdenetwork-3.4-configure.patch 5768
+RMD160 6634c9e166ba682a6d8f40818d794b7436844061 files/kdenetwork-3.4-configure.patch 5768
+SHA256 8c84928fc81aaf8b274bf89c4d425bc9212922f9018fc15f0c1a8840818f2532 files/kdenetwork-3.4-configure.patch 5768
+MD5 1f10505ab3a80110143c11dd7d8145c8 files/kopete-3.5.x-msn-filetransfer.patch 1190
+RMD160 6232a58697527d904b7bfe14be9bf4897456d421 files/kopete-3.5.x-msn-filetransfer.patch 1190
+SHA256 de83733dcc5c44fcdd5fa3e95ecf058fbd11d0e081aced71e3ba3e1d0354f5c2 files/kopete-3.5.x-msn-filetransfer.patch 1190
 MD5 89d2cd31a99e9845da106b83137c3722 files/kppp-3.5.0-bindnow.patch 514
+RMD160 8cb2d6f96a8ba6385951044d2a48a312cdf6acc5 files/kppp-3.5.0-bindnow.patch 514
+SHA256 e0aa9847ee3157059d61641d944f4d61a050000c8471b31909f8cc0daf5730b9 files/kppp-3.5.0-bindnow.patch 514
 MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
+RMD160 75e111f551821d5928629c48d05524132122032a files/lisa 538
+SHA256 6df8a68ce48f87be12973f05ed7c63c0f68f7df97511a4424c28302cf3d26a56 files/lisa 538
 MD5 c37a088365b0b16c49df76f3e5848e33 files/lisa-3.5.0-bindnow.patch 483
+RMD160 5d03c3fb0d1dd9f16e6a2665b8713e0ea66cd431 files/lisa-3.5.0-bindnow.patch 483
+SHA256 ec2890dc6efe87c19a2ecff95f7ac15f6da4dad65fc03b194b834506a6efa2de files/lisa-3.5.0-bindnow.patch 483
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
+RMD160 810ec2446ed1c366df69b5ecbfb77b3fc55f05fe files/lisa.conf 452
+SHA256 e2192aa98a6f8306e0b628a32b85a67ccd2e61c5c0f6f49af7d709eac65db9e1 files/lisa.conf 452
 MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
+RMD160 74d8eeaf4aa1165a98de69f2cdec48c270183708 files/reslisa 549
+SHA256 59ff67eb6d87cbef4d6c6e4f8a7984329d4689d50178870b88e207f86edb3bbe files/reslisa 549
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
+RMD160 ead5e1eeaf3fe3497b180951cbb5561c7ec59328 files/reslisa.conf 340
+SHA256 2ed9e179353f721bdac902ce7493119c04e59823e395cde31af31dbfa9a161c7 files/reslisa.conf 340
 MD5 426360bf289efe11a499f1fa89bb2f4b files/wireless-extensions-api.diff 528
+RMD160 6250caeb6307a58ab669762305ed0b9880242418 files/wireless-extensions-api.diff 528
+SHA256 59e4b80e515cc34b9267e3e38f38fa26dd98cf19f6e2dbffa0eab31df5671537 files/wireless-extensions-api.diff 528
 MD5 d44b981fb4a9806ede924d2a5d7ab585 kdenetwork-3.3.2-r2.ebuild 1641
+RMD160 5f526cbf0e6c117e1b28eeb05576ff906b56da5b kdenetwork-3.3.2-r2.ebuild 1641
+SHA256 5cc0a0fd41ae99e57fa19c060272fae5ec98ace04a4694a4d39e82ae8e8f85dd kdenetwork-3.3.2-r2.ebuild 1641
 MD5 703982710ee8234b723875536043674f kdenetwork-3.4.1-r1.ebuild 1714
+RMD160 29b3efc677182fd6851771b2f1151b5d61638c7a kdenetwork-3.4.1-r1.ebuild 1714
+SHA256 b48f97083cafdcdcf46fce2e78b722c308176eea326aa7909d89ddb033ad8d33 kdenetwork-3.4.1-r1.ebuild 1714
 MD5 f01a7eb66338a4264475bdd11347ac4b kdenetwork-3.4.2.ebuild 1794
+RMD160 e5a8271b70da3509111615b4e53b169d3a879ab1 kdenetwork-3.4.2.ebuild 1794
+SHA256 a2c9d90d84911ce6fd2cc557ce4a51e25dbd094d293ba185db27e224ade3f91f kdenetwork-3.4.2.ebuild 1794
 MD5 981197c95e99c8fc5e37c0c02f4c5716 kdenetwork-3.4.3.ebuild 1764
+RMD160 0008d4bfd1f9ed3921623962a14ad472ea65889c kdenetwork-3.4.3.ebuild 1764
+SHA256 ac90cbc3ee10deff765a89a9cbf65b3f4a1583ecbebf9b59ad761806e9216f20 kdenetwork-3.4.3.ebuild 1764
 MD5 45dc358f9d30bc7a8e2903d7ed24ab8b kdenetwork-3.5.0.ebuild 1802
+RMD160 0b619a684ce73a3c14154e92d1cc4a53dee16cc5 kdenetwork-3.5.0.ebuild 1802
+SHA256 d7afb7c5d87a78ba9cf35b8e0b90b7a3ba385b5635b41615afe42ff844adfe7c kdenetwork-3.5.0.ebuild 1802
+MD5 3629de22cb7c8c0a8fa0b5d0037c0638 kdenetwork-3.5.1-r1.ebuild 1856
+RMD160 6b367da832a734a92c0cbae528e0117d867b1331 kdenetwork-3.5.1-r1.ebuild 1856
+SHA256 0bf1ce52bfa9b04206dc5ba254b025f97fbfc7ab260c452c09f2ab6aa6f0ea78 kdenetwork-3.5.1-r1.ebuild 1856
 MD5 4f05147f44023371fbeeef3dc6bda061 kdenetwork-3.5.1.ebuild 1803
+RMD160 9d3b119b04811ea9ea26698b200820a239e4628c kdenetwork-3.5.1.ebuild 1803
+SHA256 951d6c56af19bb0f14dd1db0edbf91a8a7bba9014f0b3d46e9db7309e6078839 kdenetwork-3.5.1.ebuild 1803
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEC2aJAiZjviIA2XgRAsa/AKC4bxQR+2vEGaEiq7idtGRSLyn89wCeIa6L
+j98U0L4nie5waxNwb2GwoRk=
+=cgvv
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1
new file mode 100644
index 000000000000..7dd4b5329b8b
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1
@@ -0,0 +1,3 @@
+MD5 02ced8c14c80f28635056488949d56d7 kdenetwork-3.5.1.tar.bz2 7464777
+RMD160 6f3271dd50f4bebf1784c3822cab91a6b41d6fb6 kdenetwork-3.5.1.tar.bz2 7464777
+SHA256 4067db7d60927c309cfd268609d5a638c67786da6c573bb32a5af18c3939c725 kdenetwork-3.5.1.tar.bz2 7464777
diff --git a/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch b/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch
new file mode 100644
index 000000000000..9aee13aa697d
--- /dev/null
+++ b/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch
@@ -0,0 +1,41 @@
+Index: kopete/protocols/msn/incomingtransfer.cpp
+===================================================================
+--- kopete/protocols/msn/incomingtransfer.cpp	(revision 516055)
++++ kopete/protocols/msn/incomingtransfer.cpp	(revision 516056)
+@@ -256,19 +256,26 @@
+ 			{
+ 				// NOTE The sending client can ask for a direct connections
+ 				// if one was established before.
+-				QFile *destionation = new QFile(m_transfer->destinationURL().path());
+-				if(!destionation->open(IO_WriteOnly))
++				if(!m_file)
+ 				{
+-					if(m_transfer){
+-						m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
+-						m_transfer = 0l;
++					QFile *destionation = new QFile(m_transfer->destinationURL().path());
++					if(!destionation->open(IO_WriteOnly))
++					{
++						if(m_transfer){
++							m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
++							m_transfer = 0l;
++						}
++						
++						error();
++						return;
+ 					}
+-					
+-					error();
+-					return;
++				
++					m_file = destionation;
+ 				}
+-			
+-				m_file = destionation;
++				else
++				{
++					// TODO
++				}
+ 			}
+ 			
+ 			m_state = DataTransfer;
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..041c014bbf13
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild,v 1.1 2006/03/05 22:31:01 flameeyes Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget..."
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="rdesktop sametime slp ssl wifi xmms"
+
+DEPEND="~kde-base/kdebase-${PV}
+	dev-libs/libxslt
+	dev-libs/libxml2
+	net-dns/libidn
+	>=dev-libs/glib-2
+	sametime? ( =net-libs/meanwhile-0.4* )
+	slp? ( net-libs/openslp )
+	wifi? ( net-wireless/wireless-tools )
+	xmms? ( media-sound/xmms )"
+# glib: for webcam support in Kopete.
+
+RDEPEND="${DEPEND}
+	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
+	dev-lang/perl
+	ssl? ( app-crypt/qca-tls
+	       dev-perl/IO-Socket-SSL )"
+# perl: for KSirc.
+# qca-tls: for Kopete jabber plugin.
+# IO-Socket-SSL: for SSL support in KSirc.
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch
+	${FILESDIR}/lisa-3.5.0-bindnow.patch
+	${FILESDIR}/kopete-3.5.x-msn-filetransfer.patch"
+
+src_compile() {
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	local myconf="--with-libidn
+	              $(use_enable sametime sametime-plugin)
+	              $(use_enable slp) $(use_with wifi)
+	              $(use_with xmms) --without-external-libgadu"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod u+s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	dodir /etc
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${T}/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${T}/reslisa
+	exeinto /etc/init.d
+	doexe ${T}/lisa ${T}/reslisa
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}