aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarved <arved@FreeBSD.org>2017-08-23 21:42:03 +0800
committerarved <arved@FreeBSD.org>2017-08-23 21:42:03 +0800
commite26d39513a83f178d165a4ba10da7051711bee9a (patch)
treed93892b67ddfa8272b8ba40f8554f18e2679f34c
parentd31a81ceaee44b2150751f9c42e3b0d50987a9af (diff)
downloadfreebsd-ports-gnome-e26d39513a83f178d165a4ba10da7051711bee9a.tar.gz
freebsd-ports-gnome-e26d39513a83f178d165a4ba10da7051711bee9a.tar.zst
freebsd-ports-gnome-e26d39513a83f178d165a4ba10da7051711bee9a.zip
* Use HTTPS master site
PR: 221726 Submitted by: Johannes Jost Meixner * Add a patch from upstream to sanitize input for the bookmark command Submitted by: Alexander Batischev Bump Portrevision add ssl to USES
-rw-r--r--www/newsbeuter/Makefile7
-rw-r--r--www/newsbeuter/files/patch-controller.cpp15
2 files changed, 19 insertions, 3 deletions
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index 37f90dba3c44..b209f5973414 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -3,9 +3,10 @@
PORTNAME= newsbeuter
PORTVERSION= 2.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
-MASTER_SITES= http://newsbeuter.org/downloads/
+MASTER_SITES= https://newsbeuter.org/downloads/ \
+ http://newsbeuter.org/downloads/
MAINTAINER= arved@FreeBSD.org
COMMENT= RSS feed reader for the text console
@@ -23,7 +24,7 @@ OPTIONS_SUB= yes
PODCAST_DESC= Podcast client (podbeuter)
USES= compiler:c++11-lib gettext gmake iconv:translit ncurses perl5 \
- pkgconfig sqlite shebangfix
+ pkgconfig sqlite shebangfix ssl
USE_CXXSTD= gnu++11
USE_PERL5= build
SHEBANG_FILES= txt2h.pl
diff --git a/www/newsbeuter/files/patch-controller.cpp b/www/newsbeuter/files/patch-controller.cpp
new file mode 100644
index 000000000000..4dd9fb3f0dda
--- /dev/null
+++ b/www/newsbeuter/files/patch-controller.cpp
@@ -0,0 +1,15 @@
+--- src/controller.cpp
++++ 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());
+