Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] elinks: update to 0.14.0, switch upstream.
@ 2020-12-28  5:23 ericonr
  2020-12-28  5:47 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2020-12-28  5:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages eli
https://github.com/void-linux/void-packages/pull/27492

elinks: update to 0.14.0, switch upstream.


A patch file from https://github.com/void-linux/void-packages/pull/27492.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-eli-27492.patch --]
[-- Type: text/x-diff, Size: 5080 bytes --]

From 504a392dec9560ad2cb43e51c2b9c0d99b8f1659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 27 Dec 2020 21:07:14 +0100
Subject: [PATCH] elinks: update to 0.14.0, switch upstream.

---
 srcpkgs/elinks/patches/cross.patch            | 20 ------------------
 .../patch-src_network_ssl_socket.c.diff       | 11 ----------
 .../patches/patch-src_network_ssl_ssl_c.diff  | 21 -------------------
 srcpkgs/elinks/template                       | 21 ++++++++++---------
 4 files changed, 11 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/elinks/patches/cross.patch
 delete mode 100644 srcpkgs/elinks/patches/patch-src_network_ssl_socket.c.diff
 delete mode 100644 srcpkgs/elinks/patches/patch-src_network_ssl_ssl_c.diff

diff --git a/srcpkgs/elinks/patches/cross.patch b/srcpkgs/elinks/patches/cross.patch
deleted file mode 100644
index e8c87fd4188..00000000000
--- a/srcpkgs/elinks/patches/cross.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove this nonsense to allow cross compilation...
-
---- configure.in.orig	2015-01-04 09:56:34.986063527 +0100
-+++ configure.in	2015-01-04 09:56:43.842149084 +0100
-@@ -44,15 +44,6 @@ if test -e Makefile.config; then
- fi
- 
- # ===================================================================
--# Load feature configuration file and start logging features.
--# ===================================================================
--
--features="features.conf"
--AC_CHECK_FILE("$srcdir/$features", [ . $srcdir/$features ])
--AC_CHECK_FILE("$builddir/$features", [ . $builddir/$features ])
--echo "Feature summary:" > features.log
--
--# ===================================================================
- # Checks for programs.
- # ===================================================================
- 
diff --git a/srcpkgs/elinks/patches/patch-src_network_ssl_socket.c.diff b/srcpkgs/elinks/patches/patch-src_network_ssl_socket.c.diff
deleted file mode 100644
index 66395cd74ed..00000000000
--- a/srcpkgs/elinks/patches/patch-src_network_ssl_socket.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/network/ssl/socket.c.orig	2017-02-08 12:49:43 UTC
-+++ 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;
-+	SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1);
- #elif defined(CONFIG_GNUTLS)
- 	{
- 		/* GnuTLS does not support SSLv2 because it is "insecure".
diff --git a/srcpkgs/elinks/patches/patch-src_network_ssl_ssl_c.diff b/srcpkgs/elinks/patches/patch-src_network_ssl_ssl_c.diff
deleted file mode 100644
index 12b4bc6f5cf..00000000000
--- a/srcpkgs/elinks/patches/patch-src_network_ssl_ssl_c.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_network_ssl_ssl_c,v 1.2 2014/06/02 14:37:16 sthen Exp $
---- src/network/ssl/ssl.c.orig	Mon Jun  2 12:54:40 2014
-+++ src/network/ssl/ssl.c	Mon Jun  2 12:55:46 2014
-@@ -49,11 +49,16 @@ init_openssl(struct module *module)
- 	 * 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) {
-+	RAND_file_name(f_randfile, sizeof(f_randfile));
-+#ifdef HAVE_RAND_EGD
-+	if (RAND_egd(f_randfile) < 0) {
- 		/* Not an EGD, so read and write to it */
-+#endif
- 		if (RAND_load_file(f_randfile, -1))
- 			RAND_write_file(f_randfile);
-+#ifdef HAVE_RAND_EGD
- 	}
-+#endif
- 
- 	SSLeay_add_ssl_algorithms();
- 	context = SSL_CTX_new(SSLv23_client_method());
diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index e796d65c831..4e2047cc8a8 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,22 +1,23 @@
 # Template file for 'elinks'
 pkgname=elinks
-version=0.12pre6
-revision=22
+version=0.14.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-true-color --enable-fastmem"
-hostmakedepends="automake libtool pkg-config"
-makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel ncurses-devel libressl-devel"
+configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
+hostmakedepends="automake libtool pkg-config gettext"
+makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
+ ncurses-devel libressl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="http://elinks.or.cz"
-distfiles="http://elinks.or.cz/download/${pkgname}-${version}.tar.bz2"
-checksum=383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada
+homepage="https://github.com/rkd77/elinks"
+distfiles="https://github.com/rkd77/elinks/archive/v${version}.tar.gz"
+checksum=ee1294d9144687ad6d45255a4d1b2802bec2b6285725cb4254a86780efad668f
 
 pre_configure() {
-	sed -i 's,VA_COPY,va_copy,g' src/*/*.c
 	autoreconf -fi
 }
+
 post_install() {
-	rm -f ${DESTDIR}/usr/share/locale/locale.alias
+	rm ${DESTDIR}/usr/share/locale/locale.alias
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: elinks: update to 0.14.0, switch upstream.
  2020-12-28  5:23 [PR PATCH] elinks: update to 0.14.0, switch upstream ericonr
@ 2020-12-28  5:47 ` ericonr
  0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2020-12-28  5:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

There's a merged pull request on the void-packages repository

elinks: update to 0.14.0, switch upstream.
https://github.com/void-linux/void-packages/pull/27492

Description:


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-12-28  5:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-28  5:23 [PR PATCH] elinks: update to 0.14.0, switch upstream ericonr
2020-12-28  5:47 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).