From f7d25d05589a28346321d108d7ecd5bcbc0f4319d32572a87ffcc24c8df26c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20POHER?= Date: Mon, 1 Apr 2019 16:20:28 +0000 Subject: [PATCH 1/3] Accepting request 690343 from home:mcalabkova:branches:network - 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 OBS-URL: https://build.opensuse.org/request/show/690343 OBS-URL: https://build.opensuse.org/package/show/network/elinks?expand=0&rev=11 --- ...uby-1.9.patch => build-with-new-ruby.patch | 38 ++++++----- build.with-openssl-1_1.patch | 51 -------------- elinks-0.12_pre5-compilation-fix.patch | 13 ---- elinks-0.12pre6.tar.bz2 | 3 - elinks-current-0.13.tar.bz2 | 3 + elinks.changes | 29 ++++++++ elinks.spec | 23 ++----- use_lua-5.1.patch | 67 ------------------- 8 files changed, 60 insertions(+), 167 deletions(-) rename build-with-ruby-1.9.patch => build-with-new-ruby.patch (84%) delete mode 100644 build.with-openssl-1_1.patch delete mode 100644 elinks-0.12_pre5-compilation-fix.patch delete mode 100644 elinks-0.12pre6.tar.bz2 create mode 100644 elinks-current-0.13.tar.bz2 delete mode 100644 use_lua-5.1.patch diff --git a/build-with-ruby-1.9.patch b/build-with-new-ruby.patch similarity index 84% rename from build-with-ruby-1.9.patch rename to build-with-new-ruby.patch index 171f63e..fa58062 100644 --- a/build-with-ruby-1.9.patch +++ b/build-with-new-ruby.patch @@ -1,6 +1,7 @@ -diff -urp a/config/m4/ruby.m4 b/config/m4/ruby.m4 ---- a/config/m4/ruby.m4 2009-07-07 13:23:17.000000000 +0100 -+++ b/config/m4/ruby.m4 2012-09-10 18:23:09.000000000 +0100 +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 @@ -73,9 +74,10 @@ diff -urp a/config/m4/ruby.m4 b/config/m4/ruby.m4 fi EL_RESTORE_FLAGS -diff -urp a/src/scripting/ruby/core.c b/src/scripting/ruby/core.c ---- a/src/scripting/ruby/core.c 2009-07-07 13:23:17.000000000 +0100 -+++ b/src/scripting/ruby/core.c 2012-09-10 18:27:05.000000000 +0100 +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: @@ -97,18 +99,18 @@ diff -urp a/src/scripting/ruby/core.c b/src/scripting/ruby/core.c - RSTRING(epath)->ptr, RSTRING(einfo)->ptr); + RSTRING_PTR(epath), RSTRING_PTR(einfo)); - p = strchr(buff, '\n'); + p = strchr((const char *)buff, '\n'); if (p) *p = '\0'; -@@ -115,7 +115,7 @@ erb_module_message(VALUE self, VALUE str - unsigned char *message, *line_end; +@@ -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(message, '\n'); -@@ -162,8 +162,8 @@ erb_stdout_p(int argc, VALUE *argv, VALU + 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. */ @@ -119,9 +121,10 @@ diff -urp a/src/scripting/ruby/core.c b/src/scripting/ruby/core.c if (*ptr == '"') ptr++, len--; -diff -urp a/src/scripting/ruby/core.h b/src/scripting/ruby/core.h ---- a/src/scripting/ruby/core.h 2009-07-07 13:23:17.000000000 +0100 -+++ b/src/scripting/ruby/core.h 2012-09-10 18:26:25.000000000 +0100 +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 /* for VALUE */ @@ -143,9 +146,10 @@ diff -urp a/src/scripting/ruby/core.h b/src/scripting/ruby/core.h VALUE erb_module; void alert_ruby_error(struct session *ses, unsigned char *msg); -diff -urp a/src/scripting/ruby/hooks.c b/src/scripting/ruby/hooks.c ---- a/src/scripting/ruby/hooks.c 2009-07-07 13:23:17.000000000 +0100 -+++ b/src/scripting/ruby/hooks.c 2012-09-10 17:53:48.000000000 +0100 +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; diff --git a/build.with-openssl-1_1.patch b/build.with-openssl-1_1.patch deleted file mode 100644 index 58f430c..0000000 --- a/build.with-openssl-1_1.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: elinks-0.12pre6/src/network/ssl/socket.c -=================================================================== ---- elinks-0.12pre6.orig/src/network/ssl/socket.c -+++ elinks-0.12pre6/src/network/ssl/socket.c -@@ -67,7 +67,7 @@ static void - ssl_set_no_tls(struct socket *socket) - { - #ifdef CONFIG_OPENSSL -- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; -+//nothing.. wut was that.. - #elif defined(CONFIG_GNUTLS) - { - /* GnuTLS does not support SSLv2 because it is "insecure". -@@ -145,7 +145,7 @@ ssl_connect(struct socket *socket) - } - - if (client_cert) { -- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx; -+ SSL_CTX *ctx = SSL_get_SSL_CTX(socket->ssl); - - SSL_CTX_use_certificate_chain_file(ctx, client_cert); - SSL_CTX_use_PrivateKey_file(ctx, client_cert, -Index: elinks-0.12pre6/src/network/ssl/ssl.c -=================================================================== ---- elinks-0.12pre6.orig/src/network/ssl/ssl.c -+++ elinks-0.12pre6/src/network/ssl/ssl.c -@@ -44,19 +44,13 @@ SSL_CTX *context = NULL; - static void - init_openssl(struct module *module) - { -- unsigned char f_randfile[PATH_MAX]; - -- /* In a nutshell, on OS's without a /dev/urandom, the OpenSSL library -- * cannot initialize the PRNG and so every attempt to use SSL fails. -- * It's actually an OpenSSL FAQ, and according to them, it's up to the -- * application coders to seed the RNG. -- William Yodlowsky */ -- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { -- /* Not an EGD, so read and write to it */ -- if (RAND_load_file(f_randfile, -1)) -- RAND_write_file(f_randfile); -- } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ SSL_library_init(); -+#else -+ OPENSSL_init_ssl(0, NULL); -+#endif - -- SSLeay_add_ssl_algorithms(); - context = SSL_CTX_new(SSLv23_client_method()); - SSL_CTX_set_options(context, SSL_OP_ALL); - SSL_CTX_set_default_verify_paths(context); diff --git a/elinks-0.12_pre5-compilation-fix.patch b/elinks-0.12_pre5-compilation-fix.patch deleted file mode 100644 index 2a77dee..0000000 --- a/elinks-0.12_pre5-compilation-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: elinks-0.12pre6/src/intl/charsets.c -=================================================================== ---- elinks-0.12pre6.orig/src/intl/charsets.c 2012-10-28 13:57:15.000000000 +0100 -+++ elinks-0.12pre6/src/intl/charsets.c 2016-04-26 10:16:15.984070911 +0200 -@@ -819,7 +819,7 @@ - - /* Cast away const. */ - for (i = 128; i < 256; i++) -- mem_free((unsigned char *) utf_table[i].u.str); -+ mem_free(utf_table[i].u.str); - } - - static struct conv_table * diff --git a/elinks-0.12pre6.tar.bz2 b/elinks-0.12pre6.tar.bz2 deleted file mode 100644 index 5f7d571..0000000 --- a/elinks-0.12pre6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada -size 2854500 diff --git a/elinks-current-0.13.tar.bz2 b/elinks-current-0.13.tar.bz2 new file mode 100644 index 0000000..1effed6 --- /dev/null +++ b/elinks-current-0.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f933de8e32fe5c6c66d341bc3d74f1109d716812fe169667c6f37fd3d2ba925d +size 2925189 diff --git a/elinks.changes b/elinks.changes index a95b2c1..4fe94c5 100644 --- a/elinks.changes +++ b/elinks.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Apr 1 09:31:50 UTC 2019 - Marketa Calabkova + +- 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 + ------------------------------------------------------------------- Thu Dec 28 19:36:07 UTC 2017 - crrodriguez@opensuse.org diff --git a/elinks.spec b/elinks.spec index 29e8169..7f2e263 100644 --- a/elinks.spec +++ b/elinks.spec @@ -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,23 @@ # 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 pkg_version 0.13-20190401 %bcond_with js Name: elinks -Version: 0.11.996 +Version: 0.13 Release: 0 Summary: An advanced and well-established feature-rich text mode web browser -License: GPL-2.0 +License: GPL-2.0-only 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.dramis@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.dramis@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 dabbot@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 +Source0: http://elinks.or.cz/download/%{name}-current-%{version}.tar.bz2 +Patch0: build-with-new-ruby.patch %if 0%{?suse_version} > 1140 BuildRequires: gc-devel %endif @@ -74,9 +68,6 @@ description. %prep %setup -q -n %{name}-%{pkg_version} %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') diff --git a/use_lua-5.1.patch b/use_lua-5.1.patch deleted file mode 100644 index 3edbe1c..0000000 --- a/use_lua-5.1.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2012-10-28 13:57:15.000000000 +0100 -+++ configure.in 2016-04-26 10:16:22.984001853 +0200 -@@ -834,11 +834,11 @@ - withval=""; - fi - for luadir in "$withval" "" /usr /usr/local; do -- for suffix in "" 50; do -+ for suffix in "" 50 51; do - if test "$cf_result" = no && ( test -f "$luadir/include/lua.h" || \ - test -f "$luadir/include/lua$suffix/lua.h" ) ; then -- LUA_LIBS="-L$luadir/lib -llua$suffix -llualib$suffix -lm" -- LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix" -+ LUA_LIBS=`pkg-config --libs lua` -+ LUA_CFLAGS=`pkg-config --cflags lua` - - LIBS="$LUA_LIBS $LIBS_X" - CFLAGS="$CFLAGS_X $LUA_CFLAGS" -Index: src/scripting/lua/core.c -=================================================================== ---- src/scripting/lua/core.c.orig 2012-10-28 13:57:15.000000000 +0100 -+++ src/scripting/lua/core.c 2016-04-26 10:16:22.984001853 +0200 -@@ -658,7 +658,7 @@ - if (file_can_read(file)) { - int oldtop = lua_gettop(S); - -- if (lua_dofile(S, file) != 0) -+ if (luaL_dofile(S, file) != 0) - sleep(3); /* Let some time to see error messages. */ - lua_settop(S, oldtop); - } -@@ -671,11 +671,7 @@ - { - L = lua_open(); - -- luaopen_base(L); -- luaopen_table(L); -- luaopen_io(L); -- luaopen_string(L); -- luaopen_math(L); -+ luaL_openlibs(L); - - lua_register(L, LUA_ALERT, l_alert); - lua_register(L, "current_url", l_current_url); -@@ -780,7 +776,7 @@ - int oldtop = lua_gettop(L); - - if (prepare_lua(ses) == 0) { -- lua_dostring(L, expr); -+ (void) luaL_dostring(L, expr); - lua_settop(L, oldtop); - finish_lua(); - } -Index: src/scripting/lua/hooks.c -=================================================================== ---- src/scripting/lua/hooks.c.orig 2012-10-28 13:57:15.000000000 +0100 -+++ src/scripting/lua/hooks.c 2016-04-26 10:16:22.984001853 +0200 -@@ -200,7 +200,7 @@ - script_hook_quit(va_list ap, void *data) - { - if (!prepare_lua(NULL)) { -- lua_dostring(lua_state, "if quit_hook then quit_hook() end"); -+ (void) luaL_dostring(lua_state, "if quit_hook then quit_hook() end"); - finish_lua(); - } - From 4592a83a276732d8ca86aeea46ba12e488888cf64374c17b1df77c543c38d1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20POHER?= Date: Sun, 14 Apr 2019 09:17:10 +0000 Subject: [PATCH 2/3] Accepting request 694018 from home:sogal:branches:network Fix Licence (use GPL-2.0-or-later) OBS-URL: https://build.opensuse.org/request/show/694018 OBS-URL: https://build.opensuse.org/package/show/network/elinks?expand=0&rev=12 --- elinks.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elinks.spec b/elinks.spec index 7f2e263..17c913f 100644 --- a/elinks.spec +++ b/elinks.spec @@ -24,7 +24,7 @@ Name: elinks Version: 0.13 Release: 0 Summary: An advanced and well-established feature-rich text mode web browser -License: GPL-2.0-only +License: GPL-2.0-or-later Group: Productivity/Networking/Web/Browsers Url: http://elinks.or.cz/ Source0: http://elinks.or.cz/download/%{name}-current-%{version}.tar.bz2 From a7b9be939a2755b35c3f8a3b1aca9f3ffaa5922c23f9d2c140b60829af697d09 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 23 Jul 2019 20:02:35 +0000 Subject: [PATCH 3/3] Accepting request 717992 from home:sbrabec:branches:network - 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. OBS-URL: https://build.opensuse.org/request/show/717992 OBS-URL: https://build.opensuse.org/package/show/network/elinks?expand=0&rev=13 --- elinks-current-0.13.tar.bz2 | 4 ++-- elinks.changes | 9 +++++++++ elinks.spec | 11 +++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/elinks-current-0.13.tar.bz2 b/elinks-current-0.13.tar.bz2 index 1effed6..ae3127e 100644 --- a/elinks-current-0.13.tar.bz2 +++ b/elinks-current-0.13.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f933de8e32fe5c6c66d341bc3d74f1109d716812fe169667c6f37fd3d2ba925d -size 2925189 +oid sha256:d01d380f414478c7cf52e19db4ade4e41d5e3fa94613fe14fbe41038ba461f91 +size 2926098 diff --git a/elinks.changes b/elinks.changes index 4fe94c5..8ffd0c3 100644 --- a/elinks.changes +++ b/elinks.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 23 20:49:14 CEST 2019 - sbrabec@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 diff --git a/elinks.spec b/elinks.spec index 17c913f..e6f0fb8 100644 --- a/elinks.spec +++ b/elinks.spec @@ -16,18 +16,20 @@ # -%define pkg_version 0.13-20190401 +%define tar_version 0.13 +%define snapshot 20190723 %bcond_with js Name: elinks -Version: 0.13 +Version: %{tar_version}~0.%{snapshot} Release: 0 Summary: An advanced and well-established feature-rich text mode web browser License: GPL-2.0-or-later Group: Productivity/Networking/Web/Browsers Url: http://elinks.or.cz/ -Source0: http://elinks.or.cz/download/%{name}-current-%{version}.tar.bz2 +# 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 @@ -66,7 +68,7 @@ and runs on a variety of platforms. Check the about page for a more complete description. %prep -%setup -q -n %{name}-%{pkg_version} +%setup -q -n %{name}-%{tar_version}-%{snapshot} %patch0 -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') @@ -77,6 +79,7 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/vernum.c %build # required for ruby patch sh ./autogen.sh +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --sysconfdir=%{_sysconfdir}/elinks \ --enable-bittorrent \