diff --git a/change-ppd-install-dir.diff b/change-ppd-install-dir.diff index 6cd97ce..65a6f20 100644 --- a/change-ppd-install-dir.diff +++ b/change-ppd-install-dir.diff @@ -1,9 +1,9 @@ ---- Makefile.am.orig 2006-06-14 19:43:09.000000000 +0200 -+++ Makefile.am 2006-06-19 15:14:50.000000000 +0200 -@@ -70,7 +70,7 @@ - +--- Makefile.am.orig 2007-02-22 12:14:08.000000000 +0100 ++++ Makefile.am 2007-02-22 12:18:39.000000000 +0100 +@@ -66,7 +66,7 @@ dist_cmd_SCRIPTS = align.py info.py prin cupsdir = $(CUPS_BACKEND_PATH) cupsppddir = $(CUPS_PPD_PATH) + ppddir = $(datadir)/ppd -hpppddir = $(datadir)/ppd/HP +hpppddir = $(datadir)/cups/model/manufacturer-PPDs/hplip diff --git a/fix-buffer-overflow.patch b/fix-buffer-overflow.patch deleted file mode 100644 index 0acf1a5..0000000 --- a/fix-buffer-overflow.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 (); ---- pcard/fat.c.orig 2006-11-14 00:58:36.000000000 +0100 -+++ pcard/fat.c 2007-02-16 11:48:34.000000000 +0100 -@@ -347,7 +347,8 @@ int LoadFileInCWD(int filenumber) - return FAT_FILE_DELETED; - - /* Read file information from directory and convert to 8.3 format. */ -- for (i=0; pde->Name[i] && (pde->Name[i] != ' ') && (iName)); i++) /* copy charactors up to any space */ -+ /* Test for iName) first of all to avoid any access to pde->Name[i] when i>=sizeof(pde->Name) */ -+ for (i=0; (iName)) && pde->Name[i] && (pde->Name[i] != ' '); i++) /* copy charactors up to any space */ - fa.Name[i] = pde->Name[i]; - if (pde->Ext[0] && (pde->Ext[0] != ' ')) - { diff --git a/hpijs-standalone.changes b/hpijs-standalone.changes index 19bcad9..716b424 100644 --- a/hpijs-standalone.changes +++ b/hpijs-standalone.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 1 13:35:18 CET 2007 - jsmeix@suse.de + +- Updated to version 1.7.2: + Several more supported Officejet Pro devices. + New OJProKx50 device class (derived from DJGenericVIP). + Many bug fixes (no Suse bugs). + fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer + needed because the bugs are now fixed in the sources. + ------------------------------------------------------------------- Fri Feb 16 13:02:45 CET 2007 - jsmeix@suse.de diff --git a/hpijs-standalone.spec b/hpijs-standalone.spec index 095ebb5..3c21330 100644 --- a/hpijs-standalone.spec +++ b/hpijs-standalone.spec @@ -1,5 +1,5 @@ # -# spec file for package hpijs-standalone (Version 1.7.1) +# spec file for package hpijs-standalone (Version 1.7.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,22 +16,17 @@ Summary: HPIJS stand-alone # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # 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: 7 +Version: 1.7.2 +Release: 1 Group: Hardware/Printing License: BSD License and BSD-like URL: http://hpinkjet.sourceforge.net/ # Source0...Source9 is for sources from HP: -# URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.1.tar.gz +# URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.2.tar.gz Source0: hplip-%{version}.tar.bz2 # Patch0...Patch9 is for patches from HP: -# URL for Patch0: http://sourceforge.net/project/showfiles.php?group_id=149981 -# 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: @@ -46,8 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # it must be 100% sure that all what the hpijs driver needs to run is also installed. # Therefore the requirement is weakened for this package: Supplements: ghostscript_any -# hplip-hpijs and hplip-hpijs-standalone both contain /usr/bin/hpijs: -Conflicts: hplip-hpijs +# hplip-hpijs, hplip17-hpijs, and hplip-hpijs-standalone contain /usr/bin/hpijs: +Conflicts: hplip-hpijs hplip17-hpijs # Skip testing devel dependencies required by libtool .la files by the following comment: # skip-check-libtool-deps @@ -75,11 +70,7 @@ Authors: %prep # Be quiet when unpacking: -%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 +%setup -q -n hplip-1.7.2 %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -139,6 +130,13 @@ exit 0 %{_bindir}/hpijs %changelog +* Thu Mar 01 2007 - jsmeix@suse.de +- Updated to version 1.7.2: + Several more supported Officejet Pro devices. + New OJProKx50 device class (derived from DJGenericVIP). + Many bug fixes (no Suse bugs). + fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer + needed because the bugs are now fixed in the sources. * Fri Feb 16 2007 - jsmeix@suse.de - Re-enabled "Supplements: ghostscript_any" because bug #243595 is fixed now. diff --git a/hplip-1.7.1-1.patch b/hplip-1.7.1-1.patch deleted file mode 100644 index faacdc7..0000000 --- a/hplip-1.7.1-1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr hplip-1.7.1_old/prnt/hpijs/dj3320.cpp hplip-1.7.1_new/prnt/hpijs/dj3320.cpp ---- hplip-1.7.1_old/prnt/hpijs/dj3320.cpp 2007-01-24 15:42:03.000000000 -0800 -+++ hplip-1.7.1_new/prnt/hpijs/dj3320.cpp 2007-01-31 13:33:42.000000000 -0800 -@@ -3066,7 +3066,7 @@ - } - - // Send Sync packet -- err = pPrinterXBow->Send (pbySync, (DWORD) sizeof (pbySync)); -+ err = pPrinterXBow->Send (pbySync, SYNCSIZE); - if(err) - { - return err; diff --git a/hplip-1.7.1.tar.bz2 b/hplip-1.7.1.tar.bz2 deleted file mode 100644 index b184c09..0000000 --- a/hplip-1.7.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76e6c3c28eae34850a0bd405892dd43dc4239df254769414aa242acfeeb7c4ad -size 9701581 diff --git a/hplip-1.7.2.tar.bz2 b/hplip-1.7.2.tar.bz2 new file mode 100644 index 0000000..ed617e1 --- /dev/null +++ b/hplip-1.7.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46d65f8a0a15fed77ae6864556b0495dde63c7d7a87708df35ea648d3be660bb +size 9921681 diff --git a/hplip.changes b/hplip.changes index 41468c8..4288b24 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 1 13:34:43 CET 2007 - jsmeix@suse.de + +- Updated to version 1.7.2: + Several more supported Officejet Pro devices. + New OJProKx50 device class (derived from DJGenericVIP). + Major hp-toolbox upgrade/redesign. + Many bug fixes (no Suse bugs). + fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer + needed because the bugs are now fixed in the sources. + ------------------------------------------------------------------- Fri Feb 16 11:52:28 CET 2007 - jsmeix@suse.de diff --git a/hplip.spec b/hplip.spec index f2a4506..63cac75 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,5 +1,5 @@ # -# spec file for package hplip (Version 1.7.1) +# spec file for package hplip (Version 1.7.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,19 +16,16 @@ Summary: HP's Printing, Scanning, and Faxing Software # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: # 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: 10 +Version: 1.7.2 +Release: 1 %define hpijsVersion 2.7.1 Group: Hardware/Printing License: BSD License and BSD-like, GNU General Public License (GPL) URL: http://hpinkjet.sourceforge.net/ # Source0...Source9 is for sources from HP: -# URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.1.tar.gz +# URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.2.tar.gz Source0: %{name}-%{version}.tar.bz2 # Patch0...Patch9 is for patches from HP: -# URL for Patch0: http://sourceforge.net/project/showfiles.php?group_id=149981 -# 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: # Fix "... is used uninitialized ..." warnings: Patch10: fix-uninitialized-variables.diff @@ -36,8 +33,6 @@ 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': @@ -54,6 +49,8 @@ Patch100: %{name}-init-script.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils, /bin/grep, /bin/sed, /usr/bin/find Requires: %{name}-hpijs, foomatic-filters, python-xml, python-qt +# Either the hplip17 packages or the hplip packages can be installed: +Obsoletes: hplip17 # Skip testing devel dependencies required by libtool .la files by the following comment: # skip-check-libtool-deps @@ -100,7 +97,7 @@ Authors: Cauligi Raghothama S. %package hpijs -Summary: HPIJS for HP's printing and scanning software HPLIP. +Summary: HPIJS for HP's printing and scanning software HPLIP: Cutting Edge Version Group: Hardware/Printing # Mutual RPM package requirements are meanwhile considered to be bad because # such cyclic dependencies which makes it harder to automatically solve dependencies. @@ -112,20 +109,26 @@ Group: Hardware/Printing Supplements: ghostscript_any # hplip-hpijs and hpijs-standalone both contain /usr/bin/hpijs: Conflicts: hpijs-standalone +# Either the hplip17 packages or the hplip packages can be installed: +Obsoletes: hplip17-hpijs %description hpijs -HPIJS is a Ghostscript printer driver for HP printers. +This is a cutting edge version of HPIJS which is a Ghostscript printer +driver for HP printers. + +An update from version 0.9.7 to this version may result +incompatibilities, see the main-package hplip17. This sub-package includes only the hpijs binary and the libhpip library which is needed to run it. Additionally it needs at least the CUPS library in the package cups-libs. Normally (in particular when used with the CUPS printing system) the HPIJS driver needs the rest of HP's -printing and scanning software in the package hplip (in particular the -PPD files for CUPS). For special cases (e.g. for LPRng/lpdfilter or for -a small printing system) it is possible to use only the hpijs binary -and Ghostscript. +printing and scanning software in the package hplip17 (in particular +the PPD files for CUPS). For special cases (e.g. for LPRng/lpdfilter or +for a small printing system) it is possible to use only the hpijs +binary and Ghostscript. -For full documentation and license see the main-package hplip. +For full documentation and license see the main-package hplip17. @@ -140,16 +143,12 @@ Authors: %prep # Be quiet when unpacking: %setup -q -# Fix Deskjet D4100/D4160 christmas-tree (firmware hangs up with flashing LEDs) on second print job: -%patch0 -p1 # Fix "... is used uninitialized ..." warnings: %patch10 # Change installation directory for PPDs: %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) @@ -257,7 +256,9 @@ exit 0 # In this case trigger to add the SANE backend "hpaio" to /etc/sane.d/dll.conf if it is not there. # To be safe there is a test that /etc/sane.d/dll.conf is writable. if [ -w /etc/sane.d/dll.conf ] -then grep -q 'hpaio' /etc/sane.d/dll.conf || echo -e '# The hpaio backend is provided by the hplip package:\n#hpaio' >>/etc/sane.d/dll.conf +then if ! grep -q 'hpaio' /etc/sane.d/dll.conf + then echo -e '# The hpaio backend is provided by the hplip package:\n#hpaio' >>/etc/sane.d/dll.conf + fi fi exit 0 @@ -278,12 +279,20 @@ exit 0 /sbin/ldconfig # If the package was removed (but not if it was updated) # then remove the hpaio lines in /etc/sane.d/dll.conf. +# Don't remove them when the hplip package was automatically +# replaced by the hplip17 package (via RPM obsoletes) or vice versa. +# Because postun of the old package runs last (after triggerin -- sane-backends) +# it is done via a special "ls" test if any libsane-hpaio.so exists +# (e.g. there could be only 32-bit installed on 64-bit hardware). +# If the "ls" test does not fail, some kind of HPLIP is installed. +# The package sane-backends may not be installed (see triggerin) +# and therefore the test that /etc/sane.d/dll.conf is writable. # The "exit 0" is necessary, otherwise the postun script # would exit with non-zero exit-code if the package was not removed. -# Note that sane-backends may not be installed (see triggerin) -# and therefore the test that /etc/sane.d/dll.conf is writable. if [ "$1" = "0" ] -then [ -w /etc/sane.d/dll.conf ] && sed -i -e '/hpaio/d' /etc/sane.d/dll.conf +then if ! ls /usr/lib*/sane/libsane-hpaio.so* &>/dev/null + then [ -w /etc/sane.d/dll.conf ] && sed -i -e '/hpaio/d' /etc/sane.d/dll.conf + fi fi exit 0 @@ -337,6 +346,14 @@ exit 0 %{_libdir}/libhpip.* %changelog +* Thu Mar 01 2007 - jsmeix@suse.de +- Updated to version 1.7.2: + Several more supported Officejet Pro devices. + New OJProKx50 device class (derived from DJGenericVIP). + Major hp-toolbox upgrade/redesign. + Many bug fixes (no Suse bugs). + fix-buffer-overflow.patch and hplip-1.7.1-1.patch are no longer + needed because the bugs are now fixed in the sources. * Fri Feb 16 2007 - jsmeix@suse.de - Added a fix for fat.c to fix-buffer-overflow.patch to aviod access when array subscript is above array bounds