[arch-commits] Commit in newsbeuter/repos (18 files)
Levente Polyak
anthraxx at archlinux.org
Sat Sep 16 20:05:19 UTC 2017
Date: Saturday, September 16, 2017 @ 20:05:18
Author: anthraxx
Revision: 258578
archrelease: copy trunk to community-i686, community-x86_64
Added:
newsbeuter/repos/community-i686/PKGBUILD
(from rev 258577, newsbeuter/trunk/PKGBUILD)
newsbeuter/repos/community-i686/newsbeuter-2.9-ncursesw6.patch
(from rev 258577, newsbeuter/trunk/newsbeuter-2.9-ncursesw6.patch)
newsbeuter/repos/community-i686/newsbeuter-CVE-2017-12904.patch
(from rev 258577, newsbeuter/trunk/newsbeuter-CVE-2017-12904.patch)
newsbeuter/repos/community-i686/newsbeuter.changelog
(from rev 258577, newsbeuter/trunk/newsbeuter.changelog)
newsbeuter/repos/community-i686/remote-code-execution-podcast-name.patch
(from rev 258577, newsbeuter/trunk/remote-code-execution-podcast-name.patch)
newsbeuter/repos/community-x86_64/PKGBUILD
(from rev 258577, newsbeuter/trunk/PKGBUILD)
newsbeuter/repos/community-x86_64/newsbeuter-2.9-ncursesw6.patch
(from rev 258577, newsbeuter/trunk/newsbeuter-2.9-ncursesw6.patch)
newsbeuter/repos/community-x86_64/newsbeuter-CVE-2017-12904.patch
(from rev 258577, newsbeuter/trunk/newsbeuter-CVE-2017-12904.patch)
newsbeuter/repos/community-x86_64/newsbeuter.changelog
(from rev 258577, newsbeuter/trunk/newsbeuter.changelog)
newsbeuter/repos/community-x86_64/remote-code-execution-podcast-name.patch
(from rev 258577, newsbeuter/trunk/remote-code-execution-podcast-name.patch)
Deleted:
newsbeuter/repos/community-i686/PKGBUILD
newsbeuter/repos/community-i686/newsbeuter-2.9-ncursesw6.patch
newsbeuter/repos/community-i686/newsbeuter.changelog
newsbeuter/repos/community-i686/newsbeuter.install
newsbeuter/repos/community-x86_64/PKGBUILD
newsbeuter/repos/community-x86_64/newsbeuter-2.9-ncursesw6.patch
newsbeuter/repos/community-x86_64/newsbeuter.changelog
newsbeuter/repos/community-x86_64/newsbeuter.install
-----------------------------------------------------------+
/PKGBUILD | 92 ++++++++++++
/newsbeuter-2.9-ncursesw6.patch | 54 +++++++
/newsbeuter.changelog | 90 +++++++++++
community-i686/PKGBUILD | 45 -----
community-i686/newsbeuter-2.9-ncursesw6.patch | 27 ---
community-i686/newsbeuter-CVE-2017-12904.patch | 19 ++
community-i686/newsbeuter.changelog | 45 -----
community-i686/newsbeuter.install | 6
community-i686/remote-code-execution-podcast-name.patch | 28 +++
community-x86_64/PKGBUILD | 45 -----
community-x86_64/newsbeuter-2.9-ncursesw6.patch | 27 ---
community-x86_64/newsbeuter-CVE-2017-12904.patch | 19 ++
community-x86_64/newsbeuter.changelog | 45 -----
community-x86_64/newsbeuter.install | 6
community-x86_64/remote-code-execution-podcast-name.patch | 28 +++
15 files changed, 330 insertions(+), 246 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-i686/PKGBUILD 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Sven Pfleiderer <pfleidi at roothausen.de>
-
-pkgname=newsbeuter
-pkgver=2.9
-pkgrel=7
-pkgdesc="A RSS feed reader for the text console with special Podcast support"
-arch=('i686' 'x86_64')
-url="http://www.newsbeuter.org/"
-license=('custom: MIT')
-depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl')
-makedepends=('swig' 'gettext')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=($pkgname-r$pkgver.tar.gz::https://github.com/akrennmair/$pkgname/archive/r2.9.tar.gz
- $pkgname-$pkgver-ncursesw6.patch
- $pkgname-segfault.patch::https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch
- $pkgname-CVE-2017-12904.patch::https://github.com/akrennmair/newsbeuter/commit/96e9506ae9e252c548665152d1b8968297128307.patch)
-sha256sums=('489694a57d4af390aa15ab48b66517b0dc34a1cda4410eb5f6f997c6369f51d8'
- '5ae54c463f44d91725da3be655d2b107d598ade6da86ab4a99b10b039b8dba27'
- '60f56cabe47a1773f4a3a960ae0aee418f8a6df7bdd48b9874bf79cdd4c23b84'
- 'e68046ad75362a10db1d7a30b1193d4f9ce55c1ef99f217ee11fad66b00e9a2c')
-
-prepare() {
- cd "${srcdir}"/$pkgname-r$pkgver
-
- patch -p1 -i ../$pkgname-$pkgver-ncursesw6.patch
- patch -p1 -i ../$pkgname-segfault.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-r$pkgver
-
- make prefix=/usr
-}
-
-package() {
- cd "${srcdir}"/$pkgname-r$pkgver
-
- make prefix=/usr DESTDIR="${pkgdir}" install
-
-#license
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: newsbeuter/repos/community-i686/PKGBUILD (from rev 258577, newsbeuter/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Sven Pfleiderer <pfleidi at roothausen.de>
+
+pkgname=newsbeuter
+pkgver=2.9
+pkgrel=8
+pkgdesc="A RSS feed reader for the text console with special Podcast support"
+arch=('i686' 'x86_64')
+url="http://www.newsbeuter.org/"
+license=('custom: MIT')
+depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl')
+makedepends=('swig' 'gettext')
+changelog=$pkgname.changelog
+source=($pkgname-r$pkgver.tar.gz::https://github.com/akrennmair/$pkgname/archive/r$pkgver.tar.gz
+ $pkgname-$pkgver-ncursesw6.patch
+ $pkgname-segfault.patch::https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch
+ newsbeuter-CVE-2017-12904.patch
+ remote-code-execution-podcast-name.patch)
+sha256sums=('489694a57d4af390aa15ab48b66517b0dc34a1cda4410eb5f6f997c6369f51d8'
+ '5ae54c463f44d91725da3be655d2b107d598ade6da86ab4a99b10b039b8dba27'
+ '60f56cabe47a1773f4a3a960ae0aee418f8a6df7bdd48b9874bf79cdd4c23b84'
+ '51c57a5b92704f5659e1283d1bdde521b9df64d315c9584e0fc4e69bb74db930'
+ 'f5d7b9af66884e9551eb28a36bad9f14f361809664fddde68e89ca540e4a27c9')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-r$pkgver
+
+ patch -p1 -i ../$pkgname-$pkgver-ncursesw6.patch
+ patch -p1 -i ../$pkgname-segfault.patch
+ patch -p1 -i ../$pkgname-CVE-2017-12904.patch
+ patch -p1 -i ../remote-code-execution-podcast-name.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-r$pkgver
+
+ make prefix=/usr
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-r$pkgver
+
+ make prefix=/usr DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: community-i686/newsbeuter-2.9-ncursesw6.patch
===================================================================
--- community-i686/newsbeuter-2.9-ncursesw6.patch 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-i686/newsbeuter-2.9-ncursesw6.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,27 +0,0 @@
-From 7eed4bf5938cf912348362f4dc08844af536f740 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
-Date: Tue, 8 Sep 2015 11:39:42 +0200
-Subject: [PATCH] config.sh: check for ncursesw6
-
----
- config.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/config.sh b/config.sh
-index a9f0081..916908c 100755
---- a/config.sh
-+++ b/config.sh
-@@ -110,7 +110,9 @@ check_pkg "stfl" || fail "stfl"
- 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_custom "ncursesw5" "ncursesw5-config" || \
-+ check_custom "ncursesw6" "ncursesw6-config" \
-+ || fail "ncursesw"
- fi
- check_ssl_implementation
- all_aboard_the_fail_boat
---
-2.5.1
-
Copied: newsbeuter/repos/community-i686/newsbeuter-2.9-ncursesw6.patch (from rev 258577, newsbeuter/trunk/newsbeuter-2.9-ncursesw6.patch)
===================================================================
--- community-i686/newsbeuter-2.9-ncursesw6.patch (rev 0)
+++ community-i686/newsbeuter-2.9-ncursesw6.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,27 @@
+From 7eed4bf5938cf912348362f4dc08844af536f740 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Tue, 8 Sep 2015 11:39:42 +0200
+Subject: [PATCH] config.sh: check for ncursesw6
+
+---
+ config.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/config.sh b/config.sh
+index a9f0081..916908c 100755
+--- a/config.sh
++++ b/config.sh
+@@ -110,7 +110,9 @@ check_pkg "stfl" || fail "stfl"
+ 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_custom "ncursesw5" "ncursesw5-config" || \
++ check_custom "ncursesw6" "ncursesw6-config" \
++ || fail "ncursesw"
+ fi
+ check_ssl_implementation
+ all_aboard_the_fail_boat
+--
+2.5.1
+
Copied: newsbeuter/repos/community-i686/newsbeuter-CVE-2017-12904.patch (from rev 258577, newsbeuter/trunk/newsbeuter-CVE-2017-12904.patch)
===================================================================
--- community-i686/newsbeuter-CVE-2017-12904.patch (rev 0)
+++ community-i686/newsbeuter-CVE-2017-12904.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,19 @@
+diff -aur newsbeuter-r2.9/src/controller.cpp newsbeuter-r2.9.new/src/controller.cpp
+--- newsbeuter-r2.9/src/controller.cpp 2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-r2.9.new/src/controller.cpp 2017-09-16 21:33:14.568552568 +0200
+@@ -1275,9 +1275,11 @@
+ 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",
+- bookmark_cmd.c_str(), utils::replace_all(url,"'", "%27").c_str(),
+- stfl::quote(title).c_str(), stfl::quote(description).c_str());
++ std::string cmdline = utils::strprintf("%s '%s' '%s' '%s'",
++ bookmark_cmd.c_str(),
++ utils::replace_all(url,"'", "%27").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());
+
+Only in newsbeuter-r2.9.new/src: .controller.cpp.swp
Deleted: community-i686/newsbeuter.changelog
===================================================================
--- community-i686/newsbeuter.changelog 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-i686/newsbeuter.changelog 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,45 +0,0 @@
-2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.9-4 ncurses6 re-rebuild
-
-2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.9-3 segmentation fault on podcasts downloads #167 fix
-
-2015-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.9-1
-
-2014-01-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.8-1
-
-2013-09-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.7-1
-
-2013-03-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.6-1
-
-2013-03-07 Andrea Scarpino <andrea at archlinux.org>
- * ruby 2.0 rebuild
-
-2012-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.5-1
-
-2011-01-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.4-1
-
-2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release v2.3
- * FS#19744 fixed - non-working locale
-
-2010-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release v2.2
-
-2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release v2.1
-
-2009-10-28 Biru Ionut <ionut at archlinux.ro>
- * Fixed FS#16857
-
-2009-10-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Fixed FS#16850
-
-2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Package moved to [community] in v2.0
Copied: newsbeuter/repos/community-i686/newsbeuter.changelog (from rev 258577, newsbeuter/trunk/newsbeuter.changelog)
===================================================================
--- community-i686/newsbeuter.changelog (rev 0)
+++ community-i686/newsbeuter.changelog 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,45 @@
+2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.9-4 ncurses6 re-rebuild
+
+2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.9-3 segmentation fault on podcasts downloads #167 fix
+
+2015-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.9-1
+
+2014-01-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.8-1
+
+2013-09-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.7-1
+
+2013-03-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.6-1
+
+2013-03-07 Andrea Scarpino <andrea at archlinux.org>
+ * ruby 2.0 rebuild
+
+2012-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.5-1
+
+2011-01-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.4-1
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release v2.3
+ * FS#19744 fixed - non-working locale
+
+2010-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release v2.2
+
+2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release v2.1
+
+2009-10-28 Biru Ionut <ionut at archlinux.ro>
+ * Fixed FS#16857
+
+2009-10-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Fixed FS#16850
+
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Package moved to [community] in v2.0
Deleted: community-i686/newsbeuter.install
===================================================================
--- community-i686/newsbeuter.install 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-i686/newsbeuter.install 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,6 +0,0 @@
-post_install() {
-cat << EOF
-==> If you're not satisfied by the information "man newsbeuter" provides,
-==> have a look at /usr/share/doc/newsbeuter/newsbeuter.html
-EOF
-}
Copied: newsbeuter/repos/community-i686/remote-code-execution-podcast-name.patch (from rev 258577, newsbeuter/trunk/remote-code-execution-podcast-name.patch)
===================================================================
--- community-i686/remote-code-execution-podcast-name.patch (rev 0)
+++ community-i686/remote-code-execution-podcast-name.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,28 @@
+diff -aur newsbeuter-r2.9/src/pb_controller.cpp newsbeuter-r2.9.new/src/pb_controller.cpp
+--- newsbeuter-r2.9/src/pb_controller.cpp 2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-r2.9.new/src/pb_controller.cpp 2017-09-16 20:43:29.180683163 +0200
+@@ -306,9 +306,9 @@
+ if (player == "")
+ return;
+ cmdline.append(player);
+- cmdline.append(" \"");
+- cmdline.append(utils::replace_all(file,"\"", "\\\""));
+- cmdline.append("\"");
++ cmdline.append(" \'");
++ cmdline.append(utils::replace_all(file,"'", "%27"));
++ cmdline.append("\'");
+ stfl::reset();
+ LOG(LOG_DEBUG, "pb_controller::play_file: running `%s'", cmdline.c_str());
+ ::system(cmdline.c_str());
+diff -aur newsbeuter-r2.9/src/queueloader.cpp newsbeuter-r2.9.new/src/queueloader.cpp
+--- newsbeuter-r2.9/src/queueloader.cpp 2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-r2.9.new/src/queueloader.cpp 2017-09-16 20:47:01.884411680 +0200
+@@ -130,7 +130,7 @@
+ strftime(lbuf, sizeof(lbuf), "%Y-%b-%d-%H%M%S.unknown", localtime(&t));
+ fn.append(lbuf);
+ } else {
+- fn.append(base);
++ fn.append(utils::replace_all(base, "'", "%27"));
+ }
+ return fn;
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-x86_64/PKGBUILD 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Sven Pfleiderer <pfleidi at roothausen.de>
-
-pkgname=newsbeuter
-pkgver=2.9
-pkgrel=7
-pkgdesc="A RSS feed reader for the text console with special Podcast support"
-arch=('i686' 'x86_64')
-url="http://www.newsbeuter.org/"
-license=('custom: MIT')
-depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl')
-makedepends=('swig' 'gettext')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=($pkgname-r$pkgver.tar.gz::https://github.com/akrennmair/$pkgname/archive/r2.9.tar.gz
- $pkgname-$pkgver-ncursesw6.patch
- $pkgname-segfault.patch::https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch
- $pkgname-CVE-2017-12904.patch::https://github.com/akrennmair/newsbeuter/commit/96e9506ae9e252c548665152d1b8968297128307.patch)
-sha256sums=('489694a57d4af390aa15ab48b66517b0dc34a1cda4410eb5f6f997c6369f51d8'
- '5ae54c463f44d91725da3be655d2b107d598ade6da86ab4a99b10b039b8dba27'
- '60f56cabe47a1773f4a3a960ae0aee418f8a6df7bdd48b9874bf79cdd4c23b84'
- 'e68046ad75362a10db1d7a30b1193d4f9ce55c1ef99f217ee11fad66b00e9a2c')
-
-prepare() {
- cd "${srcdir}"/$pkgname-r$pkgver
-
- patch -p1 -i ../$pkgname-$pkgver-ncursesw6.patch
- patch -p1 -i ../$pkgname-segfault.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-r$pkgver
-
- make prefix=/usr
-}
-
-package() {
- cd "${srcdir}"/$pkgname-r$pkgver
-
- make prefix=/usr DESTDIR="${pkgdir}" install
-
-#license
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: newsbeuter/repos/community-x86_64/PKGBUILD (from rev 258577, newsbeuter/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Sven Pfleiderer <pfleidi at roothausen.de>
+
+pkgname=newsbeuter
+pkgver=2.9
+pkgrel=8
+pkgdesc="A RSS feed reader for the text console with special Podcast support"
+arch=('i686' 'x86_64')
+url="http://www.newsbeuter.org/"
+license=('custom: MIT')
+depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl')
+makedepends=('swig' 'gettext')
+changelog=$pkgname.changelog
+source=($pkgname-r$pkgver.tar.gz::https://github.com/akrennmair/$pkgname/archive/r$pkgver.tar.gz
+ $pkgname-$pkgver-ncursesw6.patch
+ $pkgname-segfault.patch::https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch
+ newsbeuter-CVE-2017-12904.patch
+ remote-code-execution-podcast-name.patch)
+sha256sums=('489694a57d4af390aa15ab48b66517b0dc34a1cda4410eb5f6f997c6369f51d8'
+ '5ae54c463f44d91725da3be655d2b107d598ade6da86ab4a99b10b039b8dba27'
+ '60f56cabe47a1773f4a3a960ae0aee418f8a6df7bdd48b9874bf79cdd4c23b84'
+ '51c57a5b92704f5659e1283d1bdde521b9df64d315c9584e0fc4e69bb74db930'
+ 'f5d7b9af66884e9551eb28a36bad9f14f361809664fddde68e89ca540e4a27c9')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-r$pkgver
+
+ patch -p1 -i ../$pkgname-$pkgver-ncursesw6.patch
+ patch -p1 -i ../$pkgname-segfault.patch
+ patch -p1 -i ../$pkgname-CVE-2017-12904.patch
+ patch -p1 -i ../remote-code-execution-podcast-name.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-r$pkgver
+
+ make prefix=/usr
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-r$pkgver
+
+ make prefix=/usr DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: community-x86_64/newsbeuter-2.9-ncursesw6.patch
===================================================================
--- community-x86_64/newsbeuter-2.9-ncursesw6.patch 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-x86_64/newsbeuter-2.9-ncursesw6.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,27 +0,0 @@
-From 7eed4bf5938cf912348362f4dc08844af536f740 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
-Date: Tue, 8 Sep 2015 11:39:42 +0200
-Subject: [PATCH] config.sh: check for ncursesw6
-
----
- config.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/config.sh b/config.sh
-index a9f0081..916908c 100755
---- a/config.sh
-+++ b/config.sh
-@@ -110,7 +110,9 @@ check_pkg "stfl" || fail "stfl"
- 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_custom "ncursesw5" "ncursesw5-config" || \
-+ check_custom "ncursesw6" "ncursesw6-config" \
-+ || fail "ncursesw"
- fi
- check_ssl_implementation
- all_aboard_the_fail_boat
---
-2.5.1
-
Copied: newsbeuter/repos/community-x86_64/newsbeuter-2.9-ncursesw6.patch (from rev 258577, newsbeuter/trunk/newsbeuter-2.9-ncursesw6.patch)
===================================================================
--- community-x86_64/newsbeuter-2.9-ncursesw6.patch (rev 0)
+++ community-x86_64/newsbeuter-2.9-ncursesw6.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,27 @@
+From 7eed4bf5938cf912348362f4dc08844af536f740 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Tue, 8 Sep 2015 11:39:42 +0200
+Subject: [PATCH] config.sh: check for ncursesw6
+
+---
+ config.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/config.sh b/config.sh
+index a9f0081..916908c 100755
+--- a/config.sh
++++ b/config.sh
+@@ -110,7 +110,9 @@ check_pkg "stfl" || fail "stfl"
+ 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_custom "ncursesw5" "ncursesw5-config" || \
++ check_custom "ncursesw6" "ncursesw6-config" \
++ || fail "ncursesw"
+ fi
+ check_ssl_implementation
+ all_aboard_the_fail_boat
+--
+2.5.1
+
Copied: newsbeuter/repos/community-x86_64/newsbeuter-CVE-2017-12904.patch (from rev 258577, newsbeuter/trunk/newsbeuter-CVE-2017-12904.patch)
===================================================================
--- community-x86_64/newsbeuter-CVE-2017-12904.patch (rev 0)
+++ community-x86_64/newsbeuter-CVE-2017-12904.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,19 @@
+diff -aur newsbeuter-r2.9/src/controller.cpp newsbeuter-r2.9.new/src/controller.cpp
+--- newsbeuter-r2.9/src/controller.cpp 2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-r2.9.new/src/controller.cpp 2017-09-16 21:33:14.568552568 +0200
+@@ -1275,9 +1275,11 @@
+ 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",
+- bookmark_cmd.c_str(), utils::replace_all(url,"'", "%27").c_str(),
+- stfl::quote(title).c_str(), stfl::quote(description).c_str());
++ std::string cmdline = utils::strprintf("%s '%s' '%s' '%s'",
++ bookmark_cmd.c_str(),
++ utils::replace_all(url,"'", "%27").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());
+
+Only in newsbeuter-r2.9.new/src: .controller.cpp.swp
Deleted: community-x86_64/newsbeuter.changelog
===================================================================
--- community-x86_64/newsbeuter.changelog 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-x86_64/newsbeuter.changelog 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,45 +0,0 @@
-2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.9-4 ncurses6 re-rebuild
-
-2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.9-3 segmentation fault on podcasts downloads #167 fix
-
-2015-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.9-1
-
-2014-01-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.8-1
-
-2013-09-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.7-1
-
-2013-03-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.6-1
-
-2013-03-07 Andrea Scarpino <andrea at archlinux.org>
- * ruby 2.0 rebuild
-
-2012-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.5-1
-
-2011-01-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * newsbeuter 2.4-1
-
-2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release v2.3
- * FS#19744 fixed - non-working locale
-
-2010-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release v2.2
-
-2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release v2.1
-
-2009-10-28 Biru Ionut <ionut at archlinux.ro>
- * Fixed FS#16857
-
-2009-10-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Fixed FS#16850
-
-2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Package moved to [community] in v2.0
Copied: newsbeuter/repos/community-x86_64/newsbeuter.changelog (from rev 258577, newsbeuter/trunk/newsbeuter.changelog)
===================================================================
--- community-x86_64/newsbeuter.changelog (rev 0)
+++ community-x86_64/newsbeuter.changelog 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,45 @@
+2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.9-4 ncurses6 re-rebuild
+
+2015-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.9-3 segmentation fault on podcasts downloads #167 fix
+
+2015-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.9-1
+
+2014-01-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.8-1
+
+2013-09-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.7-1
+
+2013-03-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.6-1
+
+2013-03-07 Andrea Scarpino <andrea at archlinux.org>
+ * ruby 2.0 rebuild
+
+2012-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.5-1
+
+2011-01-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * newsbeuter 2.4-1
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release v2.3
+ * FS#19744 fixed - non-working locale
+
+2010-03-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release v2.2
+
+2009-12-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release v2.1
+
+2009-10-28 Biru Ionut <ionut at archlinux.ro>
+ * Fixed FS#16857
+
+2009-10-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Fixed FS#16850
+
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Package moved to [community] in v2.0
Deleted: community-x86_64/newsbeuter.install
===================================================================
--- community-x86_64/newsbeuter.install 2017-09-16 19:57:36 UTC (rev 258577)
+++ community-x86_64/newsbeuter.install 2017-09-16 20:05:18 UTC (rev 258578)
@@ -1,6 +0,0 @@
-post_install() {
-cat << EOF
-==> If you're not satisfied by the information "man newsbeuter" provides,
-==> have a look at /usr/share/doc/newsbeuter/newsbeuter.html
-EOF
-}
Copied: newsbeuter/repos/community-x86_64/remote-code-execution-podcast-name.patch (from rev 258577, newsbeuter/trunk/remote-code-execution-podcast-name.patch)
===================================================================
--- community-x86_64/remote-code-execution-podcast-name.patch (rev 0)
+++ community-x86_64/remote-code-execution-podcast-name.patch 2017-09-16 20:05:18 UTC (rev 258578)
@@ -0,0 +1,28 @@
+diff -aur newsbeuter-r2.9/src/pb_controller.cpp newsbeuter-r2.9.new/src/pb_controller.cpp
+--- newsbeuter-r2.9/src/pb_controller.cpp 2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-r2.9.new/src/pb_controller.cpp 2017-09-16 20:43:29.180683163 +0200
+@@ -306,9 +306,9 @@
+ if (player == "")
+ return;
+ cmdline.append(player);
+- cmdline.append(" \"");
+- cmdline.append(utils::replace_all(file,"\"", "\\\""));
+- cmdline.append("\"");
++ cmdline.append(" \'");
++ cmdline.append(utils::replace_all(file,"'", "%27"));
++ cmdline.append("\'");
+ stfl::reset();
+ LOG(LOG_DEBUG, "pb_controller::play_file: running `%s'", cmdline.c_str());
+ ::system(cmdline.c_str());
+diff -aur newsbeuter-r2.9/src/queueloader.cpp newsbeuter-r2.9.new/src/queueloader.cpp
+--- newsbeuter-r2.9/src/queueloader.cpp 2015-02-19 11:56:59.000000000 +0100
++++ newsbeuter-r2.9.new/src/queueloader.cpp 2017-09-16 20:47:01.884411680 +0200
+@@ -130,7 +130,7 @@
+ strftime(lbuf, sizeof(lbuf), "%Y-%b-%d-%H%M%S.unknown", localtime(&t));
+ fn.append(lbuf);
+ } else {
+- fn.append(base);
++ fn.append(utils::replace_all(base, "'", "%27"));
+ }
+ return fn;
+ }
More information about the arch-commits
mailing list