OBS User unknown 2007-02-05 14:38:52 +00:00 committed by Git OBS Bridge
parent 7889c8a8cb
commit 32c465d0c4
5 changed files with 48 additions and 3 deletions

11
fix-buffer-overflow.patch Normal file
View File

@ -0,0 +1,11 @@
--- prnt/hpijs/ljcolor.cpp.orig 2007-01-25 00:42:03.000000000 +0100
+++ prnt/hpijs/ljcolor.cpp 2007-02-05 14:16:25.000000000 +0100
@@ -272,7 +272,7 @@ DRIVER_ERROR HeaderLJColor::Send ()
DRIVER_ERROR HeaderLJColor::StartSend ()
{
DRIVER_ERROR err;
- char res[64];
+ char res[67];
int iRes;
iRes = thePrintContext->EffectiveResolutionY ();

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 5 14:25:21 CET 2007 - jsmeix@suse.de
- fix-buffer-overflow.patch fixes a too small string buffer
which overflows in line 310 in ljcolor.cpp.
-------------------------------------------------------------------
Thu Feb 1 15:08:48 CET 2007 - jsmeix@suse.de

View File

@ -17,7 +17,7 @@ Summary: HPIJS stand-alone
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
Version: 1.7.1
Release: 1
Release: 2
Group: Hardware/Printing
License: BSD License and BSD-like
URL: http://hpinkjet.sourceforge.net/
@ -29,7 +29,11 @@ Source0: hplip-%{version}.tar.bz2
# Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job:
Patch0: hplip-1.7.1-1.patch
# Patch10...Patch99 is for Suse patches for the sources from HP:
# The patch numbers are the same as in hplip.spec.
# Fix a too small string buffer which overflows in line 310 in ljcolor.cpp:
Patch13: fix-buffer-overflow.patch
# Source100... is for special Suse sources:
# The source numbers are the same as in hplip.spec.
# Source102 is a small man page for /usr/bin/hpijs:
Source102: hpijs.1.gz
# Install into this non-root directory (required when norootforbuild is used):
@ -74,6 +78,8 @@ Authors:
%setup -q -n hplip-1.7.1
# Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job:
%patch0 -p1
# Fix a too small string buffer which overflows in line 310 in ljcolor.cpp:
%patch13
%build
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
@ -133,6 +139,9 @@ exit 0
%{_bindir}/hpijs
%changelog -n hpijs-standalone
* Mon Feb 05 2007 - jsmeix@suse.de
- fix-buffer-overflow.patch fixes a too small string buffer
which overflows in line 310 in ljcolor.cpp.
* Thu Feb 01 2007 - jsmeix@suse.de
- Created new package hpijs-standalone and hpijs-standalone.spec
for a special version of /usr/bin/hpijs which neither needs

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 5 14:24:24 CET 2007 - jsmeix@suse.de
- fix-buffer-overflow.patch fixes a too small string buffer
which overflows in line 310 in ljcolor.cpp.
- Moved the hpijs man page to the hplip-hpijs sub-package
so that there is no same file in hplip and hpijs-standalone
(hplip-hpijs and hpijs-standalone conflict with each other).
-------------------------------------------------------------------
Thu Feb 1 15:02:59 CET 2007 - jsmeix@suse.de

View File

@ -17,7 +17,7 @@ Summary: HP's Printing, Scanning, and Faxing Software
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
Version: 1.7.1
Release: 3
Release: 4
%define hpijsVersion 2.7.1
Group: Hardware/Printing
License: BSD License and BSD-like, GNU General Public License (GPL)
@ -36,6 +36,8 @@ Patch10: fix-uninitialized-variables.diff
Patch11: change-ppd-install-dir.diff
# Change installation directory for the documentation:
Patch12: change-doc-install-dir.diff
# Fix a too small string buffer which overflows in line 310 in ljcolor.cpp:
Patch13: fix-buffer-overflow.patch
# Source100... is for special Suse sources:
# Source100 is the primary source for the suse_update_desktop_file stuff.
# It is found automatically in $RPM_SOURCE_DIR by 'suse_update_desktop_file -i hplip':
@ -146,6 +148,8 @@ Authors:
%patch11
# Change installation directory for the documentation:
%patch12
# Fix a too small string buffer which overflows in line 310 in ljcolor.cpp:
%patch13
%build
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
@ -311,15 +315,21 @@ exit 0
%{_bindir}/hp-toolbox.wrapper
%{_datadir}/pixmaps/HPmenu.png
%{_datadir}/applications/%{name}.desktop
%doc %{_mandir}/man1/hpijs.1.gz
%files hpijs
%defattr(-, root, root)
%doc doc/tech_docs/hpijs.html doc/tech_docs/device_classes.html
%doc %{_mandir}/man1/hpijs.1.gz
%{_bindir}/hpijs
%{_libdir}/libhpip.*
%changelog -n hplip
* Mon Feb 05 2007 - jsmeix@suse.de
- fix-buffer-overflow.patch fixes a too small string buffer
which overflows in line 310 in ljcolor.cpp.
- Moved the hpijs man page to the hplip-hpijs sub-package
so that there is no same file in hplip and hpijs-standalone
(hplip-hpijs and hpijs-standalone conflict with each other).
* Thu Feb 01 2007 - jsmeix@suse.de
- hplip-1.7.1-1.patch from HP fixes Deskjet D4100/D4160
christmas-tree (firmware hangs up with flashing LEDs)