Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=interim.git;a=commitdiff;h=8d8f4afb6f6c9a187d43cc7cbb28730d3b9dba18
commit 8d8f4afb6f6c9a187d43cc7cbb28730d3b9dba18
Author: voroskoi <[EMAIL PROTECTED]>
Date: Thu Jul 31 15:17:04 2008 +0200
cups-1.3.8-1-i686
version bump
removed CVE-2008-1722, in upstream
diff --git a/source/apps/cups/CVE-2008-1722.patch
b/source/apps/cups/CVE-2008-1722.patch
deleted file mode 100644
index eebefef..0000000
--- a/source/apps/cups/CVE-2008-1722.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: image-png.c
-===================================================================
---- a/filter/image-png.c (revision 7434)
-+++ b/filter/image-png.c (working copy)
-@@ -3,7 +3,7 @@
- *
- * PNG image routines for the Common UNIX Printing System (CUPS).
- *
-- * Copyright 2007 by Apple Inc.
-+ * Copyright 2007-2008 by Apple Inc.
- * Copyright 1993-2007 by Easy Software Products.
- *
- * These coded instructions, statements, and computer programs are the
-@@ -170,16 +170,56 @@
- * Interlaced images must be loaded all at once...
- */
-
-+ size_t bufsize; /* Size of buffer */
-+
-+
- if (color_type == PNG_COLOR_TYPE_GRAY ||
- color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-- in = malloc(img->xsize * img->ysize);
-+ {
-+ bufsize = img->xsize * img->ysize;
-+
-+ if ((bufsize / img->ysize) != img->xsize)
-+ {
-+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
-+ (unsigned)width, (unsigned)height);
-+ fclose(fp);
-+ return (1);
-+ }
-+ }
- else
-- in = malloc(img->xsize * img->ysize * 3);
-+ {
-+ bufsize = img->xsize * img->ysize * 3;
-+
-+ if ((bufsize / (img->ysize * 3)) != img->xsize)
-+ {
-+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
-+ (unsigned)width, (unsigned)height);
-+ fclose(fp);
-+ return (1);
-+ }
-+ }
-+
-+ in = malloc(bufsize);
- }
-
- bpp = cupsImageGetDepth(img);
- out = malloc(img->xsize * bpp);
-
-+ if (!in || !out)
-+ {
-+ fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
-+
-+ if (in)
-+ free(in);
-+
-+ if (out)
-+ free(out);
-+
-+ fclose(fp);
-+
-+ return (1);
-+ }
-+
- /*
- * Read the image, interlacing as needed...
- */
diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild
index 0b9491f..e6bcda5 100644
--- a/source/apps/cups/FrugalBuild
+++ b/source/apps/cups/FrugalBuild
@@ -3,8 +3,8 @@
# Maintainer: voroskoi <[EMAIL PROTECTED]>
pkgname=cups
-pkgver=1.3.7
-pkgrel=2
+pkgver=1.3.8
+pkgrel=1
pkgdesc="The CUPS Printing System"
url="http://www.cups.org/";
depends=('libtiff' 'libpng' 'libjpeg')
@@ -14,7 +14,7 @@ archs=('i686' 'x86_64')
backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs})
up2date="lynx -dump $url |grep Stable |sed -e 's/.*v\(.*\)/\1/'"
source=(ftp://ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \
- rc.cups rc.cups-{hu,de}.po CVE-2008-1722.patch)
+ rc.cups rc.cups-{hu,de}.po)
subpkgs=('libcups')
subdescs=('Main library of the CUPS printing system.')
@@ -52,10 +52,9 @@ build() {
Fsplit libcups usr/lib/libcups.so*
}
-sha1sums=('4267822cdad2fdad44ff0885587132250bcf8dff' \
+sha1sums=('60a28467eb05d4d996e1b301968dea12aebc84ad' \
'ad90c43de181d362f6c507f366904472d01ae585' \
'f19bb889e3535e1284d0b93606da48aa61089c8a' \
- '03197abb98eff18d3ede3000a61c7783b8c1ad92' \
- '4708c6d0c3c4a3bdff134efde05a924d9c097b19')
+ '03197abb98eff18d3ede3000a61c7783b8c1ad92')
# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
