summaryrefslogtreecommitdiffstats
path: root/network/newsbeuter
diff options
context:
space:
mode:
author Benjamin Trigona-Harany <bosth@alumni.sfu.ca>2017-08-19 07:16:19 -0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2017-08-26 07:20:29 +0700
commit61329dad6903953a03efc925072fa8ab0a13cf30 (patch)
tree38c3ae579c267156871bbdc20febdd25dcc89b88 /network/newsbeuter
parent8ac2bf7fb5b06e9eaa6ce6905accac983b1dbd61 (diff)
downloadslackbuilds-61329dad6903953a03efc925072fa8ab0a13cf30.tar.gz
slackbuilds-61329dad6903953a03efc925072fa8ab0a13cf30.tar.xz
network/newsbeuter: Apply security fix and support current.
Diffstat (limited to 'network/newsbeuter')
-rw-r--r--network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch12
-rw-r--r--network/newsbeuter/newsbeuter-2.9-security-fix.patch15
-rw-r--r--network/newsbeuter/newsbeuter.SlackBuild11
3 files changed, 34 insertions, 4 deletions
diff --git a/network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch b/network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch
new file mode 100644
index 0000000000..2057ae86e4
--- /dev/null
+++ b/network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur newsbeuter-2.9.a/config.sh newsbeuter-2.9.b/config.sh
+--- newsbeuter-2.9.a/config.sh 2015-02-19 02:56:59.000000000 -0800
++++ newsbeuter-2.9.b/config.sh 2017-08-19 07:09:13.234215744 -0700
+@@ -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_custom "ncursesw5" "ncursesw5-config" || check_custom "ncursesw6" "ncursesw6-config" || fail "ncursesw"
+ fi
+ check_ssl_implementation
+ all_aboard_the_fail_boat
diff --git a/network/newsbeuter/newsbeuter-2.9-security-fix.patch b/network/newsbeuter/newsbeuter-2.9-security-fix.patch
new file mode 100644
index 0000000000..f99cbf04c9
--- /dev/null
+++ b/network/newsbeuter/newsbeuter-2.9-security-fix.patch
@@ -0,0 +1,15 @@
+--- 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/network/newsbeuter/newsbeuter.SlackBuild b/network/newsbeuter/newsbeuter.SlackBuild
index aa3ddf2607..e73f4e2367 100644
--- a/network/newsbeuter/newsbeuter.SlackBuild
+++ b/network/newsbeuter/newsbeuter.SlackBuild
@@ -7,11 +7,11 @@
PRGNAM=newsbeuter
VERSION=${VERSION:-2.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -21,8 +21,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -50,6 +50,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/newsbeuter-2.9-security-fix.patch
+patch -p1 < $CWD/newsbeuter-2.9-ncursesw-fix.patch
+
CXXFLAGS="$SLKCFLAGS" \
make \
prefix=/usr \