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
2019-04-01 16:20:28 +00:00 · 2019-04-01 16:20:28 +00:00 · f7d25d0558
commit f7d25d0558
parent ed2dc0e1a3
8 changed files with 60 additions and 167 deletions
--- a/build-with-new-ruby.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 <ruby.h>	/* 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;
--- a/build.with-openssl-1_1.patch
+++ b/build.with-openssl-1_1.patch
@ -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);
--- a/elinks-0.12_pre5-compilation-fix.patch
+++ b/elinks-0.12_pre5-compilation-fix.patch
@ -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 *
--- a/elinks-0.12pre6.tar.bz2
+++ b/elinks-0.12pre6.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada
-size 2854500
--- a/elinks-current-0.13.tar.bz2
+++ b/elinks-current-0.13.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f933de8e32fe5c6c66d341bc3d74f1109d716812fe169667c6f37fd3d2ba925d
+size 2925189
--- a/elinks.changes
+++ b/elinks.changes
@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Mon Apr  1 09:31:50 UTC 2019 - Marketa Calabkova <mcalabkova@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
+
 -------------------------------------------------------------------
 Thu Dec 28 19:36:07 UTC 2017 - crrodriguez@opensuse.org

--- 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')
--- a/use_lua-5.1.patch
+++ b/use_lua-5.1.patch
@ -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();
- 	}
-