rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed small typos introduced in fix for bug #536741.

Browse Source
This commit is contained in:
Tim Waugh 2009-11-23 12:05:03 +00:00
parent a73b088494
commit 7c9ce96e70
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cups-lspp.patch
View File

@ -1740,7 +1740,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp cups-1.4.1/scheduler/ipp.c
+ +
+ printerfile = strstr(printer->device_uri, "/dev/"); + printerfile = strstr(printer->device_uri, "/dev/");
+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) + if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0))
+ printerfile = printer->device_uri + strlen("file:"); + printerfile = printer->device_uri + strlen("file:/");
+ +
+ if (printerfile != NULL) + if (printerfile != NULL)
+ { + {
@ -2546,7 +2546,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp cups-1.4.1/scheduler/job.c
+ */ + */
+ printerfile = strstr(printer->device_uri, "/dev/"); + printerfile = strstr(printer->device_uri, "/dev/");
+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) + if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0))
+ printerfile = printer->device_uri + strlen("file:"); + printerfile = printer->device_uri + strlen("file:/");
+ +
+ if (printerfile != NULL) + if (printerfile != NULL)
+ { + {
@ -2788,7 +2788,7 @@ diff -up cups-1.4.1/scheduler/printers.c.lspp cups-1.4.1/scheduler/printers.c
+ printercon = 0; + printercon = 0;
+ printerfile = strstr(p->device_uri, "/dev/"); + printerfile = strstr(p->device_uri, "/dev/");
+ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) + if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0))
+ printerfile = p->device_uri + strlen("file:"); + printerfile = p->device_uri + strlen("file:/");
+ +
+ if (printerfile != NULL) + if (printerfile != NULL)
+ { + {

8
cups.spec
View File

@ -9,7 +9,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.2 Version: 1.4.2
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -530,8 +530,12 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Mon Nov 23 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-9
- Fixed small typos introduced in fix for bug #536741.
* Fri Nov 20 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-8 * Fri Nov 20 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-8
- Do not translate russian links showing completed jobs (bug #539354, STR #3422). - Do not translate russian links showing completed jobs
(bug #539354, STR #3422).
* Thu Nov 19 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-7 * Thu Nov 19 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-7
- Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200). - Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).