From ac74e31c3135419316afcf6face832f486f68d3f0de6155331f3d2f1660a7a0e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 20 Feb 2014 09:12:18 +0000 Subject: [PATCH] Accepting request 223156 from KDE:Extra I've added an upstream bugfix (forwarded request 223027 from Vindex17) OBS-URL: https://build.opensuse.org/request/show/223156 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=96 --- ipfilter_bugfix.diff | 54 ++++++++++++++++++++++++++++++++++++++++++++ ktorrent.changes | 7 ++++++ ktorrent.spec | 3 +++ 3 files changed, 64 insertions(+) create mode 100644 ipfilter_bugfix.diff diff --git a/ipfilter_bugfix.diff b/ipfilter_bugfix.diff new file mode 100644 index 0000000..cf481e2 --- /dev/null +++ b/ipfilter_bugfix.diff @@ -0,0 +1,54 @@ +commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 +Author: Joris Guisson +Date: Thu Aug 1 13:19:29 2013 +0200 + + Backport ipfilter extraction fixes from master branch to 4.3 branch + + BUG: 315239 + +diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp +index d3092ac..4080c2a 100644 +--- plugins/ipfilter/downloadandconvertjob.cpp ++++ plugins/ipfilter/downloadandconvertjob.cpp +@@ -114,12 +114,13 @@ namespace kt + + //now determine if it's ZIP or TXT file + KMimeType::Ptr ptr = KMimeType::findByPath(temp); ++ Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl; + if (ptr->name() == "application/zip") + { + active_job = KIO::file_move(temp,QString(kt::DataDir() + QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite); + connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*))); + } +- else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip") ++ else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip" || ptr->name() == "application/gzip") + { + active_job = new bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt")); + connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); +@@ -174,23 +175,10 @@ namespace kt + } + + QString destination = kt::DataDir() + "level1.txt"; +- if (zip->directory()->entries().contains("splist.txt")) ++ QStringList entries = zip->directory()->entries(); ++ if (entries.count() >= 1) + { +- active_job = new bt::ExtractFileJob(zip,"splist.txt",destination); +- connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); +- unzip = true; +- active_job->start(); +- } +- else if (zip->directory()->entries().contains("level1.txt")) +- { +- active_job = new bt::ExtractFileJob(zip,"level1.txt",destination); +- connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); +- unzip = true; +- active_job->start(); +- } +- else if (zip->directory()->entries().contains("ipfilter.dat")) +- { +- active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination); ++ active_job = new bt::ExtractFileJob(zip,entries.front(),destination); + connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); + unzip = true; + active_job->start(); diff --git a/ktorrent.changes b/ktorrent.changes index 2ff8de0..c2ed758 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 19 10:23:39 UTC 2014 - vindex17@outlook.it + +- Added upstream bugfix patch - ipfilter_bugfix.diff: + Fix gzip not working in ipfilter plugin due to wrong mimetype, + kde#315239 + ------------------------------------------------------------------- Fri Jan 18 10:36:46 UTC 2013 - nico.kruber@gmail.com diff --git a/ktorrent.spec b/ktorrent.spec index c3e84e4..513ecdc 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -34,6 +34,8 @@ Patch0: remove-links.diff Patch1: suse-dht-warning.diff # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader Patch2: initial-preference.diff +# PATCH-FIX-UPSTREAM ipfilter_bugfix.diff -- Fix gzip not working in ipfilter plugin due to wrong mimetype, kde#315239 +Patch3: ipfilter_bugfix.diff BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel @@ -73,6 +75,7 @@ for BitTorrent. %endif %patch2 tar jxf %{SOURCE1} +%patch3 %build %cmake_kde4 -d build