diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks index a29fe8e33..be30d1cde 100644 --- a/config/rootfiles/common/elinks +++ b/config/rootfiles/common/elinks @@ -59,6 +59,9 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo #usr/local/share/locale/it #usr/local/share/locale/it/LC_MESSAGES #usr/local/share/locale/it/LC_MESSAGES/elinks.mo +#usr/local/share/locale/ja +#usr/local/share/locale/ja/LC_MESSAGES +#usr/local/share/locale/ja/LC_MESSAGES/elinks.mo #usr/local/share/locale/locale.alias #usr/local/share/locale/lt #usr/local/share/locale/lt/LC_MESSAGES diff --git a/lfs/elinks b/lfs/elinks index 24ade5625..d2867c1c6 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -26,19 +26,13 @@ include Config SUMMARY = An advanced and well-established feature-rich text mode web browser -VER = 0.12pre6 +VER = 0.15.1 THISAPP = elinks-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = elinks -PAK_VER = 2 - -DEPS = - -SERVICES = ############################################################################### # Top-level Rules @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf +$(DL_FILE)_BLAKE2 = dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 install : $(TARGET) @@ -71,18 +65,13 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_BLAKE2,$(objects)) : @$(B2SUM) -dist: - @$(PAK) - ############################################################################### # Installation Details ############################################################################### $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/elinks-0.12pre6-openssl11.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/elinks-0.11.0-ssl-noegd.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/src/patches/elinks-0.11.0-ssl-noegd.patch b/src/patches/elinks-0.11.0-ssl-noegd.patch deleted file mode 100644 index 581873461..000000000 --- a/src/patches/elinks-0.11.0-ssl-noegd.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- elinks-0.11.0/src/network/ssl/ssl.c.noegd 2006-01-10 09:24:50.000000000 +0100 -+++ elinks-0.11.0/src/network/ssl/ssl.c 2006-01-10 09:25:01.000000000 +0100 -@@ -44,18 +44,6 @@ 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); -- } -- - SSLeay_add_ssl_algorithms(); - context = SSL_CTX_new(SSLv23_client_method()); - SSL_CTX_set_options(context, SSL_OP_ALL); diff --git a/src/patches/elinks-0.12pre6-openssl11.patch b/src/patches/elinks-0.12pre6-openssl11.patch deleted file mode 100644 index 210af635e..000000000 --- a/src/patches/elinks-0.12pre6-openssl11.patch +++ /dev/null @@ -1,73 +0,0 @@ -From d83c0edf4c6ae42359ff856d7a879ecba5769595 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Fri, 17 Feb 2017 16:51:41 +0100 -Subject: [PATCH 1/2] fix compatibility with OpenSSL 1.1 - ---- - src/network/ssl/socket.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c -index c9e2be4..467fc48 100644 ---- a/src/network/ssl/socket.c -+++ b/src/network/ssl/socket.c -@@ -83,7 +83,7 @@ static void - ssl_set_no_tls(struct socket *socket) - { - #ifdef CONFIG_OPENSSL -- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; -+ SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1); - #elif defined(CONFIG_GNUTLS) - { - /* GnuTLS does not support SSLv2 because it is "insecure". -@@ -419,7 +419,7 @@ ssl_connect(struct socket *socket) - } - - if (client_cert) { -- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx; -+ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl); - - SSL_CTX_use_certificate_chain_file(ctx, client_cert); - SSL_CTX_use_PrivateKey_file(ctx, client_cert, --- -2.7.4 - - -From ec952cc5b79973bee73fcfc813159d40c22b7228 Mon Sep 17 00:00:00 2001 -From: Tomas Mraz -Date: Fri, 17 Feb 2017 16:44:11 +0100 -Subject: [PATCH 2/2] drop disablement of TLS1.0 on second attempt to connect - -It would not work correctly anyway and the code does not build -with OpenSSL-1.1.0. ---- - src/network/ssl/socket.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c -index 467fc48..b981c1e 100644 ---- a/src/network/ssl/socket.c -+++ b/src/network/ssl/socket.c -@@ -82,6 +82,11 @@ - static void - ssl_set_no_tls(struct socket *socket) - { -+#if 0 -+/* This implements the insecure renegotiation, which should not be used. -+ * The code also would not work on current Fedora (>= Fedora 23) anyway, -+ * because it would just switch off TLS 1.0 keeping TLS 1.1 and 1.2 enabled. -+ */ - #ifdef CONFIG_OPENSSL - SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1); - #elif defined(CONFIG_GNUTLS) -@@ -96,6 +101,7 @@ ssl_set_no_tls(struct socket *socket) - gnutls_protocol_set_priority(*(ssl_t *) socket->ssl, protocol_priority); - } - #endif -+#endif - } - - #ifdef USE_OPENSSL --- -2.7.4 -