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

Merge branch 'f15' into f16

Browse Source
This commit is contained in:
Tim Waugh 2011-09-14 12:10:45 +01:00
commit 2c16ad0b31
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cups-cups-get-classes.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.5b1/cups/dest.c.cups-get-classes cups-1.5b1/cups/dest.c diff -up cups-1.5.0/cups/dest.c.cups-get-classes cups-1.5.0/cups/dest.c
--- cups-1.5b1/cups/dest.c.cups-get-classes 2011-05-20 05:49:49.000000000 +0200 --- cups-1.5.0/cups/dest.c.cups-get-classes 2011-05-20 04:49:49.000000000 +0100
+++ cups-1.5b1/cups/dest.c 2011-05-26 11:06:22.000000000 +0200 +++ cups-1.5.0/cups/dest.c 2011-09-14 12:10:05.111635428 +0100
@@ -534,6 +534,7 @@ _cupsGetDests(http_t *http, /* I - @@ -534,6 +534,7 @@ _cupsGetDests(http_t *http, /* I -
char uri[1024]; /* printer-uri value */ char uri[1024]; /* printer-uri value */
int num_options; /* Number of options */ int num_options; /* Number of options */
@ -52,7 +52,7 @@ diff -up cups-1.5b1/cups/dest.c.cups-get-classes cups-1.5b1/cups/dest.c
+ * early if so. + * early if so.
+ */ + */
+ +
+ if (op == CUPS_GET_CLASSES) + if (op == CUPS_GET_CLASSES && num_dests > 0)
+ { + {
+ int diff; + int diff;
+ cups_find_dest (printer_name, NULL, num_dests, *dests, 0, &diff); + cups_find_dest (printer_name, NULL, num_dests, *dests, 0, &diff);

5
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.5.0 Version: 1.5.0
Release: 7%{?dist} Release: 8%{?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
@ -639,6 +639,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ipptool.1.gz %{_mandir}/man1/ipptool.1.gz
%changelog %changelog
* Wed Sep 14 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-8
- Prevent libcups crash in cups-get-classes patch (bug #736698).
* Thu Sep 1 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-7 * Thu Sep 1 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-7
- Use PathExistsGlob instead of DirectoryNotEmpty in cups.path - Use PathExistsGlob instead of DirectoryNotEmpty in cups.path
(bug #734435). (bug #734435).