commit w3m for openSUSE:Factory

Hello community, here is the log from the commit of package w3m for openSUSE:Factory checked in at 2016-06-29 15:08:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/w3m (Old) and /work/SRC/openSUSE:Factory/.w3m.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "w3m" Changes: -------- --- /work/SRC/openSUSE:Factory/w3m/w3m.changes 2015-03-23 12:12:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2016-06-29 15:08:55.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 24 08:09:45 UTC 2016 - fweiss@suse.com + +- w3mman-formatting.patch: w3mman now doesn't show invalid + characters anymore (bsc#950800) + +------------------------------------------------------------------- +Wed Jun 22 12:43:27 UTC 2016 - max@suse.com + +- Add w3m-scheme.patch to fix a segfault when doing a https request + to an unresolvable host (bsc#950468). + +------------------------------------------------------------------- New: ---- w3m-scheme.patch w3mman-formatting.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ w3m.spec ++++++ --- /var/tmp/diff_new_pack.IuYTQN/_old 2016-06-29 15:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.IuYTQN/_new 2016-06-29 15:08:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package w3m # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -38,6 +38,8 @@ Patch12: w3m-closedir.patch Patch13: w3m-parallel-make.patch Patch14: w3m-fix-build-with-imlib2-1.4.6.patch +Patch15: w3m-scheme.patch +Patch16: w3mman-formatting.patch Patch503: w3m-fh-def.patch Patch504: w3m-openssl.patch Patch505: w3m-gc7.diff @@ -105,6 +107,8 @@ %patch12 %patch13 -p1 %patch14 -p1 +%patch15 -p1 +%patch16 -p1 %patch503 %patch504 %patch -P 505 -p1 ++++++ w3m-scheme.patch ++++++

From c155b93830b353a68468fb063df67987ed284142 Mon Sep 17 00:00:00 2001 From: AIDA Shinra Date: Mon, 14 Oct 2013 22:39:55 +0900 Subject: Define schemeNumToName() to fix scheme bug

Patch from http://www.j10n.org/files/w3m-cvs-1.1055-schemebug.patch, [w3m-dev:04470] on 2013-10-14. --- url.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/url.c b/url.c index ed6062e..6dbd5d3 100644 --- a/url.c +++ b/url.c @@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = { }; static void add_index_file(ParsedURL *pu, URLFile *uf); +static char * schemeNumToName(int scheme); /* #define HTTP_DEFAULT_FILE "/index.html" */ @@ -1280,6 +1281,18 @@ getURLScheme(char **url) } static char * +schemeNumToName(int scheme) +{ + int i; + + for (i = 0; schemetable[i].cmdname != NULL; i++) { + if (schemetable[i].cmd == scheme) + return schemetable[i].cmdname; + } + return NULL; +} + +static char * otherinfo(ParsedURL *target, ParsedURL *current, char *referer) { Str s = Strnew(); @@ -1603,7 +1616,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, pu->host != NULL && !check_no_proxy(pu->host)) { hr->flag |= HR_FLAG_PROXY; sock = openSocket(FTP_proxy_parsed.host, - schemetable[FTP_proxy_parsed.scheme].cmdname, + schemeNumToName(FTP_proxy_parsed.scheme), FTP_proxy_parsed.port); if (sock < 0) return uf; @@ -1645,15 +1658,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, } else if (pu->scheme == SCM_HTTPS) { sock = openSocket(HTTPS_proxy_parsed.host, - schemetable[HTTPS_proxy_parsed.scheme]. - cmdname, HTTPS_proxy_parsed.port); + schemeNumToName(HTTPS_proxy_parsed.scheme), + HTTPS_proxy_parsed.port); sslh = NULL; } else { #endif /* USE_SSL */ sock = openSocket(HTTP_proxy_parsed.host, - schemetable[HTTP_proxy_parsed.scheme]. - cmdname, HTTP_proxy_parsed.port); + schemeNumToName(HTTP_proxy_parsed.scheme), + HTTP_proxy_parsed.port); #ifdef USE_SSL sslh = NULL; } @@ -1685,8 +1698,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, } } else { - sock = openSocket(pu->host, - schemetable[pu->scheme].cmdname, pu->port); + sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port); if (sock < 0) { *status = HTST_MISSING; return uf; @@ -1750,7 +1762,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, pu->host != NULL && !check_no_proxy(pu->host)) { hr->flag |= HR_FLAG_PROXY; sock = openSocket(GOPHER_proxy_parsed.host, - schemetable[GOPHER_proxy_parsed.scheme].cmdname, + schemeNumToName(GOPHER_proxy_parsed.scheme), GOPHER_proxy_parsed.port); if (sock < 0) return uf; @@ -1758,8 +1770,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, tmp = HTTPrequest(pu, current, hr, extra_header); } else { - sock = openSocket(pu->host, - schemetable[pu->scheme].cmdname, pu->port); + sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port); if (sock < 0) return uf; if (pu->file == NULL) -- cgit v0.12 ++++++ w3mman-formatting.patch ++++++ Index: w3m-0.5.3/scripts/w3mman/w3mman2html.cgi.in =================================================================== --- w3m-0.5.3.orig/scripts/w3mman/w3mman2html.cgi.in +++ w3m-0.5.3/scripts/w3mman/w3mman2html.cgi.in @@ -76,7 +76,7 @@ if ($query{"local"}) { if (! ($file =~ /^\//)) { $file = $query{"pwd"} . '/' . $file; } - open(F, "MAN_KEEP_FORMATTING=1 $MAN -l $file 2> /dev/null |"); + open(F, "$MAN -l $file 2> /dev/null |"); } else { $man = $query{"man"}; if ($man =~ s/\((\w+)\)$//) { @@ -92,7 +92,7 @@ if ($query{"local"}) { $section =~ s:([^-\w\200-\377.,])::g; $man =~ s:([^-\w\200-\377.,])::g; - open(F, "MAN_KEEP_FORMATTING=1 $MAN $section $man 2> /dev/null |"); + open(F, "$MAN $section $man 2> /dev/null |"); } $ok = 0; undef $header;