[arch-commits] Commit in kdegraphics/trunk (CVE-2010-2575.patch PKGBUILD)

[Andrea Scarpino]

    Date: Monday, August 30, 2010 @ 04:03:02
  Author: andrea
Revision: 89215

KDE 4.5.1

Modified:
  kdegraphics/trunk/PKGBUILD
Deleted:
  kdegraphics/trunk/CVE-2010-2575.patch

---------------------+
 CVE-2010-2575.patch |   28 ----------------------------
 PKGBUILD            |   14 +++++---------
 2 files changed, 5 insertions(+), 37 deletions(-)

Deleted: CVE-2010-2575.patch
===================================================================
--- CVE-2010-2575.patch	2010-08-30 08:02:56 UTC (rev 89214)
+++ CVE-2010-2575.patch	2010-08-30 08:03:02 UTC (rev 89215)
@@ -1,28 +0,0 @@
---- okular/generators/plucker/unpluck/image.cpp	(revision 1162413)
-+++ okular/generators/plucker/unpluck/image.cpp	(working copy)
-@@ -289,8 +289,23 @@
-             for (j = 0; j < bytes_per_row;) {
-                 incount = *palm_ptr++;
-                 inval = *palm_ptr++;
--                memset (rowbuf + j, inval, incount);
--                j += incount;
-+                if (incount + j <= bytes_per_row  * width)
-+                {
-+                    memset (rowbuf + j, inval, incount);
-+                    j += incount;
-+                }
-+                else
-+                {
-+                    free (rowbuf);
-+                    free (lastrow);
-+                    free (jpeg_row);
-+
-+                    jpeg_destroy_compress (&cinfo);
-+
-+                    fclose( outfile );
-+
-+                    return false;
-+                }
-             }
-         }
-         else if ((flags & PALM_IS_COMPRESSED_FLAG)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-30 08:02:56 UTC (rev 89214)
+++ PKGBUILD	2010-08-30 08:03:02 UTC (rev 89215)
@@ -12,8 +12,8 @@
          'kdegraphics-ksnapshot'
          'kdegraphics-libs'
          'kdegraphics-okular')
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -21,15 +21,11 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'poppler-qt'
 	'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qimageblitz' 'ebook-tools'
 	'libxxf86vm' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'CVE-2010-2575.patch')
-sha1sums=('fe30125c0e04139c74a55c09b64301174fc7e8ad'
-          '50ac5bc79007b1bb613d6f382841528107fed2d9')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('dc987ea24a11a1b6bdc9c0f41f01364cfcda23fd')
 
 build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	patch -p0 -i ${srcdir}/CVE-2010-2575.patch
-	cd ..
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \