Hello community, here is the log from the commit of package elinks for openSUSE:Factory checked in at 2019-07-26 12:39:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elinks (Old) and /work/SRC/openSUSE:Factory/.elinks.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elinks" Fri Jul 26 12:39:33 2019 rev:4 rq:717993 version:0.13~0.20190723 Changes: -------- --- /work/SRC/openSUSE:Factory/elinks/elinks.changes 2017-12-31 01:14:38.624589641 +0100 +++ /work/SRC/openSUSE:Factory/.elinks.new.4126/elinks.changes 2019-07-26 12:39:37.101934242 +0200 @@ -1,0 +2,38 @@ +Tue Jul 23 20:49:14 CEST 2019 - sbra...@suse.com + +- Update to 20190723 snapshot of version 0.13: + * no changes +- Use pre-version tag, as the current snapshot is a pre-release. +- Remove volatile URL from Source0. +- Compile without strict aliasing to prevent breakage with new gcc. + +------------------------------------------------------------------- +Mon Apr 1 09:31:50 UTC 2019 - Marketa Calabkova <mcalabk...@suse.com> + +- Update to version 0.13 + * parse_header: document parameters and return value + * doxygen: Fix link to bookmark::url + * use draw_text for titles + * iconv: Bail out of the loop when an illegal sequence of bytes + occur + * Add support for the CSS list-style-type property + * configure.in: use PKG_CONFIG + * Fixed problem of converting more than 256 chars + * mem_free_if where aplicable + * ssl: Make RAND_egd optional + * Better handling of content-disposition + * Compilation fix for OpenSSL-1.1 + * display lua hooks errors + * brotli code updated + * Use blacklist to skip verification of certificates + * various code cleanup + * -VERS-SSL3.0 in gnutls to avoid SSL error. + * 1024: Verify server certificate hostname with OpenSSL (bsc#1082814) +- Removed unneeded patches: + * elinks-0.12_pre5-compilation-fix.patch + * use_lua-5.1.patch + * build.with-openssl-1_1.patch +- Renamed patch: + * build-with-ruby-1.9.patch -> build-with-new-ruby.patch + +------------------------------------------------------------------- Old: ---- build-with-ruby-1.9.patch build.with-openssl-1_1.patch elinks-0.12_pre5-compilation-fix.patch elinks-0.12pre6.tar.bz2 use_lua-5.1.patch New: ---- build-with-new-ruby.patch elinks-current-0.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elinks.spec ++++++ --- /var/tmp/diff_new_pack.8IZyIW/_old 2019-07-26 12:39:37.969933736 +0200 +++ /var/tmp/diff_new_pack.8IZyIW/_new 2019-07-26 12:39:37.969933736 +0200 @@ -1,7 +1,7 @@ # # spec file for package elinks # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define pkg_version 0.12pre6 +%define tar_version 0.13 +%define snapshot 20190723 %bcond_with js Name: elinks -Version: 0.11.996 +Version: %{tar_version}~0.%{snapshot} Release: 0 Summary: An advanced and well-established feature-rich text mode web browser -License: GPL-2.0 +License: GPL-2.0-or-later Group: Productivity/Networking/Web/Browsers Url: http://elinks.or.cz/ -Source0: http://elinks.or.cz/download/%{name}-%{pkg_version}.tar.bz2 -# PATCH-FIX-UPSTREAM elinks-0.12_pre5-compilation-fix.patch asterios.dra...@gmail.com -- Fix compilation with gc (patch taken from Gentoo) -Patch0: elinks-0.12_pre5-compilation-fix.patch -# PATCH-FIX-UPSTREAM use_lua-5.1.patch asterios.dra...@gmail.com -- Support for lua-5.1 (based on patch from Debian) -Patch1: use_lua-5.1.patch -# PATCH-FIX-UPSTREAM build-with-ruby-1.9.patch dab...@gentoo.org -- Support for ruby-1.9 (patch taken from Gentoo) -Patch2: build-with-ruby-1.9.patch -Patch3: build.with-openssl-1_1.patch +# Volatile download URL http://elinks.or.cz/download/%{name}-current-%{tar_version}.tar.bz2 +Source0: %{name}-current-%{tar_version}.tar.bz2 +Patch0: build-with-new-ruby.patch %if 0%{?suse_version} > 1140 BuildRequires: gc-devel %endif @@ -72,11 +68,8 @@ description. %prep -%setup -q -n %{name}-%{pkg_version} +%setup -q -n %{name}-%{tar_version}-%{snapshot} %patch0 -p1 -%patch1 -%patch2 -p1 -%patch3 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -86,6 +79,7 @@ %build # required for ruby patch sh ./autogen.sh +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --sysconfdir=%{_sysconfdir}/elinks \ --enable-bittorrent \ ++++++ build-with-new-ruby.patch ++++++ Index: elinks-0.13-20190401/config/m4/ruby.m4 =================================================================== --- elinks-0.13-20190401.orig/config/m4/ruby.m4 +++ elinks-0.13-20190401/config/m4/ruby.m4 @@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes" if test "$CONFIG_SCRIPTING_RUBY" != "no"; then AC_MSG_CHECKING(Ruby version) - if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then + if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'` AC_MSG_RESULT($ruby_version) AC_MSG_CHECKING(for Ruby header files) - rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null` + rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null` if test "X$rubyhdrdir" != "X"; then AC_MSG_RESULT($rubyhdrdir) RUBY_CFLAGS="-I$rubyhdrdir" - rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'` + rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'` + if test -d "$rubyhdrdir/$rubyarch"; then + RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" + fi + rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'` if test "X$rubylibs" != "X"; then RUBY_LIBS="$rubylibs" fi - librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'` + librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'` if test -f "$rubyhdrdir/$librubyarg"; then librubyarg="$rubyhdrdir/$librubyarg" else - rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'` + rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'` if test -f "$rubylibdir/$librubyarg"; then librubyarg="$rubylibdir/$librubyarg" elif test "$librubyarg" = "libruby.a"; then dnl required on Mac OS 10.3 where libruby.a doesn't exist librubyarg="-lruby" else - librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` + librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"` fi fi @@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes" RUBY_LIBS="$librubyarg $RUBY_LIBS" fi - rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` + rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'` if test "X$rubyldflags" != "X"; then LDFLAGS="$rubyldflags $LDFLAGS" fi @@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes" AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later) fi fi + if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then + AC_MSG_CHECKING([for rb_errinfo]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no") + AC_MSG_RESULT($have_rb_errinfo) + if test "$have_rb_errinfo" = "yes"; then + AC_DEFINE([HAVE_RB_ERRINFO], [1], + [Define to 1 if you have the `rb_errinfo' function.]) + fi + fi fi EL_RESTORE_FLAGS Index: elinks-0.13-20190401/src/scripting/ruby/core.c =================================================================== --- elinks-0.13-20190401.orig/src/scripting/ruby/core.c +++ elinks-0.13-20190401/src/scripting/ruby/core.c @@ -76,10 +76,10 @@ erb_report_error(struct session *ses, in break; case TAG_RAISE: case TAG_FATAL: - eclass = CLASS_OF(ruby_errinfo); - einfo = rb_obj_as_string(ruby_errinfo); + eclass = CLASS_OF(RB_ERRINFO); + einfo = rb_obj_as_string(RB_ERRINFO); - if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) { + if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) { msg = "unhandled exception"; } else { @@ -88,7 +88,7 @@ erb_report_error(struct session *ses, in epath = rb_class_path(eclass); snprintf(buff, MAX_STR_LEN, "%s: %s", - RSTRING(epath)->ptr, RSTRING(einfo)->ptr); + RSTRING_PTR(epath), RSTRING_PTR(einfo)); p = strchr((const char *)buff, '\n'); if (p) *p = '\0'; @@ -116,7 +116,7 @@ erb_module_message(VALUE self, VALUE str struct terminal *term; str = rb_obj_as_string(str); - message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len); + message = memacpy(RSTRING_PTR(str), RSTRING_LEN(str)); if (!message) return Qnil; line_end = strchr((const char *)message, '\n'); @@ -165,8 +165,8 @@ erb_stdout_p(int argc, VALUE *argv, VALU * the inspect() method, which adds quotes to the strings, so * gently ignore them. */ - ptr = RSTRING(substr)->ptr; - len = RSTRING(substr)->len; + ptr = RSTRING_PTR(substr); + len = RSTRING_LEN(substr); if (*ptr == '"') ptr++, len--; Index: elinks-0.13-20190401/src/scripting/ruby/core.h =================================================================== --- elinks-0.13-20190401.orig/src/scripting/ruby/core.h +++ elinks-0.13-20190401/src/scripting/ruby/core.h @@ -7,6 +7,20 @@ struct session; #include <ruby.h> /* for VALUE */ +#ifndef RSTRING_LEN +#define RSTRING_LEN(string) (RSTRING(string)->len) +#endif + +#ifndef RSTRING_PTR +#define RSTRING_PTR(string) (RSTRING(string)->ptr) +#endif + +#ifdef HAVE_RB_ERRINFO +#define RB_ERRINFO (rb_errinfo()) +#else +#define RB_ERRINFO (ruby_errinfo) +#endif + VALUE erb_module; void alert_ruby_error(struct session *ses, unsigned char *msg); Index: elinks-0.13-20190401/src/scripting/ruby/hooks.c =================================================================== --- elinks-0.13-20190401.orig/src/scripting/ruby/hooks.c +++ elinks-0.13-20190401/src/scripting/ruby/hooks.c @@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *d { unsigned char *new_url; - new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len); + new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result)); if (new_url) { mem_free_set(url, new_url); } @@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void { unsigned char *new_url; - new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len); + new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result)); if (new_url) { mem_free_set(url, new_url); } @@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap, switch (rb_type(result)) { case T_STRING: { - int len = RSTRING(result)->len; + int len = RSTRING_LEN(result); - add_fragment(cached, 0, RSTRING(result)->ptr, len); + add_fragment(cached, 0, RSTRING_PTR(result), len); normalize_cache_entry(cached, len); break; @@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void * { unsigned char *proxy; - proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len); + proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result)); if (proxy) { mem_free_set(new_proxy_url, proxy); }
