Hello community, here is the log from the commit of package elinks for openSUSE:Factory checked in at 2017-12-31 01:14:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elinks (Old) and /work/SRC/openSUSE:Factory/.elinks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elinks" Sun Dec 31 01:14:37 2017 rev:3 rq:560685 version:0.11.996 Changes: -------- --- /work/SRC/openSUSE:Factory/elinks/elinks.changes 2016-06-19 10:49:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.elinks.new/elinks.changes 2017-12-31 01:14:38.624589641 +0100 @@ -1,0 +2,5 @@ +Thu Dec 28 19:36:07 UTC 2017 - [email protected] + +- build.with-openssl-1_1.patch: fix build with openssl 1.1. + +------------------------------------------------------------------- New: ---- build.with-openssl-1_1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elinks.spec ++++++ --- /var/tmp/diff_new_pack.81NQKD/_old 2017-12-31 01:14:39.200397532 +0100 +++ /var/tmp/diff_new_pack.81NQKD/_new 2017-12-31 01:14:39.204396198 +0100 @@ -1,7 +1,7 @@ # # spec file for package elinks # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -34,6 +34,7 @@ Patch1: use_lua-5.1.patch # PATCH-FIX-UPSTREAM build-with-ruby-1.9.patch [email protected] -- Support for ruby-1.9 (patch taken from Gentoo) Patch2: build-with-ruby-1.9.patch +Patch3: build.with-openssl-1_1.patch %if 0%{?suse_version} > 1140 BuildRequires: gc-devel %endif @@ -75,7 +76,7 @@ %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') @@ -85,7 +86,6 @@ %build # required for ruby patch sh ./autogen.sh -export CFLAGS="%{optflags} -fstack-protector" %configure \ --sysconfdir=%{_sysconfdir}/elinks \ --enable-bittorrent \ ++++++ build.with-openssl-1_1.patch ++++++ 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);
