w3m: security update to 0.5.3.git20161120.

We switch to the Debian-maintained branch.  It fixes at least 23 CVE.

srcpkgs/w3m/patches/RAND_egd.libressl.patch

@@ -1,11 +0,0 @@
---- url.c.orig	2014-07-14 12:31:30.476563116 +0200
-+++ url.c	2014-07-14 12:32:16.364918248 +0200
-@@ -268,7 +268,7 @@ init_PRNG()
-     if (RAND_status())
- 	return;
-     if ((file = RAND_file_name(buffer, sizeof(buffer)))) {
--#ifdef USE_EGD
-+#if defined(USE_EGD) && defined(HAVE_SSL_RAND_EGD)
- 	if (RAND_egd(file) > 0)
- 	    return;
- #endif

srcpkgs/w3m/patches/file_handle.patch

@@ -1,58 +0,0 @@
---- istream.c	2011-01-04 20:22:22.000000000 +1100
-+++ istream.c	2012-07-04 21:50:51.529661517 +1000
-@@ -22,8 +22,8 @@
- static void basic_close(int *handle);
- static int basic_read(int *handle, char *buf, int len);
- 
--static void file_close(struct file_handle *handle);
--static int file_read(struct file_handle *handle, char *buf, int len);
-+static void file_close(struct file_handle_rofl *handle);
-+static int file_read(struct file_handle_rofl *handle, char *buf, int len);
- 
- static int str_read(Str handle, char *buf, int len);
- 
-@@ -114,7 +114,7 @@
-     stream = New(union input_stream);
-     init_base_stream(&stream->base, STREAM_BUF_SIZE);
-     stream->file.type = IST_FILE;
--    stream->file.handle = New(struct file_handle);
-+    stream->file.handle = New(struct file_handle_rofl);
-     stream->file.handle->f = f;
-     if (closep)
- 	stream->file.handle->close = closep;
-@@ -658,13 +658,13 @@
- }
- 
- static void
--file_close(struct file_handle *handle)
-+file_close(struct file_handle_rofl *handle)
- {
-     handle->close(handle->f);
- }
- 
- static int
--file_read(struct file_handle *handle, char *buf, int len)
-+file_read(struct file_handle_rofl *handle, char *buf, int len)
- {
-     return fread(buf, 1, len, handle->f);
- }
---- istream.h	2003-10-21 02:41:56.000000000 +1000
-+++ istream.h	2012-07-04 21:50:51.529661517 +1000
-@@ -20,7 +20,7 @@
- 
- typedef struct stream_buffer *StreamBuffer;
- 
--struct file_handle {
-+struct file_handle_rofl {
-     FILE *f;
-     void (*close) ();
- };
-@@ -53,7 +53,7 @@
- 
- struct file_stream {
-     struct stream_buffer stream;
--    struct file_handle *handle;
-+    struct file_handle_rofl *handle;
-     char type;
-     char iseos;
-     int (*read) ();

srcpkgs/w3m/patches/form.patch

@@ -1,11 +0,0 @@
---- ./form.c.orig	2015-11-03 15:57:35.871972116 -0500
-+++ ./form.c	2015-11-03 15:57:54.129972326 -0500
-@@ -196,7 +196,7 @@
- 	if (!strcasecmp(typestr, _formtypetbl[i]))
- 	    return i;
-     }
--    return FORM_UNKNOWN;
-+    return FORM_INPUT_TEXT;
- }
- 
- void

srcpkgs/w3m/patches/gc72.patch

@@ -1,12 +0,0 @@
---- main.c	2011-01-04 20:42:19.000000000 +1100
-+++ main.c	2012-07-04 21:49:10.136212236 +1000
-@@ -833,7 +833,8 @@
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
--    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+    orig_GC_warn_proc = GC_get_warn_proc();
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */

srcpkgs/w3m/patches/perl.patch

@@ -1,22 +0,0 @@
---- ./scripts/w3mhelp.cgi.in.orig	2011-01-04 04:22:28.000000000 -0500
-+++ ./scripts/w3mhelp.cgi.in	2015-11-03 16:42:22.593003004 -0500
-@@ -48,7 +48,7 @@
- 	}
- 	# print "tlang=$tlang\n";
- 	eval {require "w3mhelp-funcdesc.$tlang.pl";};
--	if (defined(%funcdesc)) {
-+	if (%funcdesc) {
- 	    $lang = $tlang;
- 	}
-     }
---- ./scripts/w3mman/w3mman2html.cgi.in.orig	2015-11-03 17:08:16.109020865 -0500
-+++ ./scripts/w3mman/w3mman2html.cgi.in	2015-11-03 17:09:02.749021401 -0500
-@@ -220,7 +220,7 @@
-   local($p);
- 
-   (! -d && -x) || return 0;
--  if (! defined(%PATH)) {
-+  if (!%PATH) {
-     for $p (split(":", $ENV{'PATH'})) {
-       $p =~ s@/+$@@;
-       $PATH{$p} = 1;

srcpkgs/w3m/template

@@ -1,19 +1,20 @@
 # Template file for 'w3m'
 pkgname=w3m
-version=0.5.3
-revision=15
+version=0.5.3.git20161120
+revision=1
+wrksrc="${pkgname}-${version/.git/-git}"
 build_style=gnu-configure
 configure_args="
  --libexecdir=/usr/lib --enable-image=x11,fb --with-imagelib=imlib2
  --with-termlib=ncurses --disable-w3mmailer --disable-mouse"
 hostmakedepends="pkg-config gc-devel perl"
 makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel libX11-devel"
-short_desc="Text-based Web browser, as well as pager"
+short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
 homepage="http://w3m.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/w3m/w3m-${version}.tar.gz"
-checksum=e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
+distfiles="https://github.com/tats/w3m/archive/v${version/.git/+git}.tar.gz"
+checksum=62a5b066aaf5e23afec6decd962b966f333352150f8072193cba98320676f060
 
 disable_parallel_build=yes