[arch-commits] Commit in imlib2/trunk (PKGBUILD bufferoverflow.patch libpng14.patch)

[Ronald van Haren]

    Date: Thursday, May 6, 2010 @ 09:39:04
  Author: ronald
Revision: 79752

upgpkg: imlib2 1.4.4-1
update to latest version; remove patches which are now included upstream

Modified:
  imlib2/trunk/PKGBUILD
Deleted:
  imlib2/trunk/bufferoverflow.patch
  imlib2/trunk/libpng14.patch

----------------------+
 PKGBUILD             |   17 ++++-------------
 bufferoverflow.patch |   13 -------------
 libpng14.patch       |   12 ------------
 3 files changed, 4 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-06 13:34:10 UTC (rev 79751)
+++ PKGBUILD	2010-05-06 13:39:04 UTC (rev 79752)
@@ -4,20 +4,16 @@
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
-pkgver=1.4.2
-pkgrel=6
+pkgver=1.4.4
+pkgrel=1
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('libtiff>=3.9.2-2' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng>=1.4.0' 'libid3tag' 'libjpeg>=8')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2" \
-        'bufferoverflow.patch' libpng14.patch)
-md5sums=('9f15568e76ebda9092c571e0df261f54' '76def1fe0ac2ac1686ff24d29979606f'\
-         '68f671641e298ef7eead0aded4087c53')
-sha1sums=('c3fb5de49e1e493544879f41262ec1ca525fc670' 'da84cea18ab852206e742f6e705665b4eb816405'\
-         '43bb830f222f256154b42d0f1ca26938073a5603')
+source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
+sha1sums=('aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -26,11 +22,6 @@
   [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx"
   [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64"
 
-  patch -Np1 -i $srcdir/libpng14.patch || return 1
-
-  # Security Fix (Buffer Overflow), upstream fix
-  patch -Np0 -i $srcdir/bufferoverflow.patch || return 1
-
   # Configure and Build
   ./configure --prefix=/usr \
               --sysconfdir=/etc/imlib2 \

Deleted: bufferoverflow.patch
===================================================================
--- bufferoverflow.patch	2010-05-06 13:34:10 UTC (rev 79751)
+++ bufferoverflow.patch	2010-05-06 13:39:04 UTC (rev 79752)
@@ -1,13 +0,0 @@
---- 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
-                          {
-

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2010-05-06 13:34:10 UTC (rev 79751)
+++ libpng14.patch	2010-05-06 13:39:04 UTC (rev 79752)
@@ -1,12 +0,0 @@
-diff -Naur imlib2-1.4.2-orig/src/modules/loaders/loader_png.c imlib2-1.4.2/src/modules/loaders/loader_png.c
---- imlib2-1.4.2-orig/src/modules/loaders/loader_png.c	2010-01-19 03:37:21.000000000 -0500
-+++ imlib2-1.4.2/src/modules/loaders/loader_png.c	2010-01-19 03:38:51.000000000 -0500
-@@ -38,7 +38,7 @@
- 
-         /* if we haven't read the header before, set the header data */
-         fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--        if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+        if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-           {
-              fclose(f);
-              return 0;