commit w3m for openSUSE:Factory

2018-01-30 Thread root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2018-01-30 15:36:56

Comparing /work/SRC/openSUSE:Factory/w3m (Old)
 and  /work/SRC/openSUSE:Factory/.w3m.new (New)


Package is "w3m"

Tue Jan 30 15:36:56 2018 rev:45 rq:569803 version:0.5.3+git20180125

Changes:

--- /work/SRC/openSUSE:Factory/w3m/w3m.changes  2016-12-02 16:36:58.0 
+0100
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2018-01-30 
15:37:21.222353227 +0100
@@ -1,0 +2,17 @@
+Thu Jan 25 10:26:25 UTC 2018 - thomas.bl...@suse.com
+
+- add git ChangeLog to /usr/share/doc/w3m/
+
+- update to version 0.5.3+git20180125
+  addressed security issue:
+ CVE-2018-6196: w3m: an infinite recursion flaw in HTMLlineproc0 
+   because the feed_table_block_tag function in table.c does not 
+   prevent a negative indent value allows for (bsc#1077559)
+ CVE-2018-6197: w3m: NULL pointer dereference flaw in formUpdateBuffer 
+   in form.c (bsc#1077568)
+ CVE-2018-6198: w3m: does not properly handle temporary files when 
+   the ~/.w3m directory is unwritable, which allows a local attacker 
to 
+   craft a symlink attack to overwrite arbitrary files (bsc#1077572)
+  other changes, bugfixes see: /usr/share/doc/w3m/ChangeLog
+
+---

Old:

  w3m-0.5.3.git20161120.tar.xz

New:

  w3m-0.5.3+git20180125.tar.xz



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.ArXK56/_old  2018-01-30 15:37:21.862323348 +0100
+++ /var/tmp/diff_new_pack.ArXK56/_new  2018-01-30 15:37:21.866323161 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package w3m
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,7 +18,7 @@
 
 Name:   w3m
 Url:http://w3m.sourceforge.net/
-Version:0.5.3.git20161120
+Version:0.5.3+git20180125
 Release:0
 Summary:A text-based WWW browser
 License:ISC
@@ -124,6 +124,7 @@
 /usr/bin/w3m
 /usr/bin/w3mman
 %doc doc/*
+%doc ChangeLog
 %_mandir/de/man1/w3m*
 %_libdir/w3m
 %exclude %_libdir/w3m/w3mimgdisplay

++ _service ++
--- /var/tmp/diff_new_pack.ArXK56/_old  2018-01-30 15:37:21.910321106 +0100
+++ /var/tmp/diff_new_pack.ArXK56/_new  2018-01-30 15:37:21.910321106 +0100
@@ -4,7 +4,7 @@
 https://github.com/tblume/w3m.git
 
 w3m
-0.5.3.git20161120
+0.5.3+git20180125
 master
 
 




commit w3m for openSUSE:Factory

2016-12-02 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2016-12-02 16:36:57

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  2016-06-29 15:08:55.0 
+0200
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2016-12-02 
16:36:58.0 +0100
@@ -2 +2,57 @@
-Fri Jun 24 08:09:45 UTC 2016 - fwe...@suse.com
+Thu Nov 24 11:18:22 UTC 2016 - thomas.bl...@suse.com
+
+- update to debian git version (bsc#1011293)
+  addressed security issues:
+ CVE-2016-9621: w3m: global-buffer-overflow write (bsc#1012020)
+ CVE-2016-9622: w3m: null deref (bsc#1012021)
+ CVE-2016-9623: w3m: null deref (bsc#1012022)
+ CVE-2016-9624: w3m: near-null deref (bsc#1012023)
+ CVE-2016-9625: w3m: stack overflow (bsc#1012024)
+ CVE-2016-9626: w3m: stack overflow (bsc#1012025)
+ CVE-2016-9627: w3m: heap overflow read + deref (bsc#1012026)
+ CVE-2016-9628: w3m: null deref (bsc#1012027)
+ CVE-2016-9629: w3m: null deref (bsc#1012028)
+ CVE-2016-9630: w3m: global-buffer-overflow read (bsc#1012029)
+ CVE-2016-9631: w3m: null deref (bsc#1012030)
+ CVE-2016-9632: w3m: global-buffer-overflow read (bsc#1012031)
+ CVE-2016-9633: w3m: OOM (bsc#1012032)
+ CVE-2016-9434: w3m: null deref (bsc#1011283)
+ CVE-2016-9435: w3m: use uninit value (bsc#1011284)
+ CVE-2016-9436: w3m: use uninit value (bsc#1011285)
+ CVE-2016-9437: w3m: write to rodata (bsc#1011286)
+ CVE-2016-9438: w3m: null deref (bsc#1011287)
+ CVE-2016-9439: w3m: stack overflow (bsc#1011288)
+ CVE-2016-9440: w3m: near-null deref (bsc#1011289)
+ CVE-2016-9441: w3m: near-null deref (bsc#1011290)
+ CVE-2016-9442: w3m: potential heap buffer corruption (bsc#1011291)
+ CVE-2016-9443: w3m: null deref (bsc#1011292)
+
+  dropped patches:
+ w3m-fix-build-with-imlib2-1.4.6.patch
+ w3m-scheme.patch
+ w3mman-formatting.patch
+ w3m-parallel-make.patch
+ w3m-gc7.diff
+ w3m-openssl.patch
+ w3m-closedir.patch
+ w3m-fh-def.patch
+ w3m-ssl-verify.patch
+ w3m-parsetagx-crash.patch
+ w3m-tempdir-override.patch
+ w3m-0.5.1-no-ASCII-equivalents-by-default.patch
+ w3m-uninitialized.patch
+ w3m-inline-image.patch
+ w3m-0.4.1-textarea-segfault.dif
+
+   ported patches:
+ w3m-disable-cookie-special-domain-check.patch to
+ 0001-allow-to-configure-the-accept-option-for-bad-cookies.patch
+ w3m-0.4.1-session-mgmt.dif to
+ 0001-implements-simple-session-management.patch 
+ w3m-history-crossdev.patch to
+ 0001-handle-EXDEV-during-history-file-rename.patch
+ w3mman-formatting.patch to 
+ 0001-w3mman-don-t-show-invalid-characters-bsc-950800.patch
+
+---
+Fri Jun 24 07:24:53 UTC 2016 - fwe...@suse.com

Old:

  w3m-0.4.1-session-mgmt.dif
  w3m-0.4.1-textarea-segfault.dif
  w3m-0.5.1-no-ASCII-equivalents-by-default.patch
  w3m-0.5.3.tar.bz2
  w3m-closedir.patch
  w3m-disable-cookie-special-domain-check.patch
  w3m-fh-def.patch
  w3m-fix-build-with-imlib2-1.4.6.patch
  w3m-gc7.diff
  w3m-history-crossdev.patch
  w3m-inline-image.patch
  w3m-openssl.patch
  w3m-parallel-make.patch
  w3m-parsetagx-crash.patch
  w3m-scheme.patch
  w3m-ssl-verify.patch
  w3m-tempdir-override.patch
  w3m-uninitialized.patch
  w3mman-formatting.patch

New:

  0001-allow-to-configure-the-accept-option-for-bad-cookies.patch
  0001-handle-EXDEV-during-history-file-rename.patch
  0001-implements-simple-session-management.patch
  0001-w3mman-don-t-show-invalid-characters-bsc-950800.patch
  _service
  w3m-0.5.3.git20161120.tar.xz



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.p2W3ms/_old  2016-12-02 16:36:59.0 +0100
+++ /var/tmp/diff_new_pack.p2W3ms/_new  2016-12-02 16:36:59.0 +0100
@@ -18,31 +18,17 @@
 
 Name:   w3m
 Url:http://w3m.sourceforge.net/
-Version:0.5.3
+Version:0.5.3.git20161120
 Release:0
 Summary:A text-based WWW browser
 License:ISC
 Group:  Productivity/Networking/Web/Browsers
 
-Source: http://prdownloads.sourceforge.net/w3m/w3m-%version.tar.bz2
-Patch0: w3m-disable-cookie-special-domain-check.patch
-Patch1: w3m-0.4.1-textarea-segfault.dif
-Patch2: w3m-0.4.1-session-mgmt.dif
-Patch4: w3m-inline-image.patch
-Patch5: 

commit w3m for openSUSE:Factory

2016-06-29 Thread h_root
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.0 
+0100
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2016-06-29 
15:08:55.0 +0200
@@ -1,0 +2,12 @@
+Fri Jun 24 08:09:45 UTC 2016 - fwe...@suse.com
+
+- w3mman-formatting.patch: w3mman now doesn't show invalid
+  characters anymore (bsc#950800) 
+
+---
+Wed Jun 22 12:43:27 UTC 2016 - m...@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.0 +0200
+++ /var/tmp/diff_new_pack.IuYTQN/_new  2016-06-29 15:08:56.0 +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 ,
[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 

commit w3m for openSUSE:Factory

2015-03-23 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2015-03-23 12:12:49

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  2014-12-23 11:48:38.0 
+0100
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2015-03-23 
12:12:50.0 +0100
@@ -1,0 +2,6 @@
+Mon Mar  2 04:05:20 UTC 2015 - m...@suse.com
+
+- Add w3m-fix-build-with-imlib2-1.4.6.patch: fix build with imlib2 1.4.6,
+  the patch is from Debian. See http://sourceforge.net/p/w3m/patches/70/
+
+---

New:

  w3m-fix-build-with-imlib2-1.4.6.patch



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.RaD94W/_old  2015-03-23 12:12:51.0 +0100
+++ /var/tmp/diff_new_pack.RaD94W/_new  2015-03-23 12:12:51.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package w3m
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -37,6 +37,7 @@
 Patch11:w3m-ssl-verify.patch
 Patch12:w3m-closedir.patch
 Patch13:w3m-parallel-make.patch
+Patch14:w3m-fix-build-with-imlib2-1.4.6.patch
 Patch503:   w3m-fh-def.patch
 Patch504:   w3m-openssl.patch
 Patch505:   w3m-gc7.diff
@@ -103,6 +104,7 @@
 %patch11
 %patch12
 %patch13 -p1
+%patch14 -p1
 %patch503
 %patch504
 %patch -P 505 -p1

++ w3m-fix-build-with-imlib2-1.4.6.patch ++
From bc4000470194df630837b2b0acd1ea4e9d1702b5 Mon Sep 17 00:00:00 2001
From: Tatsuya Kinoshita t...@debian.org
Date: Fri, 3 Jan 2014 16:33:18 +0900
Subject: [PATCH] Use pkg-config to build with imlib2 1.4.6

---
 acinclude.m4 | 7 +--
 configure| 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e4ccc3d..56d6338 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -649,6 +649,9 @@ AC_DEFUN([AC_W3M_IMAGE],
  fi;;
imlib2)
  with_imlib2=yes
+ if test x$PKG_CONFIG = x; then
+   PKG_CONFIG=pkg-config
+ fi
  if test x$IMLIB2_CONFIG = x; then
IMLIB2_CONFIG=imlib2-config
  fi;;
@@ -728,7 +731,7 @@ AC_DEFUN([AC_W3M_IMAGE],
  IMGTARGETS=x11
  AC_DEFINE(USE_IMLIB2)
  IMGX11CFLAGS=`${IMLIB2_CONFIG} --cflags`
- IMGX11LDFLAGS=`${IMLIB2_CONFIG} --libs`
+ IMGX11LDFLAGS=-lX11 `${PKG_CONFIG} --libs imlib2`
else
  AC_MSG_WARN([unable to build w3mimgdisplay with X11 support])
fi
@@ -756,7 +759,7 @@ AC_DEFUN([AC_W3M_IMAGE],
  AC_DEFINE(USE_IMLIB2)
  IMGOBJS=$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o
  IMGFBCFLAGS=`${IMLIB2_CONFIG} --cflags`
- IMGFBLDFLAGS=`${IMLIB2_CONFIG} --libs`
+ IMGFBLDFLAGS=`${PKG_CONFIG} --libs imlib2`
else
  AC_MSG_WARN([unable to build w3mimgdisplay with FB support])
fi
diff --git a/configure b/configure
index 4c1bc06..01153c1 100755
--- a/configure
+++ b/configure
@@ -6811,6 +6811,9 @@ $as_echo $with_imagelib 6; }
  fi;;
imlib2)
  with_imlib2=yes
+ if test x$PKG_CONFIG = x; then
+   PKG_CONFIG=pkg-config
+ fi
  if test x$IMLIB2_CONFIG = x; then
IMLIB2_CONFIG=imlib2-config
  fi;;
@@ -6955,7 +6958,7 @@ $as_echo $as_me: WARNING: Imlib2 is not installed.  
Install Imlib2 (version =
  $as_echo #define USE_IMLIB2 1 confdefs.h
 
  IMGX11CFLAGS=`${IMLIB2_CONFIG} --cflags`
- IMGX11LDFLAGS=`${IMLIB2_CONFIG} --libs`
+ IMGX11LDFLAGS=-lX11 `${PKG_CONFIG} --libs imlib2`
else
  { $as_echo $as_me:${as_lineno-$LINENO}: WARNING: unable to build 
w3mimgdisplay with X11 support 5
 $as_echo $as_me: WARNING: unable to build w3mimgdisplay with X11 support 
2;}
@@ -6991,7 +6994,7 @@ $as_echo $as_me: WARNING: unable to build w3mimgdisplay 
with X11 support 2;}
 
  IMGOBJS=$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o
  IMGFBCFLAGS=`${IMLIB2_CONFIG} --cflags`
- IMGFBLDFLAGS=`${IMLIB2_CONFIG} --libs`
+ IMGFBLDFLAGS=`${PKG_CONFIG} --libs imlib2`
else
  { $as_echo $as_me:${as_lineno-$LINENO}: WARNING: unable to build 
w3mimgdisplay with FB support 5
 $as_echo $as_me: WARNING: unable to build w3mimgdisplay with FB support 2;}
-- 
2.2.2

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2014-12-23 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2014-12-23 11:50:08

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  2014-03-18 16:21:34.0 
+0100
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2014-12-23 
11:48:38.0 +0100
@@ -1,0 +2,5 @@
+Sun Dec 21 12:49:22 UTC 2014 - meiss...@suse.com
+
+- build with PIE support
+
+---



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.cLxxNc/_old  2014-12-23 11:48:39.0 +0100
+++ /var/tmp/diff_new_pack.cLxxNc/_new  2014-12-23 11:48:39.0 +0100
@@ -108,8 +108,9 @@
 %patch -P 505 -p1
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN 
-D_GNU_SOURCE $(getconf LFS_CFLAGS) -fno-strict-aliasing `ncursesw6-config 
--cflags`
-export LDFLAGS=`ncursesw6-config --libs`
+export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN 
-D_GNU_SOURCE $(getconf LFS_CFLAGS) -fno-strict-aliasing `ncursesw6-config 
--cflags` -fPIE
+export CXXFLAGS=$CFLAGS
+export LDFLAGS=`ncursesw6-config --libs` -pie
 ./configure--bindir=/usr/bin \
 --with-termlib=ncursesw \
--mandir=%_mandir \

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2014-03-18 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2014-03-18 16:21:22

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  2013-08-23 11:12:16.0 
+0200
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2014-03-18 
16:21:34.0 +0100
@@ -1,0 +2,5 @@
+Wed Mar 12 16:17:09 UTC 2014 - sch...@linux-m68k.org
+
+- w3m-parallel-make.patch: More dependency fixes for parallel build
+
+---



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.WFQJ2l/_old  2014-03-18 16:21:35.0 +0100
+++ /var/tmp/diff_new_pack.WFQJ2l/_new  2014-03-18 16:21:35.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package w3m
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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

++ w3m-parallel-make.patch ++
--- /var/tmp/diff_new_pack.WFQJ2l/_old  2014-03-18 16:21:35.0 +0100
+++ /var/tmp/diff_new_pack.WFQJ2l/_new  2014-03-18 16:21:35.0 +0100
@@ -11,3 +11,26 @@
for dir in $(SCRIPTSUBDIRS);\
do  \
(cd $$dir  $(MAKE) $(MAKE_ARGS)); \
+Index: w3m-0.5.3/w3mimg/Makefile.in
+===
+--- w3m-0.5.3.orig/w3mimg/Makefile.in
 w3m-0.5.3/w3mimg/Makefile.in
+@@ -16,7 +16,7 @@ IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ @
+ IMGOBJS=@IMGOBJS@
+ 
+ .PHONY: $(SUBDIRS)
+-all: @IMGTARGETS@ w3mimg.a
++all: w3mimg.a
+ 
+ w3mimg.a: $(IMGOBJS)
+   $(AR) rv $@ $(IMGOBJS)
+@@ -25,6 +25,9 @@ w3mimg.a: $(IMGOBJS)
+ w3mimg.o: w3mimg.c
+   $(CC) $(CFLAGS) -c $
+ 
++fb/%.o: fb
++x11/%.o: x11
++win/%.o: win
+ $(SUBDIRS):
+   cd $@  $(MAKE) CC=$(CC) OPTS=$(OPTS)
+ 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2013-08-23 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2013-08-23 11:12:15

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  2013-06-25 06:59:54.0 
+0200
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2013-08-23 
11:12:16.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 20 12:04:52 UTC 2013 - sch...@suse.de
+
+- w3m-parallel-make.patch: Fix missing dependency for parallel build
+
+---

New:

  w3m-parallel-make.patch



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.7qZU7n/_old  2013-08-23 11:12:17.0 +0200
+++ /var/tmp/diff_new_pack.7qZU7n/_new  2013-08-23 11:12:17.0 +0200
@@ -36,6 +36,7 @@
 Patch9: w3m-history-crossdev.patch
 Patch11:w3m-ssl-verify.patch
 Patch12:w3m-closedir.patch
+Patch13:w3m-parallel-make.patch
 Patch503:   w3m-fh-def.patch
 Patch504:   w3m-openssl.patch
 Patch505:   w3m-gc7.diff
@@ -101,6 +102,7 @@
 %patch9 -p1
 %patch11
 %patch12
+%patch13 -p1
 %patch503
 %patch504
 %patch -P 505 -p1

++ w3m-parallel-make.patch ++
Index: w3m-0.5.3/Makefile.in
===
--- w3m-0.5.3.orig/Makefile.in
+++ w3m-0.5.3/Makefile.in
@@ -250,7 +250,7 @@ install-po:
 (cd $$subdir  $(MAKE) install); \
done
 
-all-scripts:
+all-scripts: funcname.tab
for dir in $(SCRIPTSUBDIRS);\
do  \
(cd $$dir  $(MAKE) $(MAKE_ARGS)); \
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2013-06-24 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2013-06-25 06:59: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  2013-03-22 13:16:17.0 
+0100
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2013-06-25 
06:59:54.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 21 06:46:21 UTC 2013 - crrodrig...@opensuse.org
+
+- attempting to download a large file will end in total fail 
+  on 32bit archs, use LFS_CFLAGS to fix that problem.
+
+---



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.GbDeyX/_old  2013-06-25 06:59:54.0 +0200
+++ /var/tmp/diff_new_pack.GbDeyX/_new  2013-06-25 06:59:54.0 +0200
@@ -106,7 +106,7 @@
 %patch -P 505 -p1
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN 
-D_GNU_SOURCE -fno-strict-aliasing `ncursesw6-config --cflags`
+export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN 
-D_GNU_SOURCE $(getconf LFS_CFLAGS) -fno-strict-aliasing `ncursesw6-config 
--cflags`
 export LDFLAGS=`ncursesw6-config --libs`
 ./configure--bindir=/usr/bin \
 --with-termlib=ncursesw \

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2013-03-22 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2013-03-22 13:16:15

Comparing /work/SRC/openSUSE:Factory/w3m (Old)
 and  /work/SRC/openSUSE:Factory/.w3m.new (New)


Package is w3m, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/w3m/w3m.changes  2012-11-13 17:10:42.0 
+0100
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2013-03-22 
13:16:17.0 +0100
@@ -1,0 +2,6 @@
+Thu Mar 21 16:27:19 UTC 2013 - jeng...@inai.de
+
+- Make w3m compile with gc 7.x (adds w3m-gc7.diff),
+  and also use the system libgc.
+
+---

Old:

  gc-arm.patch
  gc-configure.patch
  gc-gcc4.patch
  gc6.6.tar.bz2

New:

  w3m-gc7.diff



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.N6fl6F/_old  2013-03-22 13:16:19.0 +0100
+++ /var/tmp/diff_new_pack.N6fl6F/_new  2013-03-22 13:16:19.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package w3m
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,24 +17,14 @@
 
 
 Name:   w3m
-BuildRequires:  gcc-c++
-BuildRequires:  gpm
-BuildRequires:  imlib2-devel
-BuildRequires:  ncurses-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pkgconfig
 Url:http://w3m.sourceforge.net/
 Version:0.5.3
 Release:0
 Summary:A text-based WWW browser
 License:ISC
 Group:  Productivity/Networking/Web/Browsers
-Provides:   w3m_ssl = %version
-Provides:   web_browser
-Obsoletes:  w3m_ssl  %version
-Source0:http://prdownloads.sourceforge.net/w3m/w3m-%version.tar.bz2
-Source1:gc6.6.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+
+Source: http://prdownloads.sourceforge.net/w3m/w3m-%version.tar.bz2
 Patch0: w3m-disable-cookie-special-domain-check.patch
 Patch1: w3m-0.4.1-textarea-segfault.dif
 Patch2: w3m-0.4.1-session-mgmt.dif
@@ -46,11 +36,21 @@
 Patch9: w3m-history-crossdev.patch
 Patch11:w3m-ssl-verify.patch
 Patch12:w3m-closedir.patch
-Patch500:   gc-gcc4.patch
-Patch501:   gc-configure.patch
-Patch502:   gc-arm.patch
 Patch503:   w3m-fh-def.patch
 Patch504:   w3m-openssl.patch
+Patch505:   w3m-gc7.diff
+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  gc-devel
+BuildRequires:  gcc-c++
+BuildRequires:  gpm
+BuildRequires:  imlib2-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+Provides:   w3m_ssl = %version
+Provides:   web_browser
+Obsoletes:  w3m_ssl  %version
 
 %package inline-image
 Summary:An inline image extension for w3m
@@ -88,8 +88,8 @@
 terminal (if it runs in a graphical X Window System environment).
 
 %prep
-%setup -q -b 1
-find -name CVS | xargs rm -rf
+%setup -q
+find -name CVS -exec rm -Rf {} +
 %patch0 -p1
 %patch1 -p1
 %patch2
@@ -103,18 +103,10 @@
 %patch12
 %patch503
 %patch504
-cd ../gc*
-%patch500
-%patch501
-%patch502 -p1
+%patch -P 505 -p1
 
 %build
 export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN 
-D_GNU_SOURCE -fno-strict-aliasing `ncursesw6-config --cflags`
-pushd ../gc*
-./configure --prefix=/usr --disable-shared --disable-threads
-make
-make install DESTDIR=$RPM_BUILD_DIR/gc_install
-popd
 export LDFLAGS=`ncursesw6-config --libs`
 ./configure--bindir=/usr/bin \
 --with-termlib=ncursesw \
@@ -138,14 +130,12 @@
--enable-nntp \
--enable-sslverify \
--enable-unicode \
-   --disable-w3mmailer \
-   --with-gc=$RPM_BUILD_DIR/gc_install/usr
+   --disable-w3mmailer
 make %{?_smp_mflags}
 
 %install
 make install install-helpfile DESTDIR=$RPM_BUILD_ROOT
 install -m 755 Bonus/*.cgi $RPM_BUILD_ROOT/usr/%_lib/w3m/cgi-bin
-cp -a ../gc*/doc/README doc/README.gc
 %find_lang %{name}
 
 %files -f %{name}.lang

++ w3m-gc7.diff ++
From: Jan Engelhardt jeng...@inai.de
Date: 2013-03-21 17:25:03.803966321 +0100

build: make w3m compile with gc-7.x

---
 main.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: w3m-0.5.3/main.c
===
--- w3m-0.5.3.orig/main.c
+++ w3m-0.5.3/main.c
@@ -855,7 +855,8 @@ main(int argc, char **argv, char **envp)
 mySignal(SIGPIPE, SigPipe);
 #endif
 
-orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
+

commit w3m for openSUSE:Factory

2012-11-13 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2012-11-13 17:10:41

Comparing /work/SRC/openSUSE:Factory/w3m (Old)
 and  /work/SRC/openSUSE:Factory/.w3m.new (New)


Package is w3m, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/w3m/w3m.changes  2012-10-03 10:13:38.0 
+0200
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2012-11-13 
17:10:42.0 +0100
@@ -1,0 +2,9 @@
+Mon Nov 12 18:26:45 UTC 2012 - crrodrig...@opensuse.org
+
+- Due to the CRIME attack (CVE-2012-4929) HTTPS clients
+  that negotiate TLS-level compression can be abused for
+  MITM attacks. (w3m-openssl.patch) 
+
+- Use SSL_MODE_RELEASE_BUFFERS if available .
+
+---

New:

  w3m-openssl.patch



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.Ox3NDA/_old  2012-11-13 17:10:44.0 +0100
+++ /var/tmp/diff_new_pack.Ox3NDA/_new  2012-11-13 17:10:44.0 +0100
@@ -50,6 +50,7 @@
 Patch501:   gc-configure.patch
 Patch502:   gc-arm.patch
 Patch503:   w3m-fh-def.patch
+Patch504:   w3m-openssl.patch
 
 %package inline-image
 Summary:An inline image extension for w3m
@@ -101,6 +102,7 @@
 %patch11
 %patch12
 %patch503
+%patch504
 cd ../gc*
 %patch500
 %patch501

++ w3m-openssl.patch ++
--- url.c.orig
+++ url.c
@@ -337,7 +337,15 @@ openSSLHandle(int sock, char *hostname,
if (strchr(ssl_forbid_method, 'T'))
option |= SSL_OP_NO_TLSv1;
}
+#ifdef SSL_OP_NO_COMPRESSION
+   option |= SSL_OP_NO_COMPRESSION;
+#endif
SSL_CTX_set_options(ssl_ctx, option);
+
+#ifdef SSL_MODE_RELEASE_BUFFERS
+   SSL_CTX_set_mode (ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
+#endif
+
 #ifdef USE_SSL_VERIFY
/* derived from openssl-0.9.5/apps/s_{client,cb}.c */
 #if 1  /* use SSL_get_verify_result() to verify cert */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2012-10-03 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2012-10-03 10:13:37

Comparing /work/SRC/openSUSE:Factory/w3m (Old)
 and  /work/SRC/openSUSE:Factory/.w3m.new (New)


Package is w3m, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/w3m/w3m.changes  2012-03-26 11:08:36.0 
+0200
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2012-10-03 
10:13:38.0 +0200
@@ -1,0 +2,16 @@
+Fri Sep 28 12:43:43 UTC 2012 - cfarr...@suse.com
+
+- license update: ISC
+  w3m permissive license much more akin to ISC (spdx.org/licenses/ISC) than
+  to either BSD or MIT
+
+---
+Thu Sep 27 14:05:50 UTC 2012 - crrodrig...@opensuse.org
+
+- Build with OPENSSL_NO_SSL_INTERN, poor's man visibility
+  to avoid ABI breaks between different openssl version.
+
+- Also define _GNU_SOURCE to allow some extra optimizations
+  with recent GCC versions. 
+
+---



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.SIMBbW/_old  2012-10-03 10:13:40.0 +0200
+++ /var/tmp/diff_new_pack.SIMBbW/_new  2012-10-03 10:13:40.0 +0200
@@ -27,7 +27,7 @@
 Version:0.5.3
 Release:0
 Summary:A text-based WWW browser
-License:BSD-3-Clause ; MIT
+License:ISC
 Group:  Productivity/Networking/Web/Browsers
 Provides:   w3m_ssl = %version
 Provides:   web_browser
@@ -107,7 +107,7 @@
 %patch502 -p1
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -fno-strict-aliasing 
`ncursesw6-config --cflags`
+export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN 
-D_GNU_SOURCE -fno-strict-aliasing `ncursesw6-config --cflags`
 pushd ../gc*
 ./configure --prefix=/usr --disable-shared --disable-threads
 make

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2012-03-26 Thread h_root
Hello community,

here is the log from the commit of package w3m for openSUSE:Factory checked in 
at 2012-03-26 11:08:34

Comparing /work/SRC/openSUSE:Factory/w3m (Old)
 and  /work/SRC/openSUSE:Factory/.w3m.new (New)


Package is w3m, Maintainer is m...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/w3m/w3m.changes  2011-09-23 12:50:12.0 
+0200
+++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2012-03-26 
11:08:36.0 +0200
@@ -1,0 +2,7 @@
+Fri Mar 23 11:16:03 UTC 2012 - m...@suse.com
+
+- Removed w3m-helppaths.patch, because it broke interactive help
+  (bnc#747560). It was a leftover that should have been removed
+  as part of the May 2011 package overhaul.
+
+---

Old:

  w3m-helppaths.patch



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.apSf9q/_old  2012-03-26 11:08:38.0 +0200
+++ /var/tmp/diff_new_pack.apSf9q/_new  2012-03-26 11:08:38.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package w3m
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,19 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   w3m
-BuildRequires:  gcc-c++ gpm imlib2-devel ncurses-devel openssl-devel pkgconfig
+BuildRequires:  gcc-c++
+BuildRequires:  gpm
+BuildRequires:  imlib2-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
 Url:http://w3m.sourceforge.net/
 Version:0.5.3
-Release:137
+Release:0
 Summary:A text-based WWW browser
 License:BSD-3-Clause ; MIT
 Group:  Productivity/Networking/Web/Browsers
-Provides:   web_browser
 Provides:   w3m_ssl = %version
+Provides:   web_browser
 Obsoletes:  w3m_ssl  %version
 Source0:http://prdownloads.sourceforge.net/w3m/w3m-%version.tar.bz2
 Source1:gc6.6.tar.bz2
@@ -35,7 +38,6 @@
 Patch0: w3m-disable-cookie-special-domain-check.patch
 Patch1: w3m-0.4.1-textarea-segfault.dif
 Patch2: w3m-0.4.1-session-mgmt.dif
-Patch3: w3m-helppaths.patch
 Patch4: w3m-inline-image.patch
 Patch5: w3m-uninitialized.patch
 Patch6: w3m-0.5.1-no-ASCII-equivalents-by-default.patch
@@ -50,10 +52,10 @@
 Patch503:   w3m-fh-def.patch
 
 %package inline-image
-License:BSD-3-Clause ; MIT
 Summary:An inline image extension for w3m
 Group:  Productivity/Networking/Web/Browsers
-Requires:   w3m imlib2-loaders
+Requires:   imlib2-loaders
+Requires:   w3m
 Provides:   w3m:/usr/%_lib/w3m/w3mimgdisplay
 
 %description
@@ -90,7 +92,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-%patch3 -p1
 %patch4
 %patch5
 %patch6

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2011-09-05 Thread h_root

Hello community,

here is the log from the commit of package w3m for openSUSE:Factory
checked in at Mon Sep 5 17:56:50 CEST 2011.




--- w3m/w3m.changes 2011-05-20 16:06:02.0 +0200
+++ /mounts/work_src_done/STABLE/w3m/w3m.changes2011-08-30 
20:00:41.0 +0200
@@ -1,0 +2,10 @@
+Tue Aug 30 17:59:53 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix build error: redefinition of 'struct file_handle' 
+
+---
+Sat Jul 30 23:09:55 UTC 2011 - crrodrig...@opensuse.org
+
+- Use ncursesw6 instead of old ncurses5
+
+---

calling whatdependson for head-i586


New:

  w3m-fh-def.patch



Other differences:
--
++ w3m.spec ++
--- /var/tmp/diff_new_pack.SKtX4m/_old  2011-09-05 17:55:42.0 +0200
+++ /var/tmp/diff_new_pack.SKtX4m/_new  2011-09-05 17:55:42.0 +0200
@@ -22,7 +22,7 @@
 BuildRequires:  gcc-c++ gpm imlib2-devel ncurses-devel openssl-devel pkgconfig
 Url:http://w3m.sourceforge.net/
 Version:0.5.3
-Release:135
+Release:137
 Summary:A text-based WWW browser
 License:BSD3c(or similar) ; MIT License (or similar)
 Group:  Productivity/Networking/Web/Browsers
@@ -47,6 +47,7 @@
 Patch500:   gc-gcc4.patch
 Patch501:   gc-configure.patch
 Patch502:   gc-arm.patch
+Patch503:   w3m-fh-def.patch
 
 %package inline-image
 License:BSD3c(or similar) ; MIT License (or similar)
@@ -98,19 +99,22 @@
 %patch9 -p1
 %patch11
 %patch12
+%patch503
 cd ../gc*
 %patch500
 %patch501
 %patch502 -p1
 
 %build
-export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -fno-strict-aliasing
+export CFLAGS=$RPM_OPT_FLAGS -DUSE_BUFINFO -fno-strict-aliasing 
`ncursesw6-config --cflags`
 pushd ../gc*
 ./configure --prefix=/usr --disable-shared --disable-threads
 make
 make install DESTDIR=$RPM_BUILD_DIR/gc_install
 popd
+export LDFLAGS=`ncursesw6-config --libs`
 ./configure--bindir=/usr/bin \
+--with-termlib=ncursesw \
--mandir=%_mandir \
--libdir=%_libdir \
--libexecdir=%_libdir \

++ w3m-fh-def.patch ++
--- istream.c.orig
+++ istream.c
@@ -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 w3m_file_handle *handle);
+static int file_read(struct w3m_file_handle *handle, char *buf, int len);
 
 static int str_read(Str handle, char *buf, int len);
 
@@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) (
 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 w3m_file_handle);
 stream-file.handle-f = f;
 if (closep)
stream-file.handle-close = closep;
@@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int l
 }
 
 static void
-file_close(struct file_handle *handle)
+file_close(struct w3m_file_handle *handle)
 {
 handle-close(handle-f);
 }
 
 static int
-file_read(struct file_handle *handle, char *buf, int len)
+file_read(struct w3m_file_handle *handle, char *buf, int len)
 {
 return fread(buf, 1, len, handle-f);
 }
--- istream.h.orig
+++ istream.h
@@ -20,7 +20,7 @@ struct stream_buffer {
 
 typedef struct stream_buffer *StreamBuffer;
 
-struct file_handle {
+struct w3m_file_handle {
 FILE *f;
 void (*close) ();
 };
@@ -53,7 +53,7 @@ struct base_stream {
 
 struct file_stream {
 struct stream_buffer stream;
-struct file_handle *handle;
+struct w3m_file_handle *handle;
 char type;
 char iseos;
 int (*read) ();





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit w3m for openSUSE:Factory

2011-04-22 Thread h_root

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.0 +0200
+++ /mounts/work_src_done/STABLE/w3m/w3m.changes2011-01-18 
15:34:55.0 +0100
@@ -1,0 +2,18 @@
+Tue Jan 18 14:33:24 UTC 2011 - m...@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.0 +0200
+++ /var/tmp/diff_new_pack.e1knsC/_new  2011-04-22 22:51:32.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.e1knsC/_new  2011-04-22 22:51:32.0 +0200
@@ -5,20 +5,20 @@
 
 Index: fm.h
 ===
 fm.h.orig  2006-03-18 02:45:07.0 +0100
-+++ fm.h   2006-03-18 02:45:07.0 +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.0 +0200
-+++ history.c  2006-03-18 02:45:07.0 +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.orig2004-04-04 18:47:20.0 +0200
-+++ main.c 2006-03-18 02:45:07.0 +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-proxydon'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,