OBS User unknown 2007-02-23 11:29:03 +00:00 committed by Git OBS Bridge
parent 57707c0dda
commit 47276fb63f
12 changed files with 144 additions and 151 deletions

View File

@ -1,11 +0,0 @@
--- cups-1.2.7/scheduler/conf.c.orig 2007-02-13 18:27:44.000000000 +0100
+++ cups-1.2.7/scheduler/conf.c 2007-02-13 18:47:27.000000000 +0100
@@ -1995,6 +1995,8 @@
protocols |= BROWSE_DNSSD;
else if (!strcasecmp(valstart, "all"))
protocols |= BROWSE_ALL;
+ else if (!strcasecmp(valstart, "none"))
+ return (-1);
else
return (-1);

View File

@ -1,11 +0,0 @@
--- cups-1.2.7/scheduler/dirsvc.c.orig 2006-11-14 17:35:27.000000000 +0100
+++ cups-1.2.7/scheduler/dirsvc.c 2007-02-13 18:22:01.000000000 +0100
@@ -163,7 +163,7 @@ cupsdLoadRemoteCache(void)
* Don't load the cache if the CUPS remote protocol is disabled...
*/
- if (!(BrowseRemoteProtocols & BROWSE_CUPS))
+ if (!Browsing || !(BrowseRemoteProtocols & BROWSE_CUPS))
{
cupsdLogMessage(CUPSD_LOG_DEBUG,
"cupsdLoadRemoteCache: Not loading remote cache.");

View File

@ -1,14 +0,0 @@
--- cups-1.2.7/cups/ipp.c.orig 2006-06-02 17:15:23.000000000 +0200
+++ cups-1.2.7/cups/ipp.c 2007-02-13 18:34:13.000000000 +0100
@@ -1098,8 +1098,10 @@
break;
case IPP_ATTRIBUTE :
- while ((*cb)(src, buffer, 1) > 0)
+ for (;;)
{
+ if((*cb)(src, buffer, 1) < 1)
+ return (IPP_ERROR);
DEBUG_printf(("ippReadIO: ipp->current=%p, ipp->prev=%p\n",
ipp->current, ipp->prev));

View File

@ -1,27 +0,0 @@
--- cups-1.2.7/filter/interpret.c.orig 2006-09-05 22:45:47.000000000 +0200
+++ cups-1.2.7/filter/interpret.c 2007-02-13 18:17:52.000000000 +0100
@@ -570,21 +570,21 @@ exec_code(
h->cupsBorderlessScalingFactor = atof(value);
else if (!strncmp(name, "cupsInteger", 11) && type == CUPS_TYPE_NUMBER)
{
- if ((i = atoi(name + 11)) >= 0 || i > 15)
+ if ((i = atoi(name + 11)) < 0 || i > 15)
return (-1);
h->cupsInteger[i] = atoi(value);
}
else if (!strncmp(name, "cupsReal", 8) && type == CUPS_TYPE_NUMBER)
{
- if ((i = atoi(name + 8)) >= 0 || i > 15)
+ if ((i = atoi(name + 8)) < 0 || i > 15)
return (-1);
h->cupsReal[i] = atof(value);
}
else if (!strncmp(name, "cupsString", 10) && type == CUPS_TYPE_STRING)
{
- if ((i = atoi(name + 10)) >= 0 || i > 15)
+ if ((i = atoi(name + 10)) < 0 || i > 15)
return (-1);
if (sscanf(value, "(%63[^)])", h->cupsString[i]) != 1)

View File

@ -1,20 +0,0 @@
--- cups-1.2.7/scheduler/conf.c.orig 2007-02-13 17:56:55.000000000 +0100
+++ cups-1.2.7/scheduler/conf.c 2007-02-13 18:27:44.000000000 +0100
@@ -1321,7 +1321,7 @@
* Get the address...
*/
- ip[0] = ip[1] = ip[2] = ip[2] = 0x00000000;
+ ip[0] = ip[1] = ip[2] = ip[3] = 0x00000000;
mask[0] = mask[1] = mask[2] = mask[3] = 0xffffffff;
if ((maskval = strchr(value, '/')) != NULL)
@@ -1506,7 +1506,7 @@
cupsdLogMessage(CUPSD_LOG_DEBUG2,
"get_addr_and_mask(value=\"%s\", "
- "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x]",
+ "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x])",
value, ip[0], ip[1], ip[2], ip[3], mask[0], mask[1], mask[2],
mask[3]);

View File

@ -1,11 +0,0 @@
--- cups-1.2.7/scheduler/job.c.orig 2006-10-23 02:26:52.000000000 +0200
+++ cups-1.2.7/scheduler/job.c 2007-02-13 18:29:44.000000000 +0100
@@ -1497,7 +1497,7 @@
*/
if (job->hold_until < curtime)
- job->hold_until += 24 * 60 * 60 * 60;
+ job->hold_until += 24 * 60 * 60;
}
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSetJobHoldUntil: hold_until = %d",

View File

@ -1,21 +0,0 @@
--- cups-1.2.7/scheduler/job.c.orig 2007-02-13 18:55:40.000000000 +0100
+++ cups-1.2.7/scheduler/job.c 2007-02-13 18:56:16.000000000 +0100
@@ -373,13 +373,11 @@
pclass = printer;
- if (!(pclass->type & CUPS_PRINTER_REMOTE))
- {
- if (pclass->state != IPP_PRINTER_STOPPED)
- printer = cupsdFindAvailablePrinter(job->dest);
- else
- printer = NULL;
- }
+ if (!(pclass->type & CUPS_PRINTER_REMOTE) &&
+ pclass->state != IPP_PRINTER_STOPPED)
+ printer = cupsdFindAvailablePrinter(job->dest);
+ else
+ printer = NULL;
}
if (!printer && !pclass)

View File

@ -1,13 +0,0 @@
--- cups-1.2.7/scheduler/ipp.c.orig 2006-10-20 22:35:41.000000000 +0200
+++ cups-1.2.7/scheduler/ipp.c 2007-02-13 18:25:21.000000000 +0100
@@ -5372,7 +5372,10 @@
return;
}
else
+ {
+ dtype &= CUPS_PRINTER_CLASS;
dmask = CUPS_PRINTER_CLASS;
+ }
/*
* Check policy...

View File

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

View File

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

View File

@ -1,3 +1,73 @@
-------------------------------------------------------------------
Tue Feb 20 10:55:46 CET 2007 - kssingvo@suse.de
- Upgrade to cups-1.2.8:
* Documentation fixes
* The HTTP upgrade redirection used by the scheduler did not work
with Internet Explorer
* Members of a class with Unicode names did not appear correctly
in the web interface
* Changing the "Save debugging information" setting in the web
interface no longer affects the other server settings
* The scheduler did not choose SSL certificates correctly on Mac
OS X
* The scheduler could get in an infinite loop when printing to a
remote class
* The jobs web page did not have separating space after the
number of pages column
* Added French localization
* Updated Spanish localization
* Updated Japanese localization
* cupsBorderlessScalingFacter was limited to a range of 0.9 to
1.1, but some printers need larger values
* Landscape printing of PDF files did not always work
* Fixed slow USB printing on Minolta printers
* The ZPL label printer driver could produce stretched output
* The IPP backend now clears the printer-state-message when there
are no outstanding errors or warnings
* The CUPS Java scripting support did not work with recent
versions of Java due to the use of Sun's private Base64 class
* The scheduler did not pass HTTP GET form variables to custom
CGI programs
* The lpoptions command now displays the reason why a PPD file
cannot be found
* The scheduler did not accept "none" as a browse protocol name
* The scheduler still loaded the remote printer cache, even when
browsing was disabled
* The SNMP backend now shows OfficeJet printers with the "HP"
manufacturer prefix
* Web interface HTML cleanup
* The parallel backend consumed 100% CPU on FreeBSD due to an
apparently common parallel port driver bug
* ippReadIO() incorrectly returned IPP_IDLE when the initial IPP
message header could not be read
* cupsRasterInterpretPPD() did not support custom options
* Collated output produced by the PostScript filter could lose
some options
* job-hold-until with time values for the next day would be held
for 60 days
* Some types of Sun raster files did not print correctly
* Raw PBM files did not print correctly
* The SNMP backend no longer uses IPP with HP printers, as some
recent firmware versions appear to not work
* cupsMarkOptions() did not handle the multiple-document-handling
option
* lpstat did not show the local job ID of active printers
* The backends incorrectly used STATUS: media-tray-empty-error
messages for out-of-paper conditions
* cupsGetPPD2() returned the wrong error when the PPD file did
not exist
* cupsDoAuthentication() did not translate the password prompt
* httpGetLength2() did not handle error messages without content
correctly
* Added support for 32/64-bit libraries on HP-UX Itanium systems
* Fixed a configure script problem with the 32/64-bit library
support
* The PostScript filter did not properly output document setup
commands for reversed output
* The scheduler did not parse IPv6 netmasks properly
- removed backported, unnecessary patches
-------------------------------------------------------------------
Tue Feb 13 19:16:38 CET 2007 - kssingvo@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package cups (Version 1.2.7)
# spec file for package cups (Version 1.2.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -16,8 +16,8 @@ URL: http://www.cups.org/
License: GNU General Public License (GPL)
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.2.7
Release: 17
Version: 1.2.8
Release: 1
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux, /usr/bin/ionice
@ -52,14 +52,6 @@ Patch15: cups-1.2.2-testppd_filename.patch
Patch16: cups-1.2.5-desktop_file.patch
Patch17: cups-1.2.6-lppasswd_permission.patch
Patch18: cups-1.2.6-xpdf_CVE_2007_0104.patch
Patch19: cups-1.2.7-filter_array.patch
Patch20: cups-1.2.7-browsing.patch
Patch21: cups-1.2.7-remote_job.patch
Patch22: cups-1.2.7-ipv6_parse.patch
Patch23: cups-1.2.7-next_day.patch
Patch24: cups-1.2.7-busy_loop_client.patch
Patch25: cups-1.2.7-browseprotocol_none.patch
Patch26: cups-1.2.7-remote_class.patch
Patch100: cups-1.1.23-testpage.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version >= 801
@ -153,14 +145,6 @@ Authors:
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
if [ -f /.buildenv ]; then
. /.buildenv
else
@ -388,7 +372,74 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/cat?
%{_libdir}/libcupsimage.so*
%{_datadir}/locale/*/cups_*
%changelog -n cups
%changelog
* Tue Feb 20 2007 - kssingvo@suse.de
- Upgrade to cups-1.2.8:
* Documentation fixes
* The HTTP upgrade redirection used by the scheduler did not work
with Internet Explorer
* Members of a class with Unicode names did not appear correctly
in the web interface
* Changing the "Save debugging information" setting in the web
interface no longer affects the other server settings
* The scheduler did not choose SSL certificates correctly on Mac
OS X
* The scheduler could get in an infinite loop when printing to a
remote class
* The jobs web page did not have separating space after the
number of pages column
* Added French localization
* Updated Spanish localization
* Updated Japanese localization
* cupsBorderlessScalingFacter was limited to a range of 0.9 to
1.1, but some printers need larger values
* Landscape printing of PDF files did not always work
* Fixed slow USB printing on Minolta printers
* The ZPL label printer driver could produce stretched output
* The IPP backend now clears the printer-state-message when there
are no outstanding errors or warnings
* The CUPS Java scripting support did not work with recent
versions of Java due to the use of Sun's private Base64 class
* The scheduler did not pass HTTP GET form variables to custom
CGI programs
* The lpoptions command now displays the reason why a PPD file
cannot be found
* The scheduler did not accept "none" as a browse protocol name
* The scheduler still loaded the remote printer cache, even when
browsing was disabled
* The SNMP backend now shows OfficeJet printers with the "HP"
manufacturer prefix
* Web interface HTML cleanup
* The parallel backend consumed 100%% CPU on FreeBSD due to an
apparently common parallel port driver bug
* ippReadIO() incorrectly returned IPP_IDLE when the initial IPP
message header could not be read
* cupsRasterInterpretPPD() did not support custom options
* Collated output produced by the PostScript filter could lose
some options
* job-hold-until with time values for the next day would be held
for 60 days
* Some types of Sun raster files did not print correctly
* Raw PBM files did not print correctly
* The SNMP backend no longer uses IPP with HP printers, as some
recent firmware versions appear to not work
* cupsMarkOptions() did not handle the multiple-document-handling
option
* lpstat did not show the local job ID of active printers
* The backends incorrectly used STATUS: media-tray-empty-error
messages for out-of-paper conditions
* cupsGetPPD2() returned the wrong error when the PPD file did
not exist
* cupsDoAuthentication() did not translate the password prompt
* httpGetLength2() did not handle error messages without content
correctly
* Added support for 32/64-bit libraries on HP-UX Itanium systems
* Fixed a configure script problem with the 32/64-bit library
support
* The PostScript filter did not properly output document setup
commands for reversed output
* The scheduler did not parse IPv6 netmasks properly
- removed backported, unnecessary patches
* Tue Feb 13 2007 - kssingvo@suse.de
- fixed tcp_wrapper warnings (bugzilla#230730)
- fixed ps interpretation (bugzilla#242042)