diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-06 15:46:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-06 15:47:18 +0000 |
| commit | ccfb2bd320e6b91399acf24f713f4b8a67cbc6fe (patch) | |
| tree | 59b775aaa08b9cc1b191aed81cbb47b54f6f0f85 | |
| parent | 045343ec960b850dd239c295a7a8b322859675a3 (diff) | |
| download | aports-ccfb2bd320e6b91399acf24f713f4b8a67cbc6fe.tar.bz2 aports-ccfb2bd320e6b91399acf24f713f4b8a67cbc6fe.tar.xz | |
main/cups: upgrade to 1.5.2
| -rw-r--r-- | main/cups/APKBUILD | 10 | ||||
| -rw-r--r-- | main/cups/cups-CVE-2011-2896.patch | 33 |
2 files changed, 4 insertions, 39 deletions
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD index e59985918..9ba85a5a2 100644 --- a/main/cups/APKBUILD +++ b/main/cups/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cups -pkgver=1.5.0 -pkgrel=2 +pkgver=1.5.2 +pkgrel=0 pkgdesc="The CUPS Printing System" url="http://www.cups.org/" arch="all" @@ -15,7 +15,6 @@ pkgusers="lp" source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2 $pkgname.logrotate cupsd.initd - cups-CVE-2011-2896.patch " depends_dev="openssl-dev zlib-dev" @@ -101,7 +100,6 @@ client() { usr/sbin/reject } -md5sums="e54ed09ede2340fc3014913333520fe4 cups-1.5.0-source.tar.bz2 +md5sums="9471d2a7c920cfbb17133c32d2e6866f cups-1.5.2-source.tar.bz2 f861b18f4446c43918c8643dcbbd7f6d cups.logrotate -1154ed66fdcfa0523f929a369079f43c cupsd.initd -2e952332e93970b12bae955c7222604d cups-CVE-2011-2896.patch" +1154ed66fdcfa0523f929a369079f43c cupsd.initd" diff --git a/main/cups/cups-CVE-2011-2896.patch b/main/cups/cups-CVE-2011-2896.patch deleted file mode 100644 index a949b9df9..000000000 --- a/main/cups/cups-CVE-2011-2896.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up cups-1.4.8/filter/image-gif.c.CVE-2011-2896 cups-1.4.8/filter/image-gif.c ---- cups-1.4.8/filter/image-gif.c.CVE-2011-2896 2011-06-20 21:37:51.000000000 +0100 -+++ cups-1.4.8/filter/image-gif.c 2011-08-19 11:33:37.547911212 +0100 -@@ -648,11 +648,13 @@ gif_read_lzw(FILE *fp, /* I - File to - - if (code == max_code) - { -- *sp++ = firstcode; -- code = oldcode; -+ if (sp < (stack + 8192)) -+ *sp++ = firstcode; -+ -+ code = oldcode; - } - -- while (code >= clear_code) -+ while (code >= clear_code && sp < (stack + 8192)) - { - *sp++ = table[1][code]; - if (code == table[0][code]) -@@ -661,8 +663,10 @@ gif_read_lzw(FILE *fp, /* I - File to - code = table[0][code]; - } - -- *sp++ = firstcode = table[1][code]; -- code = max_code; -+ if (sp < (stack + 8192)) -+ *sp++ = firstcode = table[1][code]; -+ -+ code = max_code; - - if (code < 4096) - { |