Hello community, here is the log from the commit of package w3m for openSUSE:Factory checked in at Fri Apr 22 22:52:01 CEST 2011. -------- --- w3m/w3m.changes 2010-06-15 18:31:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/w3m/w3m.changes 2011-01-18 15:34:55.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Jan 18 14:33:24 UTC 2011 - max@novell.com + +- Version 0.5.3: + * security fix + - fix vulnerabilities indicated by bugs.debian.org. + - suppress sending Referer, if https:// -> http:// + * new features + - adapt w3mimg to native windows on MS Windows. + - support xterm-incompatible terminals without gpm. + - add "xhtml" to default guess. + - introduce option pseudo_inlines. + - add option to avoid "wrong number of dots" error in cookies. + * other bug fixes + - fix "important" bugs from bugs.debian.org + - preserve spaces in multibyte context. + - fix proxy authentication. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- w3m-0.5.2.tar.bz2 w3m-CVE-2010-2074.patch New: ---- w3m-0.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ w3m.spec ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:32.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package w3m (Version 0.5.2) +# spec file for package w3m # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: w3m BuildRequires: gcc-c++ gpm imlib2-devel ncurses-devel openssl-devel pkgconfig Url: http://w3m.sourceforge.net/ -Version: 0.5.2 -Release: 133 +Version: 0.5.3 +Release: 1 Summary: A text-based WWW browser License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Web/Browsers @@ -41,7 +41,6 @@ Patch7: w3m-tempdir-override.patch Patch8: w3m-parsetagx-crash.patch Patch9: w3m-history-crossdev.patch -Patch10: w3m-CVE-2010-2074.patch Patch11: w3m-ssl-verify.patch Patch12: w3m-closedir.patch Patch500: gc-gcc4.patch @@ -112,7 +111,6 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 %patch11 %patch12 cd ../gc* ++++++ w3m-0.4.1-session-mgmt.dif ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:32.000000000 +0200 @@ -5,20 +5,20 @@ Index: fm.h =================================================================== ---- fm.h.orig 2006-03-18 02:45:07.000000000 +0100 -+++ fm.h 2006-03-18 02:45:07.000000000 +0100 -@@ -908,6 +908,7 @@ global int emacs_like_lineedit init(FALS +--- fm.h.orig ++++ fm.h +@@ -933,6 +933,7 @@ global int emacs_like_lineedit init(FALS global int vi_prec_num init(FALSE); global int label_topline init(FALSE); global int nextpage_topline init(FALSE); +global char *Session init(NULL); global char *displayTitleTerm init(NULL); global int displayLink init(FALSE); - global int displayLineInfo init(FALSE); + global int displayLinkNumber init(FALSE); Index: history.c =================================================================== ---- history.c.orig 2003-09-26 19:59:51.000000000 +0200 -+++ history.c 2006-03-18 02:45:07.000000000 +0100 +--- history.c.orig ++++ history.c @@ -1,5 +1,6 @@ /* $Id: history.c,v 1.11 2003/09/26 17:59:51 ukai Exp $ */ #include "fm.h" @@ -73,8 +73,8 @@ Index: main.c =================================================================== ---- main.c.orig 2004-04-04 18:47:20.000000000 +0200 -+++ main.c 2006-03-18 02:45:07.000000000 +0100 +--- main.c.orig ++++ main.c @@ -6,6 +6,7 @@ #include <sys/stat.h> #include <sys/types.h> @@ -83,7 +83,7 @@ #include <fcntl.h> #if defined(HAVE_WAITPID) || defined(HAVE_WAIT3) #include <sys/wait.h> -@@ -221,6 +222,7 @@ fusage(FILE * f, int err) +@@ -234,6 +235,7 @@ fusage(FILE * f, int err) fprintf(f, " -header string insert string as a header\n"); fprintf(f, " +<num> goto <num> line\n"); fprintf(f, " -num show line number\n"); @@ -91,7 +91,7 @@ fprintf(f, " -no-proxy don't use proxy\n"); #ifdef INET6 fprintf(f, " -4 IPv4 only (-o dns_order=4)\n"); -@@ -262,6 +264,8 @@ static char *getCodePage(void); +@@ -271,6 +273,8 @@ static char *getCodePage(void); #endif #endif @@ -100,7 +100,7 @@ static GC_warn_proc orig_GC_warn_proc = NULL; #define GC_WARN_KEEP_MAX (20) -@@ -702,6 +706,8 @@ main(int argc, char **argv, char **envp) +@@ -707,6 +711,8 @@ main(int argc, char **argv, char **envp) squeezeBlankLine = TRUE; else if (!strcmp("-X", argv[i])) Do_not_use_ti_te = TRUE; @@ -109,7 +109,7 @@ else if (!strcmp("-title", argv[i])) displayTitleTerm = getenv("TERM"); else if (!strncmp("-title=", argv[i], 7)) -@@ -739,6 +745,22 @@ main(int argc, char **argv, char **envp) +@@ -748,6 +754,22 @@ main(int argc, char **argv, char **envp) i++; } @@ -132,7 +132,7 @@ #ifdef __WATT32__ if (w3m_debug) dbug_init(); -@@ -1340,14 +1362,54 @@ tmpClearBuffer(Buffer *buf) +@@ -1386,14 +1408,54 @@ tmpClearBuffer(Buffer *buf) static Str currentURL(void); #ifdef USE_BUFINFO ++++++ w3m-0.4.1-textarea-segfault.dif ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:32.000000000 +0200 @@ -1,6 +1,8 @@ ---- w3m-0.5.1/terms.c -+++ w3m-0.5.1/terms.c -@@ -583,7 +583,8 @@ +Index: w3m-0.5.3/terms.c +=================================================================== +--- w3m-0.5.3.orig/terms.c ++++ w3m-0.5.3/terms.c +@@ -634,7 +634,8 @@ reset_tty(void) writestr(T_se); /* reset terminal */ flush_tty(); TerminalSet(tty, &d_ioval); @@ -9,4 +11,4 @@ + close_tty(); } - MySignalHandler + static MySignalHandler ++++++ w3m-0.5.1-no-ASCII-equivalents-by-default.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:32.000000000 +0200 @@ -10,14 +10,14 @@ Index: fm.h =================================================================== ---- fm.h.orig 2007-02-16 14:27:28.000000000 +0100 -+++ fm.h 2007-02-16 14:33:36.000000000 +0100 -@@ -1030,7 +1030,7 @@ global char SearchConv init(TRUE); +--- fm.h.orig ++++ fm.h +@@ -1066,7 +1066,7 @@ global char SimplePreserveSpace init(FAL #define wc_Str_conv(x,charset0,charset1) (x) #define wc_Str_conv_strict(x,charset0,charset1) (x) #endif -global char UseAltEntity init(TRUE); +global char UseAltEntity init(FALSE); - global char UseGraphicChar init(FALSE); - extern char *graph_symbol[]; - extern char *graph2_symbol[]; + #define GRAPHIC_CHAR_ASCII 2 + #define GRAPHIC_CHAR_DEC 1 + #define GRAPHIC_CHAR_CHARSET 0 ++++++ w3m-0.5.2.tar.bz2 -> w3m-0.5.3.tar.bz2 ++++++ ++++ 75381 lines of diff (skipped) ++++++ w3m-closedir.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -1,6 +1,8 @@ ---- local.c +Index: local.c +=================================================================== +--- local.c.orig +++ local.c -@@ -109,6 +109,7 @@ +@@ -109,6 +109,7 @@ loadLocalDir(char *dname) n++; } } ++++++ w3m-disable-cookie-special-domain-check.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -1,24 +1,28 @@ ---- w3m-0.5.2/cookie.c -+++ w3m-0.5.2/cookie.c -@@ -306,6 +306,7 @@ - if (n < 2) { - COOKIE_ERROR(COO_ESPECIAL); +Index: w3m-0.5.3/cookie.c +=================================================================== +--- w3m-0.5.3.orig/cookie.c ++++ w3m-0.5.3/cookie.c +@@ -332,6 +332,7 @@ add_cookie(ParsedURL *pu, Str name, Str + COOKIE_ERROR(COO_ESPECIAL); + } } +#if 0 else if (n == 2) { char **sdomain; int ok = 0; -@@ -318,6 +319,7 @@ - if (!ok) +@@ -345,6 +346,7 @@ add_cookie(ParsedURL *pu, Str name, Str COOKIE_ERROR(COO_ESPECIAL); + } } +#endif } else { /* [DRAFT 12] s. 4.3.2 case 2 */ ---- w3m-0.5.2/fm.h -+++ w3m-0.5.2/fm.h -@@ -722,7 +722,7 @@ +Index: w3m-0.5.3/fm.h +=================================================================== +--- w3m-0.5.3.orig/fm.h ++++ w3m-0.5.3/fm.h +@@ -726,7 +726,7 @@ struct cookie { /* version 1' refers to the Internet draft to obsolete RFC 2109 */ #define COO_EINTERNAL (1) /* unknown error; probably forgot to convert "return 1" in cookie.c */ #define COO_ETAIL (2 | COO_OVERRIDE_OK) /* tail match failed (version 0) */ @@ -27,9 +31,11 @@ #define COO_EPATH (4) /* Path attribute mismatch (version 1 case 1) */ #define COO_ENODOT (5 | COO_OVERRIDE_OK) /* no embedded dots in Domain (version 1 case 2.1) */ #define COO_ENOTV1DOM (6 | COO_OVERRIDE_OK) /* Domain does not start with a dot (version 1 case 2.2) */ ---- w3m-0.5.2/rc.c -+++ w3m-0.5.2/rc.c -@@ -310,7 +310,7 @@ +Index: w3m-0.5.3/rc.c +=================================================================== +--- w3m-0.5.3.orig/rc.c ++++ w3m-0.5.3/rc.c +@@ -316,7 +316,7 @@ static struct sel_c dnsorders[] = { #ifdef USE_COOKIE static struct sel_c badcookiestr[] = { {N_S(ACCEPT_BAD_COOKIE_DISCARD), N_("discard")}, ++++++ w3m-helppaths.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -1,6 +1,8 @@ ---- w3m-0.5.2/scripts/w3mhelp.cgi.in -+++ w3m-0.5.2/scripts/w3mhelp.cgi.in -@@ -7,7 +7,7 @@ +Index: w3m-0.5.3/scripts/w3mhelp.cgi.in +=================================================================== +--- w3m-0.5.3.orig/scripts/w3mhelp.cgi.in ++++ w3m-0.5.3/scripts/w3mhelp.cgi.in +@@ -7,7 +7,7 @@ if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) $prefix = "@prefix@"; $datarootdir = "@datarootdir@"; ++++++ w3m-history-crossdev.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -2,8 +2,10 @@ history.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) ---- a/history.c -+++ b/history.c +Index: w3m-0.5.3/history.c +=================================================================== +--- w3m-0.5.3.orig/history.c ++++ w3m-0.5.3/history.c @@ -68,11 +68,13 @@ loadHistory(Hist *hist) void saveHistory(Hist *hist, size_t size) ++++++ w3m-parsetagx-crash.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -2,8 +2,10 @@ parsetagx.c | 1 + 1 file changed, 1 insertion(+) ---- a/parsetagx.c -+++ b/parsetagx.c +Index: w3m-0.5.3/parsetagx.c +=================================================================== +--- w3m-0.5.3.orig/parsetagx.c ++++ w3m-0.5.3/parsetagx.c @@ -221,6 +221,7 @@ parse_tag(char **s, int internal) int j, hidden=FALSE; for (j=0; j<i; j++) { ++++++ w3m-ssl-verify.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -2,9 +2,9 @@ Also disable use of SSLv2 by default as it's insecure, deprecated, dead since last century. Index: fm.h =================================================================== ---- fm.h +--- fm.h.orig +++ fm.h -@@ -1120,7 +1120,7 @@ global int view_unseenobject init(TRUE); +@@ -1136,7 +1136,7 @@ global int view_unseenobject init(TRUE); #endif #if defined(USE_SSL) && defined(USE_SSL_VERIFY) @@ -13,7 +13,7 @@ global char *ssl_cert_file init(NULL); global char *ssl_key_file init(NULL); global char *ssl_ca_path init(NULL); -@@ -1129,7 +1129,7 @@ global int ssl_path_modified init(FALSE) +@@ -1145,7 +1145,7 @@ global int ssl_path_modified init(FALSE) #endif /* defined(USE_SSL) && * defined(USE_SSL_VERIFY) */ #ifdef USE_SSL @@ -22,4 +22,3 @@ #endif global int is_redisplay init(FALSE); - ++++++ w3m-tempdir-override.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -2,9 +2,11 @@ rc.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) ---- a/rc.c -+++ b/rc.c -@@ -1182,7 +1182,16 @@ sync_with_option(void) +Index: w3m-0.5.3/rc.c +=================================================================== +--- w3m-0.5.3.orig/rc.c ++++ w3m-0.5.3/rc.c +@@ -1225,7 +1225,16 @@ sync_with_option(void) #endif /* MENU */ } } @@ -22,7 +24,7 @@ void init_rc(void) { -@@ -1190,9 +1199,11 @@ init_rc(void) +@@ -1233,9 +1242,11 @@ init_rc(void) struct stat st; FILE *f; @@ -34,7 +36,7 @@ rc_dir = expandPath(RC_DIR); i = strlen(rc_dir); if (i > 1 && rc_dir[i - 1] == '/') -@@ -1229,7 +1240,6 @@ init_rc(void) +@@ -1272,7 +1283,6 @@ init_rc(void) goto rc_dir_err; } no_rc_dir = FALSE; @@ -42,7 +44,7 @@ if (config_file == NULL) config_file = rcFile(CONFIG_FILE); -@@ -1250,13 +1260,12 @@ init_rc(void) +@@ -1293,13 +1303,12 @@ init_rc(void) interpret_rc(f); fclose(f); } @@ -57,5 +59,5 @@ - ((tmp_dir = getenv("TEMP")) == NULL || *tmp_dir == '\0')) + if (!tmp_dir) tmp_dir = "/tmp"; - } - + create_option_search_table(); + goto open_rc; ++++++ w3m-uninitialized.patch ++++++ --- /var/tmp/diff_new_pack.e1knsC/_old 2011-04-22 22:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.e1knsC/_new 2011-04-22 22:51:33.000000000 +0200 @@ -5,6 +5,8 @@ regex.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) +Index: anchor.c +=================================================================== --- anchor.c.orig +++ anchor.c @@ -11,7 +11,7 @@ putAnchor(AnchorList *al, char *url, cha @@ -16,6 +18,8 @@ if (al == NULL) { al = New(AnchorList); al->anchors = NULL; +Index: libwc/gb18030.c +=================================================================== --- libwc/gb18030.c.orig +++ libwc/gb18030.c @@ -151,6 +151,7 @@ wc_ucs_to_gb18030(wc_uint32 ucs) @@ -26,9 +30,11 @@ return cc; } #endif +Index: libwc/ucs.c +=================================================================== --- libwc/ucs.c.orig +++ libwc/ucs.c -@@ -94,6 +94,7 @@ wc_ucs_to_any(wc_uint32 ucs, wc_table *t +@@ -100,6 +100,7 @@ wc_ucs_to_any(wc_uint32 ucs, wc_table *t return t->conv(t->ccs, map->code2); } cc.ccs = WC_CCS_UNKNOWN; @@ -36,6 +42,8 @@ return cc; } +Index: regex.c +=================================================================== --- regex.c.orig +++ regex.c @@ -77,7 +77,7 @@ static longchar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org