aboutsummaryrefslogtreecommitdiffstats
path: root/main/cups
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-09-14 08:43:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-09-14 12:41:03 +0000
commitce70450414a6a7526f67513279055fed67dbe867 (patch)
treed077dd3061cac0d5e1f3af30abc8301eb4495a50 /main/cups
parent3b4432a039180553e518c03e9431114620051cc9 (diff)
downloadaports-ce70450414a6a7526f67513279055fed67dbe867.tar.bz2
aports-ce70450414a6a7526f67513279055fed67dbe867.tar.xz
main/cups: upgrade to 1.5.0
Diffstat (limited to 'main/cups')
-rw-r--r--main/cups/APKBUILD26
-rw-r--r--main/cups/cups-CVE-2011-2896.patch33
2 files changed, 51 insertions, 8 deletions
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 7e2ff506fb..7b9c235c6d 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
-pkgver=1.4.8
+pkgver=1.5.0
pkgrel=0
pkgdesc="The CUPS Printing System"
url="http://www.cups.org/"
@@ -15,19 +15,30 @@ 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"
-build ()
-{
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ local i
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+}
+
+build() {
cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-logdir=/var/log/cups \
- --with-docdir=/usr/share/cups/doc \
+ --with-docdir=/usr/share/doc/cups \
--with-cups-user=lp \
--with-cups-group=lp \
--with-system-groups=lpadmin \
@@ -78,7 +89,6 @@ client() {
depends=
_mv usr/bin \
usr/share/cups/charsets \
- usr/share/cups/charmaps \
usr/sbin/accept \
usr/sbin/cupsaddsmb \
usr/sbin/cupsctl \
@@ -89,9 +99,9 @@ client() {
usr/sbin/lpinfo \
usr/sbin/lpmove \
usr/sbin/reject
- touch "$subpkgdir"/usr/share/cups/charmaps/us-ascii.txt
}
-md5sums="0ec52d3f3c69bc2ab5ed70c594edbce6 cups-1.4.8-source.tar.bz2
+md5sums="e54ed09ede2340fc3014913333520fe4 cups-1.5.0-source.tar.bz2
f861b18f4446c43918c8643dcbbd7f6d cups.logrotate
-1154ed66fdcfa0523f929a369079f43c cupsd.initd"
+1154ed66fdcfa0523f929a369079f43c cupsd.initd
+2e952332e93970b12bae955c7222604d cups-CVE-2011-2896.patch"
diff --git a/main/cups/cups-CVE-2011-2896.patch b/main/cups/cups-CVE-2011-2896.patch
new file mode 100644
index 0000000000..a949b9df9a
--- /dev/null
+++ b/main/cups/cups-CVE-2011-2896.patch
@@ -0,0 +1,33 @@
+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)
+ {