[arch-commits] Commit in w3m/trunk (PKGBUILD w3m-0.5.1-CVE-2006-6772.patch)

[Eric Bélanger]

    Date: Saturday, October 3, 2009 @ 22:12:12
  Author: eric
Revision: 53933

upgpkg: w3m 0.5.2-4
    Added graphics support (close FS#15720)

Modified:
  w3m/trunk/PKGBUILD
Deleted:
  w3m/trunk/w3m-0.5.1-CVE-2006-6772.patch

-------------------------------+
 PKGBUILD                      |   19 ++++++++++++-------
 w3m-0.5.1-CVE-2006-6772.patch |   13 -------------
 2 files changed, 12 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-03 23:10:29 UTC (rev 53932)
+++ PKGBUILD	2009-10-04 02:12:12 UTC (rev 53933)
@@ -2,19 +2,24 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=w3m
 pkgver=0.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A pager/text-based WWW browser"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://w3m.sourceforge.net/"
 license=('custom')
 depends=('openssl>=0.9.8e' 'gc>=7.0' 'ncurses' 'zlib')
+makedepends=('imlib2')
+optdepends=('imlib2: for graphics support') 
 source=(http://downloads.sourceforge.net/sourceforge/w3m/$pkgname-$pkgver.tar.gz)
 md5sums=('ba06992d3207666ed1bf2dcf7c72bf58')
-url="http://w3m.sourceforge.net/"
+sha1sums=('484522547ae6dbb342d3858a2a53a65451e273f9')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib --enable-ansi-color --disable-mouse --disable-w3mmailer --with-imagelib=no --with-termlib=ncurses
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libexecdir=/usr/lib --enable-ansi-color \
+    --disable-mouse --disable-w3mmailer --enable-image=x11,fb \
+    --with-imagelib=imlib2 --with-termlib=ncurses || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -Dm644 $startdir/src/$pkgname-$pkgver/doc/README $startdir/pkg/usr/share/licenses/$pkgname/README
+  make DESTDIR="${pkgdir}" install || return 1
+  install -Dm644 doc/README "${pkgdir}/usr/share/licenses/$pkgname/README"
 }

Deleted: w3m-0.5.1-CVE-2006-6772.patch
===================================================================
--- w3m-0.5.1-CVE-2006-6772.patch	2009-10-03 23:10:29 UTC (rev 53932)
+++ w3m-0.5.1-CVE-2006-6772.patch	2009-10-04 02:12:12 UTC (rev 53933)
@@ -1,13 +0,0 @@
-Fix for format string flaw (CVE-2006-6772)
-
---- w3m-0.5.1/file.c.orig	2007-01-03 20:42:05.000000000 +0100
-+++ w3m-0.5.1/file.c	2007-01-03 20:44:11.000000000 +0100
-@@ -7935,7 +7935,7 @@ inputAnswer(char *prompt)
- 	ans = inputChar(prompt);
-     }
-     else {
--	printf(prompt);
-+	printf("%s", prompt);
- 	fflush(stdout);
- 	ans = Strfgets(stdin)->ptr;
-     }