pool/cups
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=42

Browse Source
This commit is contained in:
OBS User unknown
2008-07-24 21:35:12 +00:00
committed by Git OBS Bridge
parent 6f190ae942
commit 609fbe0c40
6 changed files with 25 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cups-1.3.7-configfile_NoBrowseAddress.patch
View File

@@ -1,16 +0,0 @@
--- cups-1.3.7/scheduler/conf.c.orig 2008-06-04 11:05:04.000000000 +0200
+++ cups-1.3.7/scheduler/conf.c 2008-06-04 11:26:14.000000000 +0200
@@ -2298,6 +2298,13 @@
memset(dira, 0, sizeof(cupsd_dirsvc_addr_t));
+ if (!value)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "No BrowseAdress given at line %d.", linenum);
+ continue;
+ }
+
if (!strcasecmp(value, "@LOCAL"))
{
/*

61
cups-1.3.7-filter_png_overflow.patch
View File

@@ -1,61 +0,0 @@
--- cups-1.3.7/filter/image-png.c.orig 2007-07-11 23:46:42.000000000 +0200
+++ cups-1.3.7/filter/image-png.c 2008-04-16 12:04:14.000000000 +0200
@@ -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...
*/

3
cups-1.3.7-source.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe
size 3895825

3
cups-1.3.8-source.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb6e013e104d82e454a98460136360111d77160300a0eb98063d7051e71c4f05
size 3978466

9
cups.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jul 23 11:14:05 CEST 2008 - kssingvo@suse.de
- update to version 1.3.8:
* bugfix version, which includes CVE-2008-1722
* also includes some performance changes
* refer to included CHANGES.txt file for full information
- removed obsolete patches
-------------------------------------------------------------------
Mon Jul 14 17:30:57 CEST 2008 - kssingvo@suse.de

24
cups.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package cups (Version 1.3.7)
# spec file for package cups (Version 1.3.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,8 +22,8 @@ Url: http://www.cups.org/
License: GPL v2 or later
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.3.7
Release: 32
Version: 1.3.8
Release: 1
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux /usr/bin/pdftops
@@ -68,13 +68,11 @@ Patch15: cups-1.2.11-testppd_filename.patch
Patch16: cups-1.2.5-desktop_file.patch
Patch17: cups-1.3.3-testppd_none.patch
Patch18: cups-1.4svn-pdftops_as_filter.patch
Patch19: cups-1.3.7-filter_png_overflow.patch
# next is found as http://www.cups.org/strfiles/2808/str2808.patch
Patch20: cups-1.4svn-pdftops_dont_fail_on_cancel.patch
Patch21: cups-1.3.7-keeping_recommended.patch
Patch22: cups-1.3.7-configfile_NoBrowseAddress.patch
Patch23: cups-1.3.7-lppasswd_fixperm.patch
Patch24: cups-1.3.7-additional_policies.patch
Patch19: cups-1.4svn-pdftops_dont_fail_on_cancel.patch
Patch20: cups-1.3.7-keeping_recommended.patch
Patch21: cups-1.3.7-lppasswd_fixperm.patch
Patch22: cups-1.3.7-additional_policies.patch
Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -176,8 +174,6 @@ mv pdftops pdftos.use_filter_pdftops_c
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
if [ -f /.buildenv ]; then
. /.buildenv
else
@@ -431,6 +427,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
%{_datadir}/locale/*/cups_*
%changelog
* Wed Jul 23 2008 kssingvo@suse.de
- update to version 1.3.8:
* bugfix version, which includes CVE-2008-1722
* also includes some performance changes
* refer to included CHANGES.txt file for full information
- removed obsolete patches
* Mon Jul 14 2008 kssingvo@suse.de
- removed deprecated use of %%run_ldconfig
- added avahi-compat-mDNSResponder-devel to BuildRequieres (bnc#398700)