From 6bcfd61e739029dedbbd3a260f752687118a2039ba828e62aa2b57ecda94203d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 11 Mar 2008 17:03:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=13 --- sane-backends.changes | 8 ++++++++ sane-backends.spec | 37 +++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/sane-backends.changes b/sane-backends.changes index eec35f9..97056e8 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 11 15:30:25 CET 2008 - jsmeix@suse.de + +- Replaced "scanner" by "SCSIviaUSBscanner" in info.capabilities + in 70-scanner.fdi to explicitely mark those special USB scanners + which do not use libusb but an unusual SCSI protocol which is a + derivative of usb storage (see Novell/Suse Bugzilla bnc#341565). + ------------------------------------------------------------------- Thu Feb 28 13:56:15 CET 2008 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index 99481bd..637623b 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: 1 +Release: 8 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 @@ -137,14 +137,14 @@ Authors: 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 Frederik Ramm - Fred Odendaal - Gerard Klaver + Fred Odendaal + Gerard Klaver Gerhard Jaeger Giuseppe Sacco Glenn Ramsey @@ -365,18 +365,34 @@ install -d %{buildroot}%{_sysconfdir}/udev/rules.d 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. +# Add a generic entry for SCSI scanners: +sed -i -e '//a\n \n scanner<\/append>\n <\/match>\n<\/match>' tools/hal/libsane.fdi # 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 '//a\n \n 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 +# Remove 'key="scanner.access_method"' lines. sed -i -e '/key="scanner.access_method"/d' tools/hal/libsane.fdi +# There is a small number of USB scanners which are not talked to via libusb. +# They talk an unusual protocol which is a derivative of usb storage. +# User space should treat them as SCSI scanners. +# Furthermore, granting access via libusb here could oops the kernel. +# Therefore USB user access for those scanners must be disabled. +# See the Novell/Suse Bugzilla bug +# https://bugzilla.novell.com/show_bug.cgi?id=341565 +# This is done by replacing the append of "scanner" to info.capabilities by "SCSIviaUSBscanner". +# This way the YaST scanner module can inspect 70-scanner.fdi to learn which models +# it must not add to 80-scanner.fdi (i.e. the explicitely marked as "SCSIviaUSBscanner" models). +# Currently there are no hexadecimal numbers in libsane.fdi with uppercase letters +# nevertheless to be safe the GNU sed extension to ignore case for pattern matching is used: +sed -i -e '/usb_device.vendor_id.*0x04ce/I,/append key/{/usb_device.product_id.*0x0300/I,/append key/s/scanner/SCSIviaUSBscanner/g}' tools/hal/libsane.fdi +for ID in 0094 0099 009a 00a0 00a3 80a3 80ac 00b6 +do sed -i -e "/usb_device.vendor_id.*0x05da/I,/append key/{/usb_device.product_id.*0x$ID/I,/append key/s/scanner/SCSIviaUSBscanner/g}" tools/hal/libsane.fdi +done # Install the HAL fdi file: install -d %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor install -m644 tools/hal/libsane.fdi %{buildroot}%{_sysconfdir}/hal/fdi/policy/10osvendor/70-scanner.fdi @@ -430,6 +446,11 @@ exit 0 %doc %{_mandir}/man8/saned.8.gz %changelog +* Tue Mar 11 2008 jsmeix@suse.de +- Replaced "scanner" by "SCSIviaUSBscanner" in info.capabilities + in 70-scanner.fdi to explicitely mark those special USB scanners + which do not use libusb but an unusual SCSI protocol which is a + derivative of usb storage (see Novell/Suse Bugzilla bnc#341565). * Thu Feb 28 2008 jsmeix@suse.de - Updated to sane-backends version 1.0.19: New backends: