[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: 00a9880dbfec4eb834e8ab655ff893403ebd7f3d
Author: Tim Harder gentoo org>
AuthorDate: Thu Aug 24 09:21:00 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Aug 24 09:22:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a9880d
net-news/newsbeuter: remove old
net-news/newsbeuter/newsbeuter-2.9-r2.ebuild | 75
1 file changed, 75 deletions(-)
diff --git a/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
b/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
deleted file mode 100644
index ec8a04001bc..000
--- a/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/akrennmair/newsbeuter.git";
-else
- KEYWORDS="amd64 ~ppc x86"
- SRC_URI="http://www.newsbeuter.org/downloads/${P}.tar.gz";
-fi
-
-inherit toolchain-funcs
-
-DESCRIPTION="A RSS/Atom feed reader for the text console"
-HOMEPAGE="http://www.newsbeuter.org/index.html";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- >=dev-db/sqlite-3.5:3
- >=dev-libs/stfl-0.21
- >=net-misc/curl-7.18.0
- >=dev-libs/json-c-0.11:=
- dev-libs/libxml2
- sys-libs/ncurses:0=[unicode]
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-devel/gettext
- test? (
- dev-libs/boost
- sys-devel/bc
- )
-"
-[[ ${PV} == ]] && DEPEND+=" app-text/asciidoc"
-
-# tests require network access
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.9-ncurses6.patch
- "${FILESDIR}"/${PN}-2.9-fix-mem-leak.patch
- "${FILESDIR}"/${PN}-2.9-fix-segfault.patch
-)
-
-src_prepare() {
- default
- sed -i 's:-ggdb::' Makefile || die
-}
-
-src_configure() {
- ./config.sh || die
-}
-
-src_compile() {
- emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
RANLIB="$(tc-getRANLIB)"
- [[ ${PV} == ]] && emake doc
-}
-
-src_test() {
- emake test
- # Tests fail if in ${S} rather than in ${S}/test
- cd "${S}"/test || die
- ./test || die
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
- dodoc AUTHORS README CHANGES
-}
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: 6e23930ac63c79941fd6f25fe441ba6290cc1f48
Author: Tim Harder gentoo org>
AuthorDate: Thu Aug 24 09:20:44 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Aug 24 09:22:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e23930a
net-news/newsbeuter: stabilize 2.9-r3
net-news/newsbeuter/newsbeuter-2.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
b/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
index 1145dfbfbfc..85de96fbfdf 100644
--- a/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/akrennmair/newsbeuter.git";
else
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc x86"
SRC_URI="http://www.newsbeuter.org/downloads/${P}.tar.gz";
fi
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/, net-news/newsbeuter/files/
commit: ae6b8912bae084921b36d6176bbc0181f08441a3
Author: Tim Harder gentoo org>
AuthorDate: Thu Aug 24 09:20:00 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Aug 24 09:22:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6b8912
net-news/newsbeuter: apply security fix for bug #628796
.../files/newsbeuter-2.9-security-fix.patch| 20 ++
net-news/newsbeuter/newsbeuter-2.9-r3.ebuild | 76 ++
2 files changed, 96 insertions(+)
diff --git a/net-news/newsbeuter/files/newsbeuter-2.9-security-fix.patch
b/net-news/newsbeuter/files/newsbeuter-2.9-security-fix.patch
new file mode 100644
index 000..5e7b39a5f20
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.9-security-fix.patch
@@ -0,0 +1,20 @@
+Newsbeuter didn't properly shell-escape the arguments passed to bookmarking
+command, which allows a remote attacker to perform remote code execution by
+crafting an RSS item whose title and/or URL contain something interpretable by
+the shell (most notably subshell invocations.)
+
+--- a/src/controller.cpp
b/src/controller.cpp
+@@ -1275,9 +1275,10 @@ std::string controller::bookmark(const std::string&
url, const std::string& titl
+ std::string bookmark_cmd = cfg.get_configvalue("bookmark-cmd");
+ bool is_interactive =
cfg.get_configvalue_as_bool("bookmark-interactive");
+ if (bookmark_cmd.length() > 0) {
+- std::string cmdline = utils::strprintf("%s '%s' %s %s",
++ std::string cmdline = utils::strprintf("%s '%s' '%s' '%s'",
+ bookmark_cmd.c_str(),
utils::replace_all(url,"'", "%27").c_str(),
+-
stfl::quote(title).c_str(), stfl::quote(description).c_str());
++
utils::replace_all(title,"'", "%27").c_str(),
++
utils::replace_all(description,"'", "%27").c_str());
+
+ LOG(LOG_DEBUG, "controller::bookmark: cmd = %s",
cmdline.c_str());
+
diff --git a/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
b/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
new file mode 100644
index 000..1145dfbfbfc
--- /dev/null
+++ b/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/akrennmair/newsbeuter.git";
+else
+ KEYWORDS="~amd64 ~ppc ~x86"
+ SRC_URI="http://www.newsbeuter.org/downloads/${P}.tar.gz";
+fi
+
+inherit toolchain-funcs
+
+DESCRIPTION="A RSS/Atom feed reader for the text console"
+HOMEPAGE="http://www.newsbeuter.org/index.html";
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ >=dev-db/sqlite-3.5:3
+ >=dev-libs/stfl-0.21
+ >=net-misc/curl-7.18.0
+ >=dev-libs/json-c-0.11:=
+ dev-libs/libxml2
+ sys-libs/ncurses:0=[unicode]
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ virtual/pkgconfig
+ sys-devel/gettext
+ test? (
+ dev-libs/boost
+ sys-devel/bc
+ )
+"
+[[ ${PV} == ]] && DEPEND+=" app-text/asciidoc"
+
+# tests require network access
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.9-ncurses6.patch
+ "${FILESDIR}"/${PN}-2.9-fix-mem-leak.patch
+ "${FILESDIR}"/${PN}-2.9-fix-segfault.patch
+ "${FILESDIR}"/${PN}-2.9-security-fix.patch
+)
+
+src_prepare() {
+ default
+ sed -i 's:-ggdb::' Makefile || die
+}
+
+src_configure() {
+ ./config.sh || die
+}
+
+src_compile() {
+ emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
RANLIB="$(tc-getRANLIB)"
+ [[ ${PV} == ]] && emake doc
+}
+
+src_test() {
+ emake test
+ # Tests fail if in ${S} rather than in ${S}/test
+ cd "${S}"/test || die
+ ./test || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+ dodoc AUTHORS README CHANGES
+}
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: f8224630b7e80a85be6b386cba6411f67aafa201
Author: Tim Harder gentoo org>
AuthorDate: Fri Dec 9 06:30:06 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Dec 9 06:30:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8224630
net-news/newsbeuter: remove old
net-news/newsbeuter/newsbeuter-2.9.ebuild | 59 ---
1 file changed, 59 deletions(-)
diff --git a/net-news/newsbeuter/newsbeuter-2.9.ebuild
b/net-news/newsbeuter/newsbeuter-2.9.ebuild
deleted file mode 100644
index 8b1862f..
--- a/net-news/newsbeuter/newsbeuter-2.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A RSS/Atom feed reader for the text console"
-HOMEPAGE="http://www.newsbeuter.org/index.html";
-SRC_URI="http://www.${PN}.org/downloads/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND=">=dev-db/sqlite-3.5:3
- >=dev-libs/stfl-0.21
- >=net-misc/curl-7.18.0
- dev-libs/json-c:=
- dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-devel/gettext
- test? (
- dev-libs/boost
- sys-devel/bc
- )"
-
-# tests require network access
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.9-ncurses6.patch
- sed -i 's:-ggdb::' Makefile || die
-}
-
-src_configure() {
- ./config.sh || die
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
- emake test
- # Tests fail if in ${S} rather than in ${S}/test
- cd "${S}"/test
- ./test || die
-}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
- dodoc AUTHORS README CHANGES
-}
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: 33f31dcaff7fd8bb2eeda09d1f98b831fee44f80
Author: Tim Harder gentoo org>
AuthorDate: Fri Dec 9 06:29:37 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Dec 9 06:29:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f31dca
net-news/newsbeuter: stabilize 2.9-r2
net-news/newsbeuter/newsbeuter-2.9-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
b/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
index febd6f4..0d21611 100644
--- a/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/akrennmair/newsbeuter.git";
else
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc x86"
SRC_URI="http://www.newsbeuter.org/downloads/${P}.tar.gz";
fi
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: 2162a56ba9b944aaed6f9fd724a295e0e8d05f82
Author: Tim Harder gentoo org>
AuthorDate: Tue Oct 4 22:28:12 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Tue Oct 4 22:28:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2162a56b
net-news/newsbeuter: remove old
net-news/newsbeuter/newsbeuter-2.9-r1.ebuild | 68
1 file changed, 68 deletions(-)
diff --git a/net-news/newsbeuter/newsbeuter-2.9-r1.ebuild
b/net-news/newsbeuter/newsbeuter-2.9-r1.ebuild
deleted file mode 100644
index a7b24b1..
--- a/net-news/newsbeuter/newsbeuter-2.9-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A RSS/Atom feed reader for the text console"
-HOMEPAGE="http://www.newsbeuter.org/index.html";
-SRC_URI="http://www.${PN}.org/downloads/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-db/sqlite-3.5:3
- >=dev-libs/stfl-0.21
- >=net-misc/curl-7.18.0
- >=dev-libs/json-c-0.11:=
- dev-libs/libxml2
- sys-libs/ncurses:0=[unicode]
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-devel/gettext
- test? (
- dev-libs/boost
- sys-devel/bc
- )
-"
-
-# tests require network access
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.9-ncurses6.patch
- "${FILESDIR}"/${PN}-2.9-fix-mem-leak.patch
- "${FILESDIR}"/${PN}-2.9-fix-segfault.patch
-)
-
-src_prepare() {
- default
- sed -i 's:-ggdb::' Makefile || die
-}
-
-src_configure() {
- ./config.sh || die
-}
-
-src_compile() {
- emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
- emake test
- # Tests fail if in ${S} rather than in ${S}/test
- cd "${S}"/test
- ./test || die
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="/usr" PACKAGE="${PF}" install
- dodoc AUTHORS README CHANGES
-}
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: e2978e91728286db040abfb75b133e095cf53db2
Author: Tim Harder gentoo org>
AuthorDate: Tue Oct 4 22:24:41 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Tue Oct 4 22:24:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2978e91
net-news/newsbeuter: fix locale file installation (bug #595682)
.../{newsbeuter-.ebuild => newsbeuter-2.9-r2.ebuild} | 10 --
net-news/newsbeuter/newsbeuter-.ebuild | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/net-news/newsbeuter/newsbeuter-.ebuild
b/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
similarity index 83%
copy from net-news/newsbeuter/newsbeuter-.ebuild
copy to net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
index 4a73c20..febd6f4 100644
--- a/net-news/newsbeuter/newsbeuter-.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
@@ -43,6 +43,12 @@ DEPEND="${RDEPEND}
# tests require network access
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.9-ncurses6.patch
+ "${FILESDIR}"/${PN}-2.9-fix-mem-leak.patch
+ "${FILESDIR}"/${PN}-2.9-fix-segfault.patch
+)
+
src_prepare() {
default
sed -i 's:-ggdb::' Makefile || die
@@ -65,6 +71,6 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" prefix="/usr" PACKAGE="${PF}" install
- dodoc AUTHORS CHANGES README.md TODO
+ emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+ dodoc AUTHORS README CHANGES
}
diff --git a/net-news/newsbeuter/newsbeuter-.ebuild
b/net-news/newsbeuter/newsbeuter-.ebuild
index 4a73c20..f1129f2 100644
--- a/net-news/newsbeuter/newsbeuter-.ebuild
+++ b/net-news/newsbeuter/newsbeuter-.ebuild
@@ -65,6 +65,6 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" prefix="/usr" PACKAGE="${PF}" install
+ emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
dodoc AUTHORS CHANGES README.md TODO
}
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/
commit: cd8276ada374b379fb0b77c85037586b6cb8a658
Author: Tim Harder gentoo org>
AuthorDate: Fri Aug 19 18:23:28 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Aug 19 19:04:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8276ad
net-news/newsbeuter: add live ebuild
net-news/newsbeuter/newsbeuter-.ebuild | 70 ++
1 file changed, 70 insertions(+)
diff --git a/net-news/newsbeuter/newsbeuter-.ebuild
b/net-news/newsbeuter/newsbeuter-.ebuild
new file mode 100644
index 000..4a73c20
--- /dev/null
+++ b/net-news/newsbeuter/newsbeuter-.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/akrennmair/newsbeuter.git";
+else
+ KEYWORDS="~amd64 ~ppc ~x86"
+ SRC_URI="http://www.newsbeuter.org/downloads/${P}.tar.gz";
+fi
+
+inherit toolchain-funcs
+
+DESCRIPTION="A RSS/Atom feed reader for the text console"
+HOMEPAGE="http://www.newsbeuter.org/index.html";
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ >=dev-db/sqlite-3.5:3
+ >=dev-libs/stfl-0.21
+ >=net-misc/curl-7.18.0
+ >=dev-libs/json-c-0.11:=
+ dev-libs/libxml2
+ sys-libs/ncurses:0=[unicode]
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ virtual/pkgconfig
+ sys-devel/gettext
+ test? (
+ dev-libs/boost
+ sys-devel/bc
+ )
+"
+[[ ${PV} == ]] && DEPEND+=" app-text/asciidoc"
+
+# tests require network access
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i 's:-ggdb::' Makefile || die
+}
+
+src_configure() {
+ ./config.sh || die
+}
+
+src_compile() {
+ emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
RANLIB="$(tc-getRANLIB)"
+ [[ ${PV} == ]] && emake doc
+}
+
+src_test() {
+ emake test
+ # Tests fail if in ${S} rather than in ${S}/test
+ cd "${S}"/test || die
+ ./test || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="/usr" PACKAGE="${PF}" install
+ dodoc AUTHORS CHANGES README.md TODO
+}
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/, net-news/newsbeuter/files/
commit: 1aa0ef91ef6ff4a91b84298221aa5ec4382b81dd
Author: Tim Harder gentoo org>
AuthorDate: Fri Aug 19 15:59:57 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Aug 19 15:59:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa0ef91
net-news/newsbeuter: revision bump to fix various segfaults/memleaks
.../files/newsbeuter-2.9-fix-mem-leak.patch| 88 ++
.../files/newsbeuter-2.9-fix-segfault.patch| 57 ++
net-news/newsbeuter/newsbeuter-2.9-r1.ebuild | 68 +
3 files changed, 213 insertions(+)
diff --git a/net-news/newsbeuter/files/newsbeuter-2.9-fix-mem-leak.patch
b/net-news/newsbeuter/files/newsbeuter-2.9-fix-mem-leak.patch
new file mode 100644
index 000..214d8ed
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.9-fix-mem-leak.patch
@@ -0,0 +1,88 @@
+From cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50 Mon Sep 17 00:00:00 2001
+From: cpubug
+Date: Sun, 8 Nov 2015 13:15:25 +0300
+Subject: [PATCH] fixed a memory leak
+
+---
+ include/rss.h | 4 ++--
+ src/rss.cpp | 7 +--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/include/rss.h b/include/rss.h
+index bc0ef03..f8c87f2 100644
+--- a/include/rss.h
b/include/rss.h
+@@ -117,7 +117,7 @@ class rss_item : public matchable {
+
+ void set_feedptr(std::shared_ptr ptr);
+ inline std::shared_ptr get_feedptr() {
+- return feedptr;
++ return feedptr_.lock();
+ }
+
+ inline bool deleted() const {
+@@ -167,7 +167,7 @@ class rss_item : public matchable {
+ bool enqueued_;
+ std::string flags_;
+ std::string oldflags_;
+- std::shared_ptr feedptr;
++ std::weak_ptr feedptr_;
+ bool deleted_;
+ unsigned int idx;
+ std::string base;
+diff --git a/src/rss.cpp b/src/rss.cpp
+index 1687cbe..9cf0cce 100644
+--- a/src/rss.cpp
b/src/rss.cpp
+@@ -27,7 +27,6 @@ rss_item::rss_item(cache * c) : pubDate_(0), unread_(true),
ch(c), enqueued_(fal
+ }
+
+ rss_item::~rss_item() {
+- feedptr.reset();
+ // LOG(LOG_CRITICAL, "delete rss_item");
+ }
+
+@@ -91,6 +90,7 @@ void rss_item::set_unread_nowrite(bool u) {
+
+ void rss_item::set_unread_nowrite_notify(bool u, bool notify) {
+ unread_ = u;
++ std::shared_ptr feedptr = feedptr_.lock();
+ if (feedptr && notify) {
+ feedptr->get_item_by_guid(guid_)->set_unread_nowrite(unread_);
// notify parent feed
+ }
+@@ -100,6 +100,7 @@ void rss_item::set_unread(bool u) {
+ if (unread_ != u) {
+ bool old_u = unread_;
+ unread_ = u;
++ std::shared_ptr feedptr = feedptr_.lock();
+ if (feedptr)
+
feedptr->get_item_by_guid(guid_)->set_unread_nowrite(unread_); // notify parent
feed
+ try {
+@@ -243,6 +244,7 @@ bool rss_item::has_attribute(const std::string&
attribname) {
+ return true;
+
+ // if we have a feed, then forward the request
++ std::shared_ptr feedptr = feedptr_.lock();
+ if (feedptr)
+ return feedptr->rss_feed::has_attribute(attribname);
+
+@@ -276,6 +278,7 @@ std::string rss_item::get_attribute(const std::string&
attribname) {
+ return utils::to_string(idx);
+
+ // if we have a feed, then forward the request
++ std::shared_ptr feedptr = feedptr_.lock();
+ if (feedptr)
+ return feedptr->rss_feed::get_attribute(attribname);
+
+@@ -563,7 +566,7 @@ void rss_feed::set_feedptrs(std::shared_ptr
self) {
+ }
+
+ void rss_item::set_feedptr(std::shared_ptr ptr) {
+- feedptr = ptr;
++ feedptr_ = std::weak_ptr(ptr);
+ }
+
+ std::string rss_feed::get_status() {
+--
+2.9.3
+
diff --git a/net-news/newsbeuter/files/newsbeuter-2.9-fix-segfault.patch
b/net-news/newsbeuter/files/newsbeuter-2.9-fix-segfault.patch
new file mode 100644
index 000..aa6d1b2
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.9-fix-segfault.patch
@@ -0,0 +1,57 @@
+diff --git a/include/poddlthread.h b/include/poddlthread.h
+index a10b9e7..cf0f1da 100644
+--- a/include/poddlthread.h
b/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/pb_controller.cpp b/src/pb_controller.cpp
+index 09b5e89..da8ffcb 100644
+--- a/src/pb_controller.cpp
b/src/pb_controller.cpp
+@@ -287,6 +287,7 @@ void pb_controller::start_downloads() {
+ if (it->status() == DL_QUEUED) {
+ st
[gentoo-commits] repo/gentoo:master commit in: net-news/newsbeuter/, net-news/newsbeuter/files/
commit: 20e31adef496d2ee3afd8a694b033d7b33e0849a
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Sep 18 04:30:22 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Sep 18 04:30:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e31ade
net-news/newsbeuter: Fix building against sys-libs/ncurses-6 (bug #557608 by
avx).
Package-Manager: portage-2.2.20.1
net-news/newsbeuter/files/newsbeuter-2.9-ncurses6.patch | 11 +++
net-news/newsbeuter/newsbeuter-2.9.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/net-news/newsbeuter/files/newsbeuter-2.9-ncurses6.patch
b/net-news/newsbeuter/files/newsbeuter-2.9-ncurses6.patch
new file mode 100644
index 000..f645d7c
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.9-ncurses6.patch
@@ -0,0 +1,11 @@
+--- a/config.sh
b/config.sh
+@@ -110,7 +110,7 @@
+ if [ `uname -s` = "Darwin" ]; then
+ check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4"
+ elif [ `uname -s` != "OpenBSD" ]; then
+- check_custom "ncursesw5" "ncursesw5-config" || fail "ncursesw"
++ check_pkg "ncursesw" || fail "ncursesw"
+ fi
+ check_ssl_implementation
+ all_aboard_the_fail_boat
diff --git a/net-news/newsbeuter/newsbeuter-2.9.ebuild
b/net-news/newsbeuter/newsbeuter-2.9.ebuild
index 783def2..8b1862f 100644
--- a/net-news/newsbeuter/newsbeuter-2.9.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.9.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="A RSS/Atom feed reader for the text console"
HOMEPAGE="http://www.newsbeuter.org/index.html";
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
RESTRICT="test"
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.9-ncurses6.patch
sed -i 's:-ggdb::' Makefile || die
}
