rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Tim Waugh 2011-09-02 16:11:01 +01:00
commit 1cf69629f4
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hplip-hpcups-crash.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up hplip-3.11.7/prnt/hpcups/ModeJbig.cpp.hpcups-crash hplip-3.11.7/prnt/hpcups/ModeJbig.cpp
--- hplip-3.11.7/prnt/hpcups/ModeJbig.cpp.hpcups-crash 2011-09-02 16:04:58.118437727 +0100
+++ hplip-3.11.7/prnt/hpcups/ModeJbig.cpp 2011-09-02 16:06:27.625795462 +0100
@@ -99,6 +99,8 @@ const BYTE ModeJbig::szByte2[256] =
ModeJbig::ModeJbig (unsigned int RasterSize) : Compressor (RasterSize, false)
{
+ m_hHPLibHandle = 0;
+ m_pszInputRasterData = 0;
m_iWidth = ((RasterSize + 31) / 32) * 4;
m_iPlaneNumber = 0;
m_iCurrentPlane = 0;

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.11.7 Version: 3.11.7
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -26,6 +26,7 @@ Patch9: hplip-snmp-quirks.patch
Patch10: hplip-discovery-method.patch Patch10: hplip-discovery-method.patch
Patch11: hplip-hpijs-marker-supply.patch Patch11: hplip-hpijs-marker-supply.patch
Patch12: hplip-clear-old-state-reasons.patch Patch12: hplip-clear-old-state-reasons.patch
Patch13: hplip-hpcups-crash.patch
Patch14: hplip-hpcups-sigpipe.patch Patch14: hplip-hpcups-sigpipe.patch
Patch15: hplip-fax-ppd.patch Patch15: hplip-fax-ppd.patch
Patch16: hplip-bad-low-ink-warning.patch Patch16: hplip-bad-low-ink-warning.patch
@ -204,6 +205,9 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
# Clear old printer-state-reasons we used to manage (bug #510926). # Clear old printer-state-reasons we used to manage (bug #510926).
%patch12 -p1 -b .clear-old-state-reasons %patch12 -p1 -b .clear-old-state-reasons
# Fixed hpcups crash when required plugin missing (bug #733461).
%patch13 -p1 -b .hpcups-crash
# Avoid busy loop in hpcups when backend has exited (bug #525944). # Avoid busy loop in hpcups when backend has exited (bug #525944).
%patch14 -p1 -b .hpcups-sigpipe %patch14 -p1 -b .hpcups-sigpipe
@ -534,6 +538,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Fri Sep 2 2011 Tim Waugh <twaugh@redhat.com> 3.11.7-3
- Fixed hpcups crash when required plugin missing (bug #733461).
* Thu Aug 18 2011 Tim Waugh <twaugh@redhat.com> 3.11.7-2 * Thu Aug 18 2011 Tim Waugh <twaugh@redhat.com> 3.11.7-2
- Create debugging files securely (CVE-2011-2722, bug #725830). - Create debugging files securely (CVE-2011-2722, bug #725830).