Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=0ab0ccd234fda15309ef98f322ba4c16a42be395
commit 0ab0ccd234fda15309ef98f322ba4c16a42be395 Author: voroskoi <[EMAIL PROTECTED]> Date: Thu Apr 10 20:05:15 2008 +0200 cups-1.3.6-2kalgan1-x86_64 secfix relbump, closes #2962 diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index 6c25eb9..dc01d45 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -4,7 +4,7 @@ pkgname=cups pkgver=1.3.6 -pkgrel=1 +pkgrel=2kalgan1 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) + rc.cups rc.cups-{hu,de}.po str2729.patch str2765.patch) subpkgs=('libcups') subdescs=('Main library of the CUPS printing system.') @@ -55,6 +55,8 @@ build() { sha1sums=('4f7ed1c2b16db46f945ab113beab8aeaecbca0b9' \ 'ad90c43de181d362f6c507f366904472d01ae585' \ 'f19bb889e3535e1284d0b93606da48aa61089c8a' \ - '03197abb98eff18d3ede3000a61c7783b8c1ad92') + '03197abb98eff18d3ede3000a61c7783b8c1ad92' \ + '57d8197a4f2af1ffcc993f3e8ad6b0a127ff4bde' \ + '9ea34130e2edd5d6523ad13253970ae0d936374d') # optimization OK diff --git a/source/apps/cups/str2729.patch b/source/apps/cups/str2729.patch new file mode 100644 index 0000000..7d1b36c --- /dev/null +++ b/source/apps/cups/str2729.patch @@ -0,0 +1,15 @@ +Index: search.c +=================================================================== +--- cgi-bin/search.c (revision 7354) ++++ search.c (working copy) +@@ -167,7 +167,9 @@ + * string + RE overhead... + */ + +- wlen = (sptr - s) + 4 * wlen + 2 * strlen(prefix) + 4; ++ wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11; ++ if (lword) ++ wlen += strlen(lword); + + if (wlen > slen) + { diff --git a/source/apps/cups/str2765.patch b/source/apps/cups/str2765.patch new file mode 100644 index 0000000..3a3f37f --- /dev/null +++ b/source/apps/cups/str2765.patch @@ -0,0 +1,21 @@ +Index: image-gif.c +=================================================================== +--- filter/image-gif.c (revision 676) ++++ image-gif.c (working copy) +@@ -37,6 +37,7 @@ + + #define GIF_INTERLACE 0x40 + #define GIF_COLORMAP 0x80 ++#define GIF_MAX_BITS 12 + + typedef cups_ib_t gif_cmap_t[256][4]; + typedef short gif_table_t[4096]; +@@ -462,7 +463,7 @@ + pass = 0; + code_size = getc(fp); + +- if (!pixels) ++ if (code_size > GIF_MAX_BITS || !pixels) + return (-1); + + if (gif_read_lzw(fp, 1, code_size) < 0) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
