From 78001e4360913a5ebe0d7d2f50fd5de4183c4a0e666ca2be5d89b0a7e2782268 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 8 Apr 2008 22:50:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=16 --- fix-sanei_scsi_find_devices.patch | 12 ++++++++++++ sane-backends.changes | 8 ++++++++ sane-backends.spec | 16 ++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 fix-sanei_scsi_find_devices.patch diff --git a/fix-sanei_scsi_find_devices.patch b/fix-sanei_scsi_find_devices.patch new file mode 100644 index 0000000..a233afb --- /dev/null +++ b/fix-sanei_scsi_find_devices.patch @@ -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; diff --git a/sane-backends.changes b/sane-backends.changes index 7800968..0ffbbb5 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -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 diff --git a/sane-backends.spec b/sane-backends.spec index 8df7daa..a3717a0 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -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 %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