Hello community,
here is the log from the commit of package sane-backends
checked in at Thu Feb 28 18:24:22 CET 2008.
--------
--- sane-backends/sane-backends.changes 2008-01-31 10:46:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/sane-backends/sane-backends.changes 2008-02-28 14:34:31.279288000 +0100
@@ -1,0 +2,56 @@
+Thu Feb 28 13:56:15 CET 2008 - jsmeix@suse.de
+
+- Updated to sane-backends version 1.0.19:
+ New backends:
+ cardscan (Corex Cardscan 800c), epjitsu (Epson-based Fujitsu),
+ epson2 (various Epson scanners), hp3900 (HP ScanJet 3970 and
+ more), hp5590 (HP ScanJet 5590 and more), hpljm1005 (HP LaserJet
+ M1005 and more), hs2p (Ricoh IS400 series)
+ Updated backends:
+ abaton, agfafocus, apple, artec, artec_eplus48u, as6e, avision,
+ canon, coolscan, coolscan2, dc25, dell1600n_net, dll, epson,
+ fujitsu, genesys, gt68xx, hp3500, ibm, lexmark, microtek,
+ microtek2, mustek, nec, net, pie, pint, pixma, plustek,
+ plustek_pp, ricoh, s9036, sm3600, sm3840, snapscan, sp15c,
+ st400, tamarack, teco2, test, u12, umax, umax1220u, umax_pp
+ Plus:
+ Scanimage detects more chipsets.
+ Internal scsi, usb, tcp and udp code updates.
+ Basic HAL .fdi creation support
+ Build system updates.
+ Updated translations.
+ Documentation updates.
+ Bugfixes.
+ Note:
+ This will be (hopefully) the last release of the SANE 1.0 series.
+ The next release will be extended (in a backwards compatible
+ fashion) to support more features of modern scanners.
+- sane-backends-1.0.16-nb.patch (did locale rename: no -> nb)
+ is obsolete since version 1.0.19 because it uses already 'nb'.
+- in fix-buffer-overflow.patch the overflows in backend/epson.c
+ backend/as6e.c and sanei/sanei_ab306.c are obsolete because
+ they are fixed in the source (only backend/niash.c is left).
+- replace-HZ-by-sysconf_SC_CLK_TCK.patch is obsolete because
+ it is fixed in the source.
+- fujitsu-disable-hw_ink_remain.patch is obsolete because
+ it is fixed in the source.
+- in fix-uninitialized-variables.patch the fix regarding
+ teco2.c is obsolete because it is fixed in the source
+ but a new fix regarding avision.c was added.
+- fix-ambiguous-post-pre-increment.patch is obsolete because
+ it is fixed in the source.
+- module-build.diff is dropped because there is no reason to build
+ driver modules as libtool modules and furthermore it makes our
+ package incompatible with the rest of the SANE world.
+- Since version 1.0.19 there is udev and HAL support.
+ Therefore the old/outdated hotplug stuff (libsane.usermap
+ and libusbscanner) is dropped (it was never used by openSUSE).
+ Also the evil-hack init-script "sane-dev" is no longer provided.
+ libsane.rules.CVS-2007-07-29.using-lp is obsolete because
+ the udev rules file 55-libsane.rules is directly derived
+ from tools/udev/libsane.rules.
+ create_hal_global_fdi_from_libsane.rules is obsolete because
+ the HAL fdi file 70-scanner.fdi is directly derived
+ from tools/hal/libsane.fdi.
+
+-------------------------------------------------------------------
@@ -4,2 +60,2 @@
-- call create_hal_global_fdi_for_scanners via bash. We can not rely
- on source file permissions
+- Call create_hal_global_fdi_from_libsane.rules via bash.
+ We can not rely on source file permissions
@@ -13 +69 @@
- libsane.rules file (see Novell/Suse Bugzilla bug 298878).
+ libsane.rules file (see Novell/Suse Bugzilla bnc#298878).
@@ -35 +91 @@
- currently newest changes in HAL (see Suse Bugzilla bug 250659).
+ currently newest changes in HAL (see Suse Bugzilla bnc#250659).
@@ -40 +96 @@
-- Build modules as libtool modules.
+- module-build.diff builds driver modules as libtool modules.
@@ -52 +108 @@
- (see Suse Bugzilla bug 246654).
+ (see Suse Bugzilla bnc#246654).
@@ -59 +115 @@
- (see Suse Bugzilla bug 239953).
+ (see Suse Bugzilla bnc#239953).
@@ -87 +143 @@
- sane-dev (see Suse Bugzilla bug 160899).
+ sane-dev (see Suse Bugzilla bnc#160899).
@@ -100 +156 @@
- variable in teco2.c (see Suse Bugzilla bug 205451).
+ variable in teco2.c (see Suse Bugzilla bnc#205451).
@@ -103 +159 @@
- by the current SANE version (see Suse Bugzilla bug 160899).
+ by the current SANE version (see Suse Bugzilla bnc#160899).
@@ -117 +173 @@
- which causes a buffer overflow (see Suse Bugzilla bug 202243).
+ which causes a buffer overflow (see Suse Bugzilla bnc#202243).
@@ -123 +179 @@
- fix-buffer-overflow.patch (see Suse Bugzilla bug 202243).
+ fix-buffer-overflow.patch (see Suse Bugzilla bnc#202243).
@@ -129 +185 @@
- do scanner auto-recognition (see Suse Bugzilla bug 177492).
+ do scanner auto-recognition (see Suse Bugzilla bnc#177492).
@@ -165 +221 @@
- from Suse Linux 10.0 to 10.1 (see Suse Bugzilla bug 157055).
+ from Suse Linux 10.0 to 10.1 (see Suse Bugzilla bnc#157055).
@@ -311 +367 @@
- respectively "sane" (see SUSE bugzilla bug 41233).
+ respectively "sane" (see SUSE bugzilla bnc#41233).
@@ -329 +385 @@
- (SUSE bugzilla bug 42032).
+ (SUSE bugzilla bnc#42032).
@@ -336 +392 @@
- a transparency unit (SUSE bugzilla bug 45075).
+ a transparency unit (SUSE bugzilla bnc#45075).
@@ -339 +395 @@
- with names containing a dot (SUSE bugzilla bug 45313).
+ with names containing a dot (SUSE bugzilla bnc#45313).
@@ -383 +439 @@
- package (see bugzilla bug #37169) and for details see
+ package (see bugzilla bnc#37169) and for details see
@@ -393 +449 @@
- (see bugzilla bug #36584).
+ (see bugzilla bnc#36584).
Old:
----
create_hal_global_fdi_from_libsane.rules
fix-ambiguous-post-pre-increment.patch
fujitsu-disable-hw_ink_remain.patch
libsane.rules.CVS-2007-07-29.using-lp
module-build.diff
replace-HZ-by-sysconf_SC_CLK_TCK.patch
sane-backends-1.0.16-nb.patch
sane-backends-1.0.18.tar.bz2
sane-dev
New:
----
sane-backends-1.0.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sane-backends.spec ++++++
--- /var/tmp/diff_new_pack.M28759/_old 2008-02-28 18:23:39.000000000 +0100
+++ /var/tmp/diff_new_pack.M28759/_new 2008-02-28 18:23:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package sane-backends (Version 1.0.18)
+# spec file for package sane-backends (Version 1.0.19)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,20 +10,24 @@
# norootforbuild
+
Name: sane-backends
-BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel libpng net-snmp-devel pkg-config texlive-latex
+BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex
License: GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware
Group: Hardware/Scanner
AutoReqProv: on
Summary: SANE (Scanner Access Now Easy) Scanner Drivers
-Version: 1.0.18
-Release: 125
+Version: 1.0.19
+Release: 1
Url: http://www.sane-project.org/
-# URL for Source0: http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
+# URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
Source0: sane-backends-%{version}.tar.bz2
# Source100... is SUSE specific stuff:
-Source100: sane-dev
+# Source100 is the evil-hack init-script "sane-dev" to grant scanner access permissions.
+# Source100 is no longer provided because sane-backends-1.0.19 has udev and HAL support.
+# Source101 is the xinetd file for the saned:
Source101: sane-port
+# Source102 is the OpenSLP registration file for the saned:
Source102: sane.reg
# Since openSUSE 10.3 "Source103: hpoj.desc" is dropped because the package hp-officeJet is dropped.
# The descriptions-external file for the hpaio backend is provided by the package hplip:
@@ -51,35 +55,42 @@
Source105: epkowa.desc
# Since openSUSE 10.3 "Source106: create_hal_global_fdi_for_scanners" is dropped because
# it is replaced by "Source108: create_hal_global_fdi_from_libsane.rules".
-# Readymade udev rules for openSUSE 10.3 derived from sane-backends 1.0.18-cvs:
-Source107: libsane.rules.CVS-2007-07-29.using-lp
-# Script which outputs a global HAL fdi file for scanners which are known to SANE:
-Source108: create_hal_global_fdi_from_libsane.rules
+# Source107 are readymade udev rules for openSUSE 10.3 derived from sane-backends 1.0.18-cvs.
+# Source107 is obsolete since sane-backends-1.0.19 because it has udev and HAL support.
+# Source108 is a script which outputs a HAL fdi file.
+# Source108 is obsolete since sane-backends-1.0.19 because it has udev and HAL support.
# Patch1 does locale rename: no -> nb:
-Patch1: sane-backends-1.0.16-nb.patch
-# Patch2 fixes a too small char array which causes a buffer overflow if SANE_DEBUG_EPSON is set:
+# Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'.
+# Patch2 fixes too small arrays in backend/niash.c:
Patch2: fix-buffer-overflow.patch
# Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value:
-Patch3: replace-HZ-by-sysconf_SC_CLK_TCK.patch
+# Patch3 is obsolete since sane-backends-1.0.19 because it is fixed in the source.
# Patch4 disables hw_ink_remain which causes a buffer overflow in fujitsu.c:
-Patch4: fujitsu-disable-hw_ink_remain.patch
-# Patch5 fixes an uninitialized variable in teco2.c:
+# Patch4 is obsolete since sane-backends-1.0.19 because it is fixed in the source.
+# Patch5 fixes uninitialized variables in avision.c:
Patch5: fix-uninitialized-variables.patch
# Patch6 fixes an ambiguous post/pre increment in canon-sane.c:
-Patch6: fix-ambiguous-post-pre-increment.patch
+# Patch6 is obsolete since sane-backends-1.0.19 because it is fixed in the source.
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
Patch100: canon-backend-autoprobing.patch
# Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
Patch101: disable-resmgr-support.patch
# Patch102 builds libsane-* modules as libtool modules:
-Patch102: module-build.diff
+# SANE backends (i.e. driver modules) are regular shared libraries.
+# Nothing is linked directly with a /usr/lib/sane/libsane-<driver>.so module.
+# In particular scanning frontends (like scanimage, xscanimage, xsane, kooka)
+# are linked with libsane.so.1 which is the dll meta-backend which dlopen()s the
+# driver modules according to which drivers are activated in /etc/sane.d/dll.conf.
+# One could "cp /usr/lib/sane/libsane-<driver>.so /usr/lib/libsane.so"
+# and scanning would also work (but now one can use only this single driver).
+# The libtool script used in sane-backends is slightly modified to support that.
+# Patch102 was dropped because there is no reason to build them as libtool modules
+# and it would make our package incompatible with the rest of the SANE world.
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# The postinstall script requires this:
PreReq: coreutils, /bin/sed, /bin/grep
-# Built with libieee1284 which is needed to access parallel port scanners:
-Requires: libieee1284
# Suse Linux and openSUSE have the package name 'sane' for 'sane-backends'.
# Therefore this RPM provides 'sane' and it also obsoletes it:
Provides: sane
@@ -126,26 +137,30 @@
David Stevenson
Didier Carlier
Earle F. Philhower III
- Eddy De Greef
+ Eddy De Greef
Eugene S. Weiss
Feico W. Dillema
Franck Schneider
- Frank Zago
+ Frank Zago <sane at zago dot net>
Frederik Ramm
- Gerard Klaver
+ Fred Odendaal <freshshelf at rogers dot com>
+ Gerard Klaver <gerard at gkall dot hobby dot nl>
Gerhard Jaeger
Giuseppe Sacco
Glenn Ramsey
- Gordon Matzigkeit
+ Gordon Matzigkeit
Guido Muesch
Helmut Koeberle
- Henning Meier-Geinitz
+ Henning Geinitz
Henrik Johansson
+ Ilia Sotnikov
Ingo Schneider
Ingo Wilken
James Perry
Jeff Freedman
Jochen Eisinger
+ Jonathan Bravo Lopez
+ Jon Chambers
Juergen G. Schimmer
Julien Blache
Karl Anders Oygard
@@ -154,8 +169,7 @@
Kazuhiro Sasayama
Kazuya Fukuda
Kevin Charter
- M. Allan Noah
- M.F.
+ M. Allan Noah
Manuel Panea
Marcio Teixeira
Marian Eichholz
@@ -166,7 +180,8 @@
Mattias Ellert
Max Vorobiev
Meino Christian Cramer
- Michael Herder
+ M.F.
+ Michael Herder
Michael K. Johnson
Michel Roelofs
Milon Firikis
@@ -175,47 +190,41 @@
Oliver Rauch
Oliver Schirrmeister
Oliver Schwartz
+ Patrick Lessard
Patrick Reynolds
Peter Fales
Peter Kirchgessner
Petter Reinholdtsen
+ Pierre Willenbrock
Randolph Bentson
- Rene Rebe
+ Rene Rebe
Roger Wolff
+ Roy Zhou
Sebastien Sable
Sergey Vlasov
Simon Krix
Simon Munton
- Stephane Voltz
+ Stephane Voltz
Thomas Soumarmon
Tom Martone
Tom Wang
Tristan Tarrant
+ Troy Rollo
Ullrich Sigwanz
Ulrich Deiters
+ Wittawat Yamwong
%prep
%setup -q
-# locale rename: no -> nb:
-%patch1 -b .nb
-mv po/sane-backends.no.po po/sane-backends.nb.po
-# Patch2 fixes a too small char array which causes a buffer overflow if SANE_DEBUG_EPSON is set:
+# Patch2 fixes too small arrays in backend/niash.c:
%patch2
-# Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value:
-%patch3
-# Patch4 disables hw_ink_remain which causes a buffer overflow in fujitsu.c:
-%patch4
-# Patch5 fixes an uninitialized variable in teco2.c:
+# Patch5 fixes uninitialized variables in avision.c:
%patch5
-# Patch6 fixes an ambiguous post/pre increment in canon-sane.c:
-%patch6
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
%patch100
# Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
%patch101
-# Patch102 builds libsane-* modules as libtool modules:
-%patch102
# Source100... is SUSE specific stuff:
# Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
# because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped.
@@ -227,7 +236,14 @@
%build
%{?suse_update_config:%{suse_update_config -f}}
-autoreconf -fi
+# 'autoreconf -fi' fails for sane-backends-1.0.19 with the message:
+# aclocal: acinclude.m4:606: file m4/libtool.m4 does not exist
+# The m4 dir from CVS was not included in the 1.0.18 tar, so it was
+# not included in 1.0.19 either, but it has new files since 1.0.18.
+# It is a bit strange because autoconf never complained before.
+# Because it is not clear whether or not 'autoreconf -fi' is best
+# and because it builds without it, it is simply disabled for now:
+#autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DGIMP_ENABLE_COMPAT_CRUFT=1 -fno-strict-aliasing"
export LDFLAGS="-L/%_lib $LDFLAGS"
# Disable locking because /var/lock/sane/ would be a world-writable directory:
@@ -244,6 +260,7 @@
# Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP)
# because "99" is the group of the user who runs the build when norootforbuild is used
# and set localstatedir to have the lock files in /var/lock/sane (see backend/Makefile.in).
+# Disabled because locking requires a world-writable /var/lock/sane/ directory:
# --enable-locking \
# --with-group=99 \
# --localstatedir=/var
@@ -251,15 +268,25 @@
%install
make install DESTDIR=%{buildroot}
-# Add libsane-dll links to _libdir so that it will be found by all SANE frontends.
-# Change directory to get relative paths in the links (i.e. without $RPM_BUILD_ROOT)
-# but use a subshell to avoid a permanent directory change:
-rm -rf %{buildroot}%{_libdir}/libsane-dll.so*
-( cd %{buildroot}%{_libdir} && ln -s sane/libsane-dll.so* . )
+# The actual driver modules are installed as libsane-<driver>.so.%{version}
+# and two libsane-<driver>.so.1 and libsane-<driver>.so links point to them.
+# Additionally a libsane-<driver>.la libtool archive file is installed
+# which could be used to find the correct module file name to dlopen the module.
+# Only the dll meta-backend (/usr/lib/libsane.so.1.0.19) links with driver modules.
+# The dll meta-backend looks only for libsane-<driver>.so.1 and uses dlopen(3) directly.
+# The dll meta-backend needs neither libsane-<driver>.so nor libsane-<driver>.la.
+# RPMLINT complains about libsane-<driver>.so with "devel-file-in-non-devel-package".
+# Therefore the libsane-<driver>.so and libsane-<driver>.la files are simply removed.
+# Note that those files for the dll meta-backend /usr/lib/libsane.so and /usr/lib/libsane.la
+# are not removed because it is unknown how whatever third-party scanning frontend
+# may like to link with SANE (i.e. with the dll meta-backend).
+rm %{buildroot}%{_libdir}/sane/libsane-*.so
+rm %{buildroot}%{_libdir}/sane/libsane-*.la
# Disable all backends in /etc/sane.d/dll.conf to avoid problems when backends are active by default:
perl -pi -e 's/^([^#].*)$/#$1/' %{buildroot}%{_sysconfdir}/sane.d/dll.conf
# Allow all users to write into /var/lock/sane/ so that the backends work for normal users
-# and set the sticky bit (i.e. others are not allowed to remove lock files):
+# and set the sticky bit (i.e. others are not allowed to remove lock files).
+# Disabled because package-specific world-writable directories are not allowed:
#chmod 1777 %{buildroot}/var/lock/sane/
# Install the descriptions and descriptions-external files.
# These files are the sources to make %{_defaultdocdir}/sane/sane-backends/*.html
@@ -272,11 +299,35 @@
# Add ':firmware "required"' entries for the respective scanners to the descriptions files
# so that YaST can show firmware upload related information to the user of such a scanner.
# This must be done after build because those entries are a SUSE specific extension.
-# As far as we know all scanners which use the backend gt68xx
-# and the related backend artec_eplus48u require a firmware upload,
+# To determine scanners which require firmware upload, search the man pages
+# for backends which provide support for firmware upload.
+# Use a command like
+# for m in /usr/share/man/man5/sane-*
+# do man -E ascii -P cat -l $m 2>/dev/null | grep -q -i firmware && echo $m
+# done
+# to find backend man pages which mention "firmware".
+# In version 1.0.19 the following man pages mention "firmware":
+# sane-agfafocus: mentiones only "firmware revision" (no firmware upload)
+# sane-apple: mentiones only "firmware revision" (no firmware upload)
+# sane-artec: mentiones only "problems with firmware v1.92" (no firmware upload)
+# sane-artec_eplus48u: "you need a firmware file for your scanner" (unconditioned firmware upload)
+# sane-bh: mentiones only "requires RSC firmware level 1.5" (no firmware upload)
+# sane-epjitsu: "these scanners require a firmware file" (unconditioned firmware upload)
+# sane-gt68xx: "you need a firmware file for your scanner" (unconditioned firmware upload)
+# sane-hp: mentiones only "no firmware support for contrast" (no firmware upload)
+# sane-matsushita: mentiones only "scanner with proper firmware" (no firmware upload)
+# sane-microtek2: mentiones only "firmware of the scanner provides" (no firmware upload)
+# sane-sharp: mentiones only "bug in the firmware" (no firmware upload)
+# sane-snapscan: "USB scanners ... scanners that need a firmware upload" (conditioned firmware upload)
+# sane-st400: mentiones only "firmware revision" (no firmware upload)
+# sane-teco2: mentiones only "firmware 1.09" (no firmware upload)
+# As far as we know all scanners which use
+# the backend gt68xx and the related backend artec_eplus48u
+# or the backend sane-epjitsu require a firmware upload,
# see "man sane-gt68xx" and http://www.meier-geinitz.de/sane/gt68xx-backend/
-# and see "man sane-artec_eplus48u":
-for b in gt68xx artec_eplus48u
+# and see "man sane-artec_eplus48u" and "man sane-epjitsu"
+#
+for b in gt68xx artec_eplus48u epjitsu
do sed -i -e 's/^:model.*$/&\n:firmware "required"/' %{buildroot}%{_datadir}/sane/descriptions/$b.desc
done
# As far as we know (almost) all USB scanners (but not the SCSI scanners)
@@ -285,21 +336,50 @@
sed -i -e 's/^:interface "USB".*$/&\n:firmware "required"/' %{buildroot}%{_datadir}/sane/descriptions/snapscan.desc
# Only the "SnapScan 1236u" needs no firmware upload (see Suse/Novell bug #73960):
sed -i -e '/:model "SnapScan 1236u"/,/:firmware "required"/s/required//' %{buildroot}%{_datadir}/sane/descriptions/snapscan.desc
-# Install the USB usermap file (list of USB manufacturer and model IDs)
-# and the matching hotplug script under /usr/share/sane because we do not actually use it
-# because we use our udev/HAL/hal-resmgr machinery to grant USB access for normal users:
-install -m644 tools/hotplug/libsane.usermap %{buildroot}%{_datadir}/sane/
-install -m755 tools/hotplug/libusbscanner %{buildroot}%{_datadir}/sane/
-# Have sane-dev still available in case of backward compatibility problems:
-install -m755 %{SOURCE100} %{buildroot}%{_datadir}/sane/
-# Install the readymade udev rules for openSUSE 10.3:
+# Since version 1.0.19 there is udev and HAL support.
+# Therefore the old/outdated hotplug stuff is dropped (was never used by openSUSE).
+# Neither tools/hotplug/libsane.usermap nor tools/hotplug/libusbscanner is installed.
+# Also the evil-hack init-script "sane-dev" is no longer provided.
+# Regarding udev:
+# Modify the generated tools/udev/libsane.rules file as follows:
+# All GROUP="scanner" are replaced by GROUP="lp" and
+# SUBSYSTEM=="usb" is added before the SUBSYSTEM=="usb_device" test
+# but the latter is kept for backward compatibility.
+# The reasons are:
+# There is no group "scanner" in /etc/group for openSUSE.
+# For all-in-one devices (i.e. printer + scanner, e.g. "EPSON Stylus" devices)
+# the group must be "lp" so that the CUPS usb backend which runs
+# as user "lp" (who is member of the group "lp") can send printing data
+# to the printer unit (i.e. the printer interface of the USB device).
+# It is sufficiently secure and reasonable easy to use by default
+# the same group "lp" for printers and scanners because both kind of devices
+# usually require physical user access (to get the printed paper or
+# to place a paper on the scanner) so that both kind of devices
+# should usually require the same kind of security.
+# Regarding SUBSYSTEM=="usb" see the Novell/Suse Bugzilla bug
+# https://bugzilla.novell.com/show_bug.cgi?id=294161#c11
+sed -i -e 's/GROUP="scanner"/GROUP="lp"/' tools/udev/libsane.rules
+sed -i -e '/^SUBSYSTEM=="usb_device", GOTO="libsane_rules_begin"$/iSUBSYSTEM=="usb", GOTO="libsane_rules_begin"' tools/udev/libsane.rules
+# Install the udev rules file:
install -d %{buildroot}%{_sysconfdir}/udev/rules.d
-install -m644 %{SOURCE107} %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules
-# Run the script which outputs a global HAL fdi file for scanners which are known to SANE
-# and install its output as /etc/hal/fdi/policy/10osvendor/70-scanner.fdi:
-bash %{SOURCE108} %{SOURCE107} >70-scanner.fdi
+install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules
+# Regarding HAL:
+# Modify the generated tools/hal/libsane.fdi file as follows:
+# Add a generic entry for SCSI scanners.
+# Replace 'key="info.bus" string="usb"' by 'key="info.bus" string="usb_device"',
+# and replace 'key="usb.vendor_id"' by 'key="usb_device.vendor_id"',
+# and replace 'key="usb.product_id"' by 'key="usb_device.product_id"',
+# see the Novell/Suse Bugzilla bug
+# https://bugzilla.novell.com/show_bug.cgi?id=250659
+# Remove 'key="scanner.access_method"' lines.
+sed -i -e '/<device>/a<match key="info.category" string="scsi_generic">\n <match key="@info.parent:scsi.type" string="scanner">\n <append key="info.capabilities" type="strlist">scanner<\/append>\n <\/match>\n<\/match>' tools/hal/libsane.fdi
+sed -i -e '/key="info.bus"/s/string="usb"/string="usb_device"/' tools/hal/libsane.fdi
+sed -i -e 's/key="usb.vendor_id"/key="usb_device.vendor_id"/' tools/hal/libsane.fdi
+sed -i -e 's/key="usb.product_id"/key="usb_device.product_id"/' tools/hal/libsane.fdi
+sed -i -e '/key="scanner.access_method"/d' tools/hal/libsane.fdi
+# Install the HAL fdi file:
install -d %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor
-install -m644 70-scanner.fdi %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor/70-scanner.fdi
+install -m644 tools/hal/libsane.fdi %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor/70-scanner.fdi
# xinetd stuff:
install -d -m755 %{buildroot}%{_sysconfdir}/xinetd.d/
install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/xinetd.d/
@@ -350,14 +430,67 @@
%doc %{_mandir}/man8/saned.8.gz
%changelog
+* Thu Feb 28 2008 jsmeix@suse.de
+- Updated to sane-backends version 1.0.19:
+ New backends:
+ cardscan (Corex Cardscan 800c), epjitsu (Epson-based Fujitsu),
+ epson2 (various Epson scanners), hp3900 (HP ScanJet 3970 and
+ more), hp5590 (HP ScanJet 5590 and more), hpljm1005 (HP LaserJet
+ M1005 and more), hs2p (Ricoh IS400 series)
+ Updated backends:
+ abaton, agfafocus, apple, artec, artec_eplus48u, as6e, avision,
+ canon, coolscan, coolscan2, dc25, dell1600n_net, dll, epson,
+ fujitsu, genesys, gt68xx, hp3500, ibm, lexmark, microtek,
+ microtek2, mustek, nec, net, pie, pint, pixma, plustek,
+ plustek_pp, ricoh, s9036, sm3600, sm3840, snapscan, sp15c,
+ st400, tamarack, teco2, test, u12, umax, umax1220u, umax_pp
+ Plus:
+ Scanimage detects more chipsets.
+ Internal scsi, usb, tcp and udp code updates.
+ Basic HAL .fdi creation support
+ Build system updates.
+ Updated translations.
+ Documentation updates.
+ Bugfixes.
+ Note:
+ This will be (hopefully) the last release of the SANE 1.0 series.
+ The next release will be extended (in a backwards compatible
+ fashion) to support more features of modern scanners.
+- sane-backends-1.0.16-nb.patch (did locale rename: no -> nb)
+ is obsolete since version 1.0.19 because it uses already 'nb'.
+- in fix-buffer-overflow.patch the overflows in backend/epson.c
+ backend/as6e.c and sanei/sanei_ab306.c are obsolete because
+ they are fixed in the source (only backend/niash.c is left).
+- replace-HZ-by-sysconf_SC_CLK_TCK.patch is obsolete because
+ it is fixed in the source.
+- fujitsu-disable-hw_ink_remain.patch is obsolete because
+ it is fixed in the source.
+- in fix-uninitialized-variables.patch the fix regarding
+ teco2.c is obsolete because it is fixed in the source
+ but a new fix regarding avision.c was added.
+- fix-ambiguous-post-pre-increment.patch is obsolete because
+ it is fixed in the source.
+- module-build.diff is dropped because there is no reason to build
+ driver modules as libtool modules and furthermore it makes our
+ package incompatible with the rest of the SANE world.
+- Since version 1.0.19 there is udev and HAL support.
+ Therefore the old/outdated hotplug stuff (libsane.usermap
+ and libusbscanner) is dropped (it was never used by openSUSE).
+ Also the evil-hack init-script "sane-dev" is no longer provided.
+ libsane.rules.CVS-2007-07-29.using-lp is obsolete because
+ the udev rules file 55-libsane.rules is directly derived
+ from tools/udev/libsane.rules.
+ create_hal_global_fdi_from_libsane.rules is obsolete because
+ the HAL fdi file 70-scanner.fdi is directly derived
+ from tools/hal/libsane.fdi.
* Thu Jan 31 2008 adrian@suse.de
-- call create_hal_global_fdi_for_scanners via bash. We can not rely
- on source file permissions
+- Call create_hal_global_fdi_from_libsane.rules via bash.
+ We can not rely on source file permissions
* Tue Aug 14 2007 jsmeix@suse.de
- Replaced create_hal_global_fdi_for_scanners by
create_hal_global_fdi_from_libsane.rules which creates the
global HAL 70-scanner.fdi file during build-time from the
- libsane.rules file (see Novell/Suse Bugzilla bug 298878).
+ libsane.rules file (see Novell/Suse Bugzilla bnc#298878).
* Fri Aug 10 2007 jsmeix@suse.de
- Removed hpoj.desc completely to avoid confusion with its
successor hpaio.desc because since openSUSE 10.3 the package
@@ -370,19 +503,19 @@
derived from what sane-desc in sane-backends 1.0.18-cvs creates.
* Wed Jun 13 2007 jsmeix@suse.de
- Adapted create_hal_global_fdi_for_scanners according to the
- currently newest changes in HAL (see Suse Bugzilla bug 250659).
+ currently newest changes in HAL (see Suse Bugzilla bnc#250659).
* Wed Jun 06 2007 dmueller@suse.de
-- Build modules as libtool modules.
+- module-build.diff builds driver modules as libtool modules.
* Sat Apr 21 2007 aj@suse.de
- Use texlive.
* Wed Feb 21 2007 jsmeix@suse.de
- Added a fix for an "array subscript is above array bounds"
error in niash.c to fix-buffer-overflow.patch
- (see Suse Bugzilla bug 246654).
+ (see Suse Bugzilla bnc#246654).
* Wed Jan 31 2007 jsmeix@suse.de
- Added a fix for an "array subscript is above array bounds"
error in sanei_ab306.c to fix-buffer-overflow.patch
- (see Suse Bugzilla bug 239953).
+ (see Suse Bugzilla bnc#239953).
* Mon Jan 29 2007 jsmeix@suse.de
- Renamed the package from 'sane' (which is only used by Suse)
to 'sane-backends' which is used by the rest of the world
@@ -401,17 +534,17 @@
to fix-buffer-overflow.patch.
- Replaced the complicated postinstall script by calling
create_hal_global_fdi_for_scanners which should obsolete
- sane-dev (see Suse Bugzilla bug 160899).
+ sane-dev (see Suse Bugzilla bnc#160899).
- Moved sane-dev from {_initrddir} to {_datadir}/sane/ to have it
still available in case of backward compatibility problems.
* Sun Oct 22 2006 meissner@suse.de
- buildrequires libgphoto2-devel.
* Mon Sep 18 2006 jsmeix@suse.de
- fix-uninitialized-variables.patch fixes an uninitialized
- variable in teco2.c (see Suse Bugzilla bug 205451).
+ variable in teco2.c (see Suse Bugzilla bnc#205451).
- create_hal_global_fdi_for_scanners can be called by HAL or YaST
to create a global HAL fdi file for scanners which are known
- by the current SANE version (see Suse Bugzilla bug 160899).
+ by the current SANE version (see Suse Bugzilla bnc#160899).
* Mon Sep 11 2006 jsmeix@suse.de
- disable-resmgr-support.patch disables the resmgr support in SANE
which is no longer needed in SANE because resmgr works now
@@ -419,13 +552,13 @@
* Mon Sep 04 2006 jsmeix@suse.de
- Replaced the fix from Thu Aug 31 in fujitsu.c by a new fix
fujitsu-disable-hw_ink_remain.patch which disables hw_ink_remain
- which causes a buffer overflow (see Suse Bugzilla bug 202243).
+ which causes a buffer overflow (see Suse Bugzilla bnc#202243).
* Thu Aug 31 2006 jsmeix@suse.de
- Added a fix of a too small char array in fujitsu.c to
- fix-buffer-overflow.patch (see Suse Bugzilla bug 202243).
+ fix-buffer-overflow.patch (see Suse Bugzilla bnc#202243).
* Fri Jul 21 2006 jsmeix@suse.de
- canon-backend-autoprobing.patch lets the "canon" backend
- do scanner auto-recognition (see Suse Bugzilla bug 177492).
+ do scanner auto-recognition (see Suse Bugzilla bnc#177492).
* Tue Jul 04 2006 jsmeix@suse.de
- Updated to sane-backends version 1.0.18:
New backends: dell1600n_net, hp3500, pixma, stv680.
@@ -449,7 +582,7 @@
* Mon Mar 13 2006 jsmeix@suse.de
- Added automagic but safe pos-install script which tries
to update resmgr permissions for scanners for an update
- from Suse Linux 10.0 to 10.1 (see Suse Bugzilla bug 157055).
+ from Suse Linux 10.0 to 10.1 (see Suse Bugzilla bnc#157055).
* Fri Jan 27 2006 jsmeix@suse.de
- Current epkowa.desc from the current iscan package.
- Current hpaio.desc made from the current hplip package.
@@ -538,7 +671,7 @@
- Changed "sane" runlevel script which sets permissions in /dev/
and renamed it to "sane-dev" to avoid confusion with the
SANE network daemon "saned" and its service name "sane-port"
- respectively "sane" (see SUSE bugzilla bug 41233).
+ respectively "sane" (see SUSE bugzilla bnc#41233).
* Mon Nov 08 2004 jsmeix@suse.de
- new sane-backends version 1.0.15
- sane-frontends stuff is moved to the new package sane-frontends
@@ -547,14 +680,14 @@
* Mon Sep 20 2004 jsmeix@suse.de
- Added a test in /etc/init.d/sane whether slpd is really
running before "/etc/init.d/slpd reload" is done.
- (SUSE bugzilla bug 42032).
+ (SUSE bugzilla bnc#42032).
* Wed Sep 15 2004 jsmeix@suse.de
- Added sane-backends-1.0.14-epson_d8.patch which fixes the
problem with EPSON D8 function level scanners that have
- a transparency unit (SUSE bugzilla bug 45075).
+ a transparency unit (SUSE bugzilla bnc#45075).
- Changed the file name of /etc/xinetd.d/sane.xinetd to
/etc/xinetd.d/sane-port because xinetd ignores files
- with names containing a dot (SUSE bugzilla bug 45313).
+ with names containing a dot (SUSE bugzilla bnc#45313).
* Fri Aug 13 2004 jsmeix@suse.de
- Changed "sane" to "sane-port" in sane.xinetd see bug 41233
* Thu Jul 15 2004 jsmeix@suse.de
@@ -580,14 +713,14 @@
- Removed sane-descriptions-external-epkowa.desc.dif and
disabled all entries in all descriptions-external/*.desc files
because none of the external backends is included in the sane
- package (see bugzilla bug #37169) and for details see
+ package (see bugzilla bnc#37169) and for details see
.../doc/packages/sane/sane-backends/sane-backends-external.html
* Thu Mar 25 2004 jsmeix@suse.de
- Patch sane-descriptions-external-epkowa.desc.dif
disables those entries in descriptions-external/epkowa.desc
which are also in descriptions/epson.desc
because we want to prefer the open source backend "epson"
- (see bugzilla bug #36584).
+ (see bugzilla bnc#36584).
* Tue Mar 23 2004 meissner@suse.de
- gimp plugins are now in ../2.0/...
* Mon Mar 22 2004 meissner@suse.de
++++++ fix-buffer-overflow.patch ++++++
--- /var/tmp/diff_new_pack.M28759/_old 2008-02-28 18:23:40.000000000 +0100
+++ /var/tmp/diff_new_pack.M28759/_new 2008-02-28 18:23:40.000000000 +0100
@@ -1,42 +1,3 @@
---- backend/epson.c.orig 2006-07-04 14:45:33.000000000 +0200
-+++ backend/epson.c 2006-07-04 14:46:27.000000000 +0200
-@@ -1331,7 +1331,7 @@ set_gamma_table (Epson_Scanner * s)
- {
- for (i = 0; i < 256; i += 16)
- {
-- char gammaValues[16 * 3 + 1], newValue[3];
-+ char gammaValues[16 * 3 + 1], newValue[4];
-
- gammaValues[0] = '\0';
-
---- backend/as6e.c.orig 2004-10-03 16:21:45.000000000 +0200
-+++ backend/as6e.c 2006-10-27 12:52:54.000000000 +0200
-@@ -811,9 +811,11 @@ check_for_driver (const char *devname)
- dir[count - offset] = path[count];
- count++;
- }
-- strncpy (fullname, dir, NAMESIZE);
-- strncat (fullname, "/", NAMESIZE);
-- strncat (fullname, devname, NAMESIZE);
-+ /* use sizeof(fullname)-1 to make sure there is at least one padded null byte */
-+ strncpy (fullname, dir, sizeof(fullname)-1);
-+ /* take into account that fullname already contains non-null bytes */
-+ strncat (fullname, "/", sizeof(fullname)-strlen(fullname)-1);
-+ strncat (fullname, devname, sizeof(fullname)-strlen(fullname)-1);
- if (!stat (fullname, &statbuf))
- {
- modes = statbuf.st_mode;
---- sanei/sanei_ab306.c.orig 2007-01-31 14:13:16.000000000 +0100
-+++ sanei/sanei_ab306.c 2007-01-31 14:38:26.000000000 +0100
-@@ -273,7 +273,7 @@ sanei_ab306_open (const char *dev, int *
- if (port[i].base == base)
- break;
-
-- if (port[i].base != base)
-+ if (i >= NELEMS(port))
- {
- DBG(1, "sanei_ab306_open: %lx is not a valid base address\n", base);
- return SANE_STATUS_INVAL;
--- backend/niash.c.orig 2006-02-04 12:34:28.000000000 +0100
+++ backend/niash.c 2007-02-21 15:38:12.000000000 +0100
@@ -89,7 +89,9 @@ typedef enum
++++++ fix-uninitialized-variables.patch ++++++
--- /var/tmp/diff_new_pack.M28759/_old 2008-02-28 18:23:40.000000000 +0100
+++ /var/tmp/diff_new_pack.M28759/_new 2008-02-28 18:23:40.000000000 +0100
@@ -1,11 +1,14 @@
---- backend/teco2.c.orig 2005-09-20 10:11:59.000000000 +0200
-+++ backend/teco2.c 2006-09-18 14:35:06.000000000 +0200
-@@ -1524,7 +1524,7 @@ teco_request_sense (Teco_Scanner * dev)
+--- backend/avision.c.orig 2008-02-09 11:42:46.000000000 +0100
++++ backend/avision.c 2008-02-27 13:35:18.000000000 +0100
+@@ -4375,8 +4375,9 @@ set_calib_data (Avision_Scanner* s, stru
+ static uint8_t*
+ sort_and_average (struct calibration_format* format, uint8_t* data)
{
- CDB cdb;
- SANE_Status status;
-- size_t size;
-+ size_t size = 0;
-
-
- MKSCSI_REQUEST_SENSE (cdb, size);
+- int stride, i, line;
+- int elements_per_line;
++ int stride = 1;
++ int i, line;
++ int elements_per_line = format->pixel_per_line * format->channels;
+
+ uint8_t *sort_data, *avg_data;
+
++++++ sane-backends-1.0.18.tar.bz2 -> sane-backends-1.0.19.tar.bz2 ++++++
++++ 193450 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org