From 25ad3a50196d4bf4d369f0114052e69531c19956 Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Tue, 31 Mar 2015 06:09:45 -0500 Subject: [PATCH 1/2] newsbeuter: added podbeuter patch --- srcpkgs/newsbeuter/patches/podbeuter.patch | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 srcpkgs/newsbeuter/patches/podbeuter.patch diff --git a/srcpkgs/newsbeuter/patches/podbeuter.patch b/srcpkgs/newsbeuter/patches/podbeuter.patch new file mode 100644 index 00000000000..fe696deec62 --- /dev/null +++ b/srcpkgs/newsbeuter/patches/podbeuter.patch @@ -0,0 +1,93 @@ +From e11b656bda59ca31b4f9ab4c5a14696813b0f6f4 Mon Sep 17 00:00:00 2001 +From: Tilman Keskinoz +Date: Thu, 12 Mar 2015 11:03:50 +0100 +Subject: [PATCH 1/3] Detach thread, to avoid thread being destructed when it + is going out of scope + +--- + src/pb_controller.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp +index 09b5e89..da8ffcb 100644 +--- src/pb_controller.cpp ++++ src/pb_controller.cpp +@@ -287,6 +287,7 @@ void pb_controller::start_downloads() { + if (it->status() == DL_QUEUED) { + std::thread t {poddlthread(&(*it), cfg)}; + --dl2start; ++ t.detach(); + } + } + } + +From f79e5527ba5f54677540637f5b8d287215cfa051 Mon Sep 17 00:00:00 2001 +From: Tilman Keskinoz +Date: Thu, 12 Mar 2015 11:04:49 +0100 +Subject: [PATCH 2/3] Fix segfault + +I think somewhere the poddlthread is copied and the memory messed up. +Make it a shared_ptr to fix segfault. + +Why is this a pointer anyway? +--- + include/poddlthread.h | 3 ++- + src/poddlthread.cpp | 1 - + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/poddlthread.h b/include/poddlthread.h +index a10b9e7..cf0f1da 100644 +--- include/poddlthread.h ++++ include/poddlthread.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + #include + +@@ -24,7 +25,7 @@ class poddlthread { + private: + void mkdir_p(const char * file); + download * dl; +- std::ofstream *f; ++ std::shared_ptr f; + timeval tv1; + timeval tv2; + size_t bytecount; +diff --git a/src/poddlthread.cpp b/src/poddlthread.cpp +index 583481e..3a1b390 100644 +--- src/poddlthread.cpp ++++ src/poddlthread.cpp +@@ -22,7 +22,6 @@ poddlthread::poddlthread(download * dl_, newsbeuter::configcontainer * c) : dl(d + } + + poddlthread::~poddlthread() { +- delete f; + } + + void poddlthread::operator()() { + +From 49dbf84d9500860c48c1d3137cf0d7ab89588726 Mon Sep 17 00:00:00 2001 +From: Tilman Keskinoz +Date: Thu, 12 Mar 2015 11:30:24 +0100 +Subject: [PATCH 3/3] Another threa.detach() missing + +--- + src/pb_view.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pb_view.cpp b/src/pb_view.cpp +index fb61c72..f3cb478 100644 +--- src/pb_view.cpp ++++ src/pb_view.cpp +@@ -111,6 +111,7 @@ void pb_view::run(bool auto_download) { + if (idx != -1) { + if (ctrl->downloads()[idx].status() != DL_DOWNLOADING) { + std::thread t {poddlthread(&ctrl->downloads()[idx], ctrl->get_cfgcont())}; ++ t.detach(); + } + } + } + From d66aa2dfd60b06719a24b71f962a6d1fbc80a66d Mon Sep 17 00:00:00 2001 From: Logen Kain Date: Tue, 31 Mar 2015 14:31:41 -0500 Subject: [PATCH 2/2] newsbeuter: rev bump --- srcpkgs/newsbeuter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/newsbeuter/template b/srcpkgs/newsbeuter/template index e8e8377a720..404a71b1432 100644 --- a/srcpkgs/newsbeuter/template +++ b/srcpkgs/newsbeuter/template @@ -1,7 +1,7 @@ # Template file for 'newsbeuter' pkgname=newsbeuter version=r2.9 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="pkg-config perl" makedepends="stfl-devel json-c-devel libxml2-devel libcurl-devel sqlite-devel libressl-devel"