[arch-commits] Commit in imlib2/repos (3 files)

[Ronald van Haren]

    Date: Thursday, November 27, 2008 @ 12:12:13
  Author: ronald
Revision: 19583

Merged revisions 19581 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/imlib2/trunk

........
  r19581 | ronald | 2008-11-27 18:07:03 +0100 (Thu, 27 Nov 2008) | 1 line
  
  upgpkg: imlib2 1.4.1-2
........

Added:
  imlib2/repos/extra-i686/bufferoverflow.patch
    (from rev 19581, imlib2/trunk/bufferoverflow.patch)
Modified:
  imlib2/repos/extra-i686/	(properties)
  imlib2/repos/extra-i686/PKGBUILD

----------------------+
 PKGBUILD             |   24 +++++++++++++++++-------
 bufferoverflow.patch |   13 +++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)


Property changes on: imlib2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /imlib2/trunk:1-2920
   + /imlib2/trunk:1-19582

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-27 17:07:52 UTC (rev 19582)
+++ extra-i686/PKGBUILD	2008-11-27 17:12:13 UTC (rev 19583)
@@ -1,28 +1,38 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: arjan <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=imlib2
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Imlib2 is the successor to Imlib. It is NOT a newer version -- Imlib 2 can be installed alongside Imlib 1.x"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/enlightenment"
 license=('BSD')
 depends=('libtiff' 'libungif' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz)
-md5sums=('16a3d885e523303be794282c0ed90841')
+source=(http://downloads.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz \
+	bufferoverflow.patch)
+md5sums=('16a3d885e523303be794282c0ed90841'
+         '76def1fe0ac2ac1686ff24d29979606f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   # Enable x86 MMX optimizations for i686 (32-bit assembler code not compatible with x86_64)
   [ "${CARCH}" = "i686" ] && EXTRAOPTS="--disable-mmx"
   # Disable AMD64 optimizations due to bug in assembler code
   [ "${CARCH}" = "x86_64" ] && EXTRAOPTS="--disable-amd64"
 
+  # Security fix (buffer overflow), Debian bug #505714
+  patch -Np0 -i $srcdir/bufferoverflow.patch || return 1
+
+  # build & install
   ./configure --prefix=/usr --sysconfdir=/etc/imlib2 --x-libraries=/usr/lib $EXTRAOPTS
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt
+  make DESTDIR=$startdir/pkg install || return 1
+
+  # install BSD license
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }

Copied: imlib2/repos/extra-i686/bufferoverflow.patch (from rev 19581, imlib2/trunk/bufferoverflow.patch)
===================================================================
--- extra-i686/bufferoverflow.patch	                        (rev 0)
+++ extra-i686/bufferoverflow.patch	2008-11-27 17:12:13 UTC (rev 19583)
@@ -0,0 +1,13 @@
+--- src/modules/loaders/loader_xpm.c
++++ src/modules/loaders/loader_xpm.c.new
+@@ -246,8 +246,8 @@
+                                  return 0;
+                               }
+                             ptr = im->data;
+-                            end = ptr + (sizeof(DATA32) * w * h);
+                             pixels = w * h;
++                            end = ptr + pixels;
+                          }
+                        else
+                          {
+