rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'f19'

Browse Source
This commit is contained in:
Tim Waugh 2013-07-11 13:24:57 +01:00
commit 858f711004
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cups-gz-crc.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up cups-1.6.2/cups/file.c.gz-crc cups-1.6.2/cups/file.c
--- cups-1.6.2/cups/file.c.gz-crc 2013-07-11 12:06:49.920878639 +0100
+++ cups-1.6.2/cups/file.c 2013-07-11 12:13:41.169628104 +0100
@@ -2429,8 +2429,8 @@ cups_fill(cups_file_t *fp) /* I - CUPS
}
else
{
- tcrc = (((((trailer[3] << 8) | trailer[2]) << 8) | trailer[1]) << 8) |
- trailer[0];
+ tcrc = (((uLong) ((trailer[3] << 8) | trailer[2])) << 16) |
+ (uLong) ((trailer[1] << 8) | trailer[0]);
if (tcrc != fp->crc)
{

8
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 1.7
Release: 0.15.%{prever}%{?dist}
Release: 0.16.%{prever}%{?dist}
License: GPLv2
Group: System Environment/Daemons
Url: http://www.cups.org/
@ -67,6 +67,7 @@ Patch33: cups-no-gcry.patch
Patch34: cups-libusb-quirks.patch
Patch35: cups-use-ipp1.1.patch
Patch36: cups-avahi-no-threaded.patch
Patch37: cups-gz-crc.patch
Patch100: cups-lspp.patch
@ -253,6 +254,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch35 -p1 -b .use-ipp1.1
# Don't use D-Bus from two threads (bug #979748).
%patch36 -p1 -b .avahi-no-threaded
# Avoid sign-extending CRCs for gz decompression (bug #983486).
%patch37 -p1 -b .gz-crc
%if %lspp
# LSPP support.
@ -633,6 +636,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Thu Jul 11 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.16.b1
- Avoid sign-extending CRCs for gz decompression (bug #983486).
* Wed Jul 10 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.15.b1
- Fixed download URL.