1
0
forked from pool/sane-backends
OBS User unknown 2008-04-08 22:50:23 +00:00 committed by Git OBS Bridge
parent 9ed44ce271
commit 78001e4360
3 changed files with 34 additions and 2 deletions

View File

@ -0,0 +1,12 @@
--- sanei/sanei_scsi.c.orig 2007-11-16 19:37:07.000000000 +0100
+++ sanei/sanei_scsi.c 2008-04-08 15:45:05.000000000 +0200
@@ -2882,8 +2882,7 @@ issue (struct req *req)
channel, id, lun)
&& ((*attach) (dev_name) != SANE_STATUS_GOOD))
{
- fclose (proc_fp);
- return;
+ DBG(1,"sanei_scsi_find_devices: bad attach\n");
}
}
vendor[0] = model[0] = type[0] = 0;

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Apr 8 15:49:51 CEST 2008 - jsmeix@suse.de
- fix-sanei_scsi_find_devices.patch lets sanei_scsi_find_devices
continue on to look at subsequent devices if the attach callback
returns anything other than SANE_STATUS_GOOD
(see Novell/Suse Bugzilla bnc#350688).
-------------------------------------------------------------------
Tue Mar 18 15:58:45 CET 2008 - jsmeix@suse.de

View File

@ -18,7 +18,7 @@ Group: Hardware/Scanner
AutoReqProv: on
Summary: SANE (Scanner Access Now Easy) Scanner Drivers
Version: 1.0.19
Release: 15
Release: 24
Url: http://www.sane-project.org/
# URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
Source0: sane-backends-%{version}.tar.bz2
@ -83,6 +83,9 @@ Patch2: fix-buffer-overflow.patch
Patch5: fix-uninitialized-variables.patch
# Patch6 fixes an ambiguous post/pre increment in canon-sane.c:
# Patch6 is obsolete since sane-backends-1.0.19 because it is fixed in the source.
# Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices
# if the attach callback returns anything other than SANE_STATUS_GOOD:
Patch7: fix-sanei_scsi_find_devices.patch
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
Patch100: canon-backend-autoprobing.patch
@ -227,6 +230,7 @@ Authors:
Wittawat Yamwong <wittawat@web.de>
%package autoconfig
License: GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware
Group: Hardware/Scanner
Summary: USB Scanner Autoconfiguration
Requires: sane-backends
@ -275,6 +279,9 @@ Authors:
%patch2
# Patch5 fixes uninitialized variables in avision.c:
%patch5
# Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices
# if the attach callback returns anything other than SANE_STATUS_GOOD:
%patch7
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
%patch100
@ -533,6 +540,11 @@ exit 0
%{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules
%changelog
* Tue Apr 08 2008 jsmeix@suse.de
- fix-sanei_scsi_find_devices.patch lets sanei_scsi_find_devices
continue on to look at subsequent devices if the attach callback
returns anything other than SANE_STATUS_GOOD
(see Novell/Suse Bugzilla bnc#350688).
* Tue Mar 18 2008 jsmeix@suse.de
- Added "Supplements: sane-backends" to sane-backends-autoconfig
sub-package.
@ -873,7 +885,7 @@ exit 0
- use $HOSTNAME instead of $LOCALHOST in slp reg file
* Fri Nov 14 2003 adrian@suse.de
- use correct keyword "X-UnitedLinux-Should-Start" in runlevel script
* Thu Nov 13 2003 adrian@suse.de
* Fri Nov 14 2003 adrian@suse.de
- add xinetd file for sane daemon
- let slpd check for running saned via (x)inetd
- notify slpd, if using saned init script