On Sun, Oct 04, 2015 at 04:57:59PM BST, Stuart Henderson wrote:
> On 2015/10/04 16:18, Raf Czlonka wrote:
> > On Sun, Oct 04, 2015 at 01:30:15PM BST, Stuart Henderson wrote:
> > > On 2015/10/04 12:04, Raf Czlonka wrote:
> > > > Hi all,
> > > > 
> > > > As suggested in the FAQ, I have emailed the port maintainer first but
> > > > hadn't heard back so forwarding the email here.
> > > 
> > > Can you try running with the patch suggested in
> > > https://marc.info/?l=openbsd-ports&m=144257374414248&w=2 and see if you
> > > trigger the newly added log message?
> > > 
> > 
> > Hi Stuart,
> > 
> > This was the very thread that prompted me to finally send an email to
> > ports@ about the issue.
> > 
> > The OP experiences problems on amd64, the platform on which newsbeuter
> > always worked fine for me - hence my i386-specific subject.
> > 
> > Nevertheless, I had built a package with the aforementioned patch -
> > still the same issue.
> > 
> > Thanks for quick reply.
> > 
> > Raf
> > 
> 
> I wonder if it got fixed in any of the updates upstream, can you try this?

Unfortunately the issue is still there.

As I've mentioned in a reply to Jeremie's email, his patch fixes the
issue for me - would be nice if could be adapted for 2.9 :^)

> If you don't already have g++ 4.9 installed (eg++ doesn't exist) then pkg_add
> it first, you'll be there for ages if you have to build it from ports.

Thanks for the tip and prompt help with this, Stuart.

Regards,

Raf

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/newsbeuter/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  24 Aug 2015 12:37:52 -0000      1.5
> +++ Makefile  4 Oct 2015 15:56:34 -0000
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.5 2015/08/24 12:37:52 jasper Exp $
>  
>  COMMENT =            open-source RSS/Atom feed reader for text terminals
> -DISTNAME =           newsbeuter-2.7
> +DISTNAME =           newsbeuter-2.9
>  CATEGORIES =         www
>  
>  HOMEPAGE =           http://newsbeuter.org/
> @@ -12,11 +12,15 @@ MAINTAINER =              Kyle Isom <[email protected]
>  PERMIT_PACKAGE_CDROM =       Yes
>  
>  WANTLIB += c crypto curl json-c m ncursesw pthread sqlite3
> -WANTLIB += stdc++ stfl xml2
> +WANTLIB += stfl xml2
>  
>  MASTER_SITES =               http://newsbeuter.org/downloads/
>  
> -MODULES =            devel/gettext
> +MODULES =            devel/gettext \
> +                     gcc4
> +
> +MODGCC4_LANGS =      c++
> +MODGCC4_ARCHS =      *
>  
>  LIB_DEPENDS =                devel/stfl \
>                       devel/json-c \
> @@ -29,8 +33,5 @@ FAKE_FLAGS =                mandir=${PREFIX}/man
>  USE_GMAKE =          Yes
>  CONFIGURE_STYLE =    simple
>  CONFIGURE_SCRIPT =   config.sh
> -
> -post-extract:
> -     rm $(WRKSRC)/src/google*.cpp
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/newsbeuter/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  16 Oct 2013 18:05:25 -0000      1.1.1.1
> +++ distinfo  4 Oct 2015 15:56:34 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (newsbeuter-2.7.tar.gz) = 5nINp6w/Xqg7w5zRe9Ycz0WLcWf1oXFwrjLHtuj/kDo=
> -SIZE (newsbeuter-2.7.tar.gz) = 418848
> +SHA256 (newsbeuter-2.9.tar.gz) = dKi/AZsJw7JwupWtwp8rvkjqH1XMBjQnayH8zh8EPcg=
> +SIZE (newsbeuter-2.9.tar.gz) = 432763
> Index: patches/patch-config_sh
> ===================================================================
> RCS file: patches/patch-config_sh
> diff -N patches/patch-config_sh
> --- patches/patch-config_sh   16 Oct 2013 18:05:25 -0000      1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-config_sh,v 1.1.1.1 2013/10/16 18:05:25 abieber Exp $
> -
> -This is covered in the pull request sent upstream:
> -     https://github.com/akrennmair/newsbeuter/pull/97
> -
> -If this pull request is merged, this patch will no longer apply.
> -
> ---- config.sh.orig   Tue Aug 27 06:20:39 2013
> -+++ config.sh        Tue Oct 15 18:15:15 2013
> -@@ -103,7 +103,7 @@ check_pkg "stfl" || fail "stfl"
> - 
> - if [ `uname -s` = "Darwin" ]; then
> -     check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4"
> --else 
> -+elif [ `uname -s` != "OpenBSD" ]; then
> -     check_custom "ncursesw5" "ncursesw5-config" || fail "ncursesw5"
> - fi
> - check_ssl_implementation
> Index: patches/patch-mk_newsbeuter_deps
> ===================================================================
> RCS file: patches/patch-mk_newsbeuter_deps
> diff -N patches/patch-mk_newsbeuter_deps
> --- patches/patch-mk_newsbeuter_deps  16 Oct 2013 18:05:25 -0000      1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-mk_newsbeuter_deps,v 1.1.1.1 2013/10/16 18:05:25 abieber Exp 
> $
> -
> -This is covered in the pull request sent upstream:
> -     https://github.com/akrennmair/newsbeuter/pull/97
> -
> -If this pull request is merged, this patch will no longer apply.
> -
> ---- mk/newsbeuter.deps.orig  Mon Oct 14 23:27:54 2013
> -+++ mk/newsbeuter.deps       Mon Oct 14 23:23:25 2013
> -@@ -1 +1 @@
> --newsbeuter.cpp src/cache.cpp  src/htmlrenderer.cpp src/urlreader.cpp 
> src/logger.cpp src/view.cpp src/controller.cpp src/reloadthread.cpp 
> src/tagsouppullparser.cpp src/downloadthread.cpp src/rss.cpp 
> src/rss_parser.cpp src/formaction.cpp src/feedlist_formaction.cpp 
> src/itemlist_formaction.cpp src/itemview_formaction.cpp 
> src/help_formaction.cpp src/filebrowser_formaction.cpp 
> src/urlview_formaction.cpp src/select_formaction.cpp src/history.cpp 
> src/filtercontainer.cpp src/listformatter.cpp src/regexmanager.cpp 
> src/dialogs_formaction.cpp src/googlereader_urlreader.cpp src/google_api.cpp 
> src/ttrss_api.cpp src/ttrss_urlreader.cpp src/markreadthread.cpp
> -+newsbeuter.cpp src/cache.cpp  src/htmlrenderer.cpp src/urlreader.cpp 
> src/logger.cpp src/view.cpp src/controller.cpp src/reloadthread.cpp 
> src/tagsouppullparser.cpp src/downloadthread.cpp src/rss.cpp 
> src/rss_parser.cpp src/formaction.cpp src/feedlist_formaction.cpp 
> src/itemlist_formaction.cpp src/itemview_formaction.cpp 
> src/help_formaction.cpp src/filebrowser_formaction.cpp 
> src/urlview_formaction.cpp src/select_formaction.cpp src/history.cpp 
> src/filtercontainer.cpp src/listformatter.cpp src/regexmanager.cpp 
> src/dialogs_formaction.cpp src/ttrss_api.cpp src/ttrss_urlreader.cpp 
> src/markreadthread.cpp
> Index: patches/patch-src_controller_cpp
> ===================================================================
> RCS file: patches/patch-src_controller_cpp
> diff -N patches/patch-src_controller_cpp
> --- patches/patch-src_controller_cpp  16 Oct 2013 18:05:25 -0000      1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,54 +0,0 @@
> -$OpenBSD: patch-src_controller_cpp,v 1.1.1.1 2013/10/16 18:05:25 abieber Exp 
> $
> -
> -This is covered in the pull request sent upstream:
> -     https://github.com/akrennmair/newsbeuter/pull/97
> -
> -If this pull request is merged, this patch will no longer apply.
> -
> ---- src/controller.cpp.orig  Mon Oct 14 23:28:46 2013
> -+++ src/controller.cpp       Mon Oct 14 23:23:25 2013
> -@@ -434,10 +434,6 @@ void controller::run(int argc, char * argv[]) {
> -     } else if (type == "opml") {
> -             urlcfg = new opml_urlreader(&cfg);
> -             real_offline_mode = offline_mode;
> --    } else if (type == "googlereader") {
> --            api = new googlereader_api(&cfg);
> --            urlcfg = new googlereader_urlreader(&cfg, url_file, api);
> --            real_offline_mode = offline_mode;
> -     } else if (type == "ttrss") {
> -             api = new ttrss_api(&cfg);
> -             urlcfg = new ttrss_urlreader(&cfg, url_file, api);
> -@@ -472,19 +468,6 @@ void controller::run(int argc, char * argv[]) {
> -             if (!do_export && !silent) {
> -                     std::cout << _("done.") << std::endl;
> -             }
> --            if (api && type == "googlereader") { // ugly hack!
> --                    std::vector<google_replay_pair> actions = 
> rsscache->get_google_replay();
> --                    if (!actions.empty()) {
> --                            std::cout << _("Updating Google Reader unread 
> states...");
> --                            std::cout.flush();
> --
> --                            std::vector<std::string> successful_guids = 
> dynamic_cast<googlereader_api *>(api)->bulk_mark_articles_read(actions);
> --
> --                            
> rsscache->delete_google_replay_by_guid(successful_guids);
> --
> --                            std::cout << _("done.") << std::endl;
> --                    }
> --            }
> -     }
> - 
> -     if (urlcfg->get_urls().size() == 0) {
> -@@ -669,12 +652,7 @@ void controller::catchup_all() {
> - void controller::mark_article_read(const std::string& guid, bool read) {
> -     if (api) {
> -             if (offline_mode) {
> --                    if (dynamic_cast<googlereader_api *>(api) != NULL) {
> --                            LOG(LOG_DEBUG, "controller::mark_article_read: 
> recording %s", guid.c_str());
> --                            record_google_replay(guid, read);
> --                    } else {
> --                            LOG(LOG_DEBUG, "not on googlereader_api");
> --                    }
> -+                    LOG(LOG_DEBUG, "not on googlereader_api");
> -             } else {
> -                     api->mark_article_read(guid, read);
> -             }
> Index: patches/patch-src_feedhq_api_cpp
> ===================================================================
> RCS file: patches/patch-src_feedhq_api_cpp
> diff -N patches/patch-src_feedhq_api_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_feedhq_api_cpp  4 Oct 2015 15:56:34 -0000
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +
> +OpenBSD doesn't support wordexp().
> +
> +--- src/feedhq_api.cpp.orig  Sun Oct  4 16:54:17 2015
> ++++ src/feedhq_api.cpp       Sun Oct  4 16:54:33 2015
> +@@ -1,7 +1,6 @@
> + #include <vector>
> + #include <cstring>
> + #include <iostream>
> +-#include <wordexp.h>
> + 
> + #include <feedhq_api.h>
> + #include <config.h>
> +@@ -63,11 +62,8 @@ std::string feedhq_api::retrieve_auth() {
> + 
> +     std::string pass = cfg->get_configvalue("feedhq-password");
> +     if( pass == "" ) {
> +-            wordexp_t exp;
> +             std::ifstream ifs;
> +-            
> wordexp(cfg->get_configvalue("feedhq-passwordfile").c_str(),&exp,0);
> +-            ifs.open(exp.we_wordv[0]);
> +-            wordfree(&exp);
> ++            ifs.open(cfg->get_configvalue("feedhq-passwordfile").c_str());
> +             if (!ifs) {
> +                     if(!flushed) {
> +                             std::cout << std::endl;
> Index: patches/patch-src_oldreader_api_cpp
> ===================================================================
> RCS file: patches/patch-src_oldreader_api_cpp
> diff -N patches/patch-src_oldreader_api_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_oldreader_api_cpp       4 Oct 2015 15:56:34 -0000
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +
> +OpenBSD doesn't support wordexp().
> +
> +--- src/oldreader_api.cpp.orig       Sun Oct  4 16:53:19 2015
> ++++ src/oldreader_api.cpp    Sun Oct  4 16:53:42 2015
> +@@ -1,7 +1,6 @@
> + #include <vector>
> + #include <cstring>
> + #include <iostream>
> +-#include <wordexp.h>
> + 
> + #include <oldreader_api.h>
> + #include <config.h>
> +@@ -65,11 +64,8 @@ std::string oldreader_api::retrieve_auth() {
> + 
> +     std::string pass = cfg->get_configvalue("oldreader-password");
> +     if( pass == "" ) {
> +-            wordexp_t exp;
> +             std::ifstream ifs;
> +-            
> wordexp(cfg->get_configvalue("oldreader-passwordfile").c_str(),&exp,0);
> +-            ifs.open(exp.we_wordv[0]);
> +-            wordfree(&exp);
> ++            
> ifs.open(cfg->get_configvalue("oldreader-passwordfile").c_str());
> +             if (!ifs) {
> +                     if(!flushed) {
> +                             std::cout << std::endl;
> Index: patches/patch-src_ttrss_api_cpp
> ===================================================================
> RCS file: patches/patch-src_ttrss_api_cpp
> diff -N patches/patch-src_ttrss_api_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_ttrss_api_cpp   4 Oct 2015 15:56:34 -0000
> @@ -0,0 +1,27 @@
> +$OpenBSD$
> +
> +OpenBSD doesn't support wordexp().
> +
> +--- src/ttrss_api.cpp.orig   Sun Oct  4 16:50:36 2015
> ++++ src/ttrss_api.cpp        Sun Oct  4 16:52:42 2015
> +@@ -4,7 +4,6 @@
> + #include <cstring>
> + #include <algorithm>
> + 
> +-#include <wordexp.h>
> + #include <unistd.h>
> + #include <iostream>
> + 
> +@@ -54,11 +53,8 @@ std::string ttrss_api::retrieve_sid() {
> + 
> +     std::string pass = cfg->get_configvalue("ttrss-password");
> +     if (pass == "") {
> +-            wordexp_t exp;
> +             std::ifstream ifs;
> +-            
> wordexp(cfg->get_configvalue("ttrss-passwordfile").c_str(),&exp,0);
> +-            ifs.open(exp.we_wordv[0]);
> +-            wordfree(&exp);
> ++            ifs.open(cfg->get_configvalue("ttrss-passwordfile").c_str());
> +             if (!ifs) {
> +                     if(!flushed) {
> +                             std::cout << std::endl;
> Index: patches/patch-src_utils_cpp
> ===================================================================
> RCS file: patches/patch-src_utils_cpp
> diff -N patches/patch-src_utils_cpp
> --- patches/patch-src_utils_cpp       16 Oct 2013 18:05:25 -0000      1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-src_utils_cpp,v 1.1.1.1 2013/10/16 18:05:25 abieber Exp $
> -
> -This is covered in the pull request sent upstream:
> -     https://github.com/akrennmair/newsbeuter/pull/97
> -
> -If this pull request is merged, this patch will no longer apply.
> -
> ---- src/utils.cpp.orig       Tue Aug 27 06:20:39 2013
> -+++ src/utils.cpp    Mon Oct 14 22:06:09 2013
> -@@ -274,7 +274,7 @@ std::string utils::convert_text(const std::string& tex
> -  * of all the Unix-like systems around there, only Linux/glibc seems to 
> -  * come with a SuSv3-conforming iconv implementation.
> -  */
> --#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__)
> -+#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && 
> !defined(__OpenBSD__)
> -     const char * inbufp;
> - #else
> -     char * inbufp;
> 
> 

Reply via email to