summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-02-20 07:08:22 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-02-20 07:08:22 +0700
commitd3086c8b4fc9e20df3cbf402db2e95b0bf30a695 (patch)
tree792c6c967d8ee0bb1120ba4cd802f961f4c85470
parent85446ad3ff62aa3e06399bc03a6c1085e0f25852 (diff)
downloadslackbuilds-d3086c8b4fc9e20df3cbf402db2e95b0bf30a695.tar.gz
network/newsbeuter: Removed (Use newsboat).
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/newsbeuter/README5
-rw-r--r--network/newsbeuter/newsbeuter-2.9-cve-2017-14500-fix.patch30
-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-2.9-segfault-fix.patch92
-rw-r--r--network/newsbeuter/newsbeuter.SlackBuild85
-rw-r--r--network/newsbeuter/newsbeuter.info10
-rw-r--r--network/newsbeuter/slack-desc19
8 files changed, 0 insertions, 268 deletions
diff --git a/network/newsbeuter/README b/network/newsbeuter/README
deleted file mode 100644
index 3f887d66df..0000000000
--- a/network/newsbeuter/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
-Newsbeuter's configurability and features make it a good choice for users that
-want a fast feed reader controlled by the keyboard. Newsbeuter can sync with
-TinyTinyRSS and other online feed readers. It can also download podcasts
-distributed through RSS feeds.
diff --git a/network/newsbeuter/newsbeuter-2.9-cve-2017-14500-fix.patch b/network/newsbeuter/newsbeuter-2.9-cve-2017-14500-fix.patch
deleted file mode 100644
index 051a2ba915..0000000000
--- a/network/newsbeuter/newsbeuter-2.9-cve-2017-14500-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp
-index 09b5e897..213216cd 100644
---- a/src/pb_controller.cpp
-+++ b/src/pb_controller.cpp
-@@ -306,9 +306,9 @@ void pb_controller::play_file(const std::string& file) {
- 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 --git a/src/queueloader.cpp b/src/queueloader.cpp
-index c1dabdd8..ae725e04 100644
---- a/src/queueloader.cpp
-+++ b/src/queueloader.cpp
-@@ -130,7 +130,7 @@ std::string queueloader::get_filename(const std::string& str) {
- 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;
- }
diff --git a/network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch b/network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch
deleted file mode 100644
index 2057ae86e4..0000000000
--- a/network/newsbeuter/newsbeuter-2.9-ncursesw-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index f99cbf04c9..0000000000
--- a/network/newsbeuter/newsbeuter-2.9-security-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-2.9-segfault-fix.patch b/network/newsbeuter/newsbeuter-2.9-segfault-fix.patch
deleted file mode 100644
index 55a9ed4324..0000000000
--- a/network/newsbeuter/newsbeuter-2.9-segfault-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From e11b656bda59ca31b4f9ab4c5a14696813b0f6f4 Mon Sep 17 00:00:00 2001
-From: Tilman Keskinoz <arved@FreeBSD.org>
-Date: Thu, 12 Mar 2015 11:03:50 +0100
-Subject: [PATCH 1/3] Detach thread, to avoid thread being destructed when it
- is going out of scope
-
----
- src/pb_controller.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp
-index 09b5e897..da8ffcb1 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) {
- std::thread t {poddlthread(&(*it), cfg)};
- --dl2start;
-+ t.detach();
- }
- }
- }
-
-From f79e5527ba5f54677540637f5b8d287215cfa051 Mon Sep 17 00:00:00 2001
-From: Tilman Keskinoz <arved@FreeBSD.org>
-Date: Thu, 12 Mar 2015 11:04:49 +0100
-Subject: [PATCH 2/3] Fix segfault
-
-I think somewhere the poddlthread is copied and the memory messed up.
-Make it a shared_ptr to fix segfault.
-
-Why is this a pointer anyway?
----
- include/poddlthread.h | 3 ++-
- src/poddlthread.cpp | 1 -
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/poddlthread.h b/include/poddlthread.h
-index a10b9e73..cf0f1daa 100644
---- a/include/poddlthread.h
-+++ b/include/poddlthread.h
-@@ -7,6 +7,7 @@
-
- #include <sys/time.h>
- #include <time.h>
-+#include <memory>
-
- #include <configcontainer.h>
-
-@@ -24,7 +25,7 @@ class poddlthread {
- private:
- void mkdir_p(const char * file);
- download * dl;
-- std::ofstream *f;
-+ std::shared_ptr<std::ofstream> f;
- timeval tv1;
- timeval tv2;
- size_t bytecount;
-diff --git a/src/poddlthread.cpp b/src/poddlthread.cpp
-index 583481eb..3a1b390f 100644
---- a/src/poddlthread.cpp
-+++ b/src/poddlthread.cpp
-@@ -22,7 +22,6 @@ poddlthread::poddlthread(download * dl_, newsbeuter::configcontainer * c) : dl(d
- }
-
- poddlthread::~poddlthread() {
-- delete f;
- }
-
- void poddlthread::operator()() {
-
-From 49dbf84d9500860c48c1d3137cf0d7ab89588726 Mon Sep 17 00:00:00 2001
-From: Tilman Keskinoz <arved@FreeBSD.org>
-Date: Thu, 12 Mar 2015 11:30:24 +0100
-Subject: [PATCH 3/3] Another threa.detach() missing
-
----
- src/pb_view.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pb_view.cpp b/src/pb_view.cpp
-index fb61c726..f3cb4788 100644
---- a/src/pb_view.cpp
-+++ b/src/pb_view.cpp
-@@ -111,6 +111,7 @@ void pb_view::run(bool auto_download) {
- if (idx != -1) {
- if (ctrl->downloads()[idx].status() != DL_DOWNLOADING) {
- std::thread t {poddlthread(&ctrl->downloads()[idx], ctrl->get_cfgcont())};
-+ t.detach();
- }
- }
- }
diff --git a/network/newsbeuter/newsbeuter.SlackBuild b/network/newsbeuter/newsbeuter.SlackBuild
deleted file mode 100644
index d91d126675..0000000000
--- a/network/newsbeuter/newsbeuter.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for newsbeuter
-# Originally written by slakmagik <jsun@freeshell.org>
-# Maintained by Benjamin Trigona-Harany
-# Released under the WTFPL
-
-PRGNAM=newsbeuter
-VERSION=${VERSION:-2.9}
-BUILD=${BUILD:-4}
-TAG=${TAG:-_SBo}
-
-case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
-esac
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -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
-patch -p1 < $CWD/newsbeuter-2.9-segfault-fix.patch
-patch -p1 < $CWD/newsbeuter-2.9-cve-2017-14500-fix.patch
-
-CXXFLAGS="$SLKCFLAGS" \
-make \
- prefix=/usr \
- docdir=/usr/doc/$PRGNAM-$VERSION \
- mandir=/usr/man \
- DESTDIR=$PKG
-
-make install \
- prefix=/usr \
- docdir=/usr/doc/$PRGNAM-$VERSION \
- mandir=/usr/man \
- DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object"| grep ELF | \
- cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-cp -a \
- AUTHORS CHANGES LICENSE README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/newsbeuter/newsbeuter.info b/network/newsbeuter/newsbeuter.info
deleted file mode 100644
index ca79ec2f54..0000000000
--- a/network/newsbeuter/newsbeuter.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="newsbeuter"
-VERSION="2.9"
-HOMEPAGE="https://www.newsbeuter.org/"
-DOWNLOAD="https://www.newsbeuter.org/downloads/newsbeuter-2.9.tar.gz"
-MD5SUM="9cf332dc7e591023147bda7add430835"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="stfl"
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
diff --git a/network/newsbeuter/slack-desc b/network/newsbeuter/slack-desc
deleted file mode 100644
index dd4eb38e8e..0000000000
--- a/network/newsbeuter/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-newsbeuter: newsbeuter (RSS feedreader)
-newsbeuter:
-newsbeuter: Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
-newsbeuter: Newsbeuter's configurability and features make it a good choice for
-newsbeuter: users that want a fast feed reader controlled by the keyboard.
-newsbeuter: Newsbeuter can sync with TinyTinyRSS and can download podcasts
-newsbeuter: distributed through RSS feeds.
-newsbeuter:
-newsbeuter:
-newsbeuter:
-newsbeuter: