From owner-svn-ports-head@freebsd.org Wed Aug 23 13:42:04 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BA37DE7707; Wed, 23 Aug 2017 13:42:04 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40561706A7; Wed, 23 Aug 2017 13:42:04 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7NDg3gJ010615; Wed, 23 Aug 2017 13:42:03 GMT (envelope-from arved@FreeBSD.org) Received: (from arved@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7NDg3kD010613; Wed, 23 Aug 2017 13:42:03 GMT (envelope-from arved@FreeBSD.org) Message-Id: <201708231342.v7NDg3kD010613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arved set sender to arved@FreeBSD.org using -f From: Tilman Keskinoz Date: Wed, 23 Aug 2017 13:42:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448611 - in head/www/newsbeuter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arved X-SVN-Commit-Paths: in head/www/newsbeuter: . files X-SVN-Commit-Revision: 448611 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2017 13:42:04 -0000 Author: arved Date: Wed Aug 23 13:42:03 2017 New Revision: 448611 URL: https://svnweb.freebsd.org/changeset/ports/448611 Log: * 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 Added: head/www/newsbeuter/files/patch-controller.cpp (contents, props changed) Modified: head/www/newsbeuter/Makefile Modified: head/www/newsbeuter/Makefile ============================================================================== --- head/www/newsbeuter/Makefile Wed Aug 23 13:17:14 2017 (r448610) +++ head/www/newsbeuter/Makefile Wed Aug 23 13:42:03 2017 (r448611) @@ -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 Added: head/www/newsbeuter/files/patch-controller.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/newsbeuter/files/patch-controller.cpp Wed Aug 23 13:42:03 2017 (r448611) @@ -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()); +