[yast-commit] r45551 - in /trunk/scanner: VERSION package/yast2-scanner.changes src/Scanner.ycp tools/create_scanner_database tools/test_and_set_scanner_access_permissions

Author: jsmeix Date: Tue Mar 18 14:47:02 2008 New Revision: 45551 URL: http://svn.opensuse.org/viewcvs/yast?rev=45551&view=rev Log: - V 2.16.0 - Removed the RPM test for "sane-backends" from create_scanner_database because all what matters in this script is whether or not the description files exist. Furthermore the YaST scanner module tests during startup if "sane-backends" is installed (and installs it if not). - Skipped "SCSI via USB" scanners in test_and_set_scanner_access_permissions (see Novell/Suse Bugzilla bnc#341565). - Added more explanatory text for the proprietary iscan driver on x86_64 (see Novell/Suse Bugzilla bnc#337816). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/tools/create_scanner_database trunk/scanner/tools/test_and_set_scanner_access_permissions Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=45551&r1=45550&r2=45551&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Tue Mar 18 14:47:02 2008 @@ -1 +1 @@ -2.15.5 +2.16.0 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=45551&r1=45550&r2=45551&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Tue Mar 18 14:47:02 2008 @@ -1,7 +1,23 @@ ------------------------------------------------------------------- +Tue Mar 18 12:48:38 CET 2008 - jsmeix@suse.de + +- V 2.16.0 +- Removed the RPM test for "sane-backends" from + create_scanner_database because all what matters in this script + is whether or not the description files exist. + Furthermore the YaST scanner module tests during startup + if "sane-backends" is installed (and installs it if not). +- Skipped "SCSI via USB" scanners in + test_and_set_scanner_access_permissions + (see Novell/Suse Bugzilla bnc#341565). +- Added more explanatory text for the proprietary iscan driver + on x86_64 (see Novell/Suse Bugzilla bnc#337816). + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz -- added 'StartupNotify=true' to the desktop file (bnc #304964) +- Added 'StartupNotify=true' to the desktop file + (see Novell/Suse Bugzilla bnc#304964). ------------------------------------------------------------------- Thu Jul 19 15:50:54 CEST 2007 - jsmeix@suse.de @@ -15,7 +31,7 @@ - V 2.15.4 - Mentioned in the help text that USB devices which are no scanners might be detected as a USB scanner - (see Suse Bugzilla bug 260991). + (see Novell/Suse Bugzilla bnc#260991). ------------------------------------------------------------------- Thu Jun 21 15:12:27 CEST 2007 - jsmeix@suse.de @@ -29,16 +45,17 @@ - V 2.15.2 - Adapted test_and_set_scanner_access_permissions according to the - currently newest changes in HAL (see Suse Bugzilla bug 250659) + currently newest changes in HAL (see Novell Bugzilla bnc#250659) and added a test to make sure that the USB verdor and product IDs - do not contain only zeroes (see Suse Bugzilla bug 283132). + do not contain only zeroes (see Novell/Suse Bugzilla bnc#283132). - Adapted setup_hplip_scanner_service to be prepared for HPLIP version 2.x (but be backward compatible). ------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz -- removed outdated translations from .desktop-files (#271209) +- Removed outdated translations from .desktop-files + (see Novell/Suse Bugzilla bnc#271209). ------------------------------------------------------------------- Tue Apr 17 14:33:29 CEST 2007 - jsmeix@suse.de @@ -63,7 +80,7 @@ - Fixed test_and_set_scanner_access_permissions to search only in field 2 of the lsscsi output if it is SCSI type "scanner" and to search only in field 3 if it is manufactuer "HP" or "EPSON" - (see Suse Bugzilla bug 223875). + (see Novell/Suse Bugzilla bnc#223875). ------------------------------------------------------------------- Mon Nov 20 11:21:55 CET 2006 - jsmeix@suse.de @@ -127,7 +144,7 @@ and SetScsiScannerAccessPermissions() functions by a simpler test_and_set_scanner_access_permissions script and call this script from a simple SetScannerAccessPermissions() function - (for background info see Suse Bugzilla bug 160899). + (for background info see Novell/Suse Bugzilla bnc#160899). - Added user information regarding outdated hpoj driver. - Fixed possible tmp races in some scripts (only $TMP_DATA was created using mktemp but not $TMP_DATA.raw). @@ -138,7 +155,7 @@ - V 2.14.3 - Disable showing Progress from SuSEFirewall::Read call and SuSEFirewall::Write call to follow "a YaST style" - (see Suse Bugzilla #202351). + (see Novell/Suse Bugzilla bnc#202351). ------------------------------------------------------------------- Fri Aug 18 14:45:47 CEST 2006 - jsmeix@suse.de @@ -175,7 +192,7 @@ because otherwise it is early aborted for some scanners which need a long time to warm up the lamp. - Test also for "hpfax" in DependantPrintQueueExists() function - (see Suse Bugzilla #184824). + (see Novell/Suse Bugzilla bnc#184824). - Fixed SetScsiScannerAccessPermissions(): First enable sane-dev then (re)start it. @@ -198,7 +215,8 @@ - V 2.13.14 - Removed the user information to re-plug an USB scanner which was added in V 2.13.13, instead added a resmgr call - to allow normal user access (see Suse Bugzilla #153705). + to allow normal user access + (see Novell/Suse Bugzilla bnc#153705). ------------------------------------------------------------------- Mon Feb 27 16:36:26 CET 2006 - jsmeix@suse.de @@ -206,7 +224,7 @@ - V 2.13.13 - Add a uers information to re-plug an USB scanner to trigger the udev -> HAL -> resmgr chain to allow normal user access - (see Suse Bugzilla #153705). + (see Novell/Suse Bugzilla bnc#153705). ------------------------------------------------------------------- Mon Feb 20 10:13:07 CET 2006 - jsmeix@suse.de @@ -235,7 +253,7 @@ used from the natively built "iscan-free" package. - Changed "Firewall not running or would not be started." text to "Firewall is not or should not be running." - (see Suse Bugzilla #145522). + (see Novell/Suse Bugzilla bnc#145522). ------------------------------------------------------------------- Wed Jan 25 12:15:16 CET 2006 - jsmeix@suse.de @@ -272,7 +290,7 @@ - V 2.13.5 - Changed SetUsbScannerAccessPermissions() to write /etc/hal/fdi/policy/10osvendor/80-scanner.fdi - (see Suse Bugzilla #142859). + (see Novell/Suse Bugzilla bnc#142859). ------------------------------------------------------------------- Fri Dec 2 09:51:37 CET 2005 - jsmeix@suse.de @@ -312,7 +330,8 @@ Ignore whether or not an autodetected USB scanner can be recognized also as active scanner. I.e. simply grant access to all autodetected USB scanners - (comment dated 2005-08-26 03:00 MST in bug 100695). + (comment dated 2005-08-26 03:00 MST + in Novell/Suse Bugzilla bnc#100695). ------------------------------------------------------------------- Thu Aug 25 09:59:16 CEST 2005 - jsmeix@suse.de @@ -320,7 +339,8 @@ - V 2.12.15 - Change the method how USB scanner access is set up for resmgr from a generic method (using a fixed entry) to a model-specific - method using USB vendor and product IDs (bug 100695). + method using USB vendor and product IDs + (see Novell/Suse Bugzilla bnc#100695). ------------------------------------------------------------------- Thu Aug 18 15:50:50 CEST 2005 - jsmeix@suse.de Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=45551&r1=45550&r2=45551&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Tue Mar 18 14:47:02 2008 @@ -23,6 +23,7 @@ import "Label"; import "Service"; import "SuSEFirewall"; +import "Arch"; /** * Something was committed to the system? @@ -325,15 +326,29 @@ // Message of a Report::Error // Do not change or translate "iscan", it is a package name. // Do not change or translate "i386", it is an architecture name. - // Do not change or translate "x86_64", it is an architecture name. - // Do not change or translate "AMD", it is a manufacturer name. _("The package iscan should be installed but it contains proprietary binary-only i386-only software. -Therefore it is only available for i386-compatible architectures -and it may cause problems on AMD 64-bit (x86_64) systems. +Therefore it is only available for i386-compatible architectures. Some scanners are also supported by another driver. If you really want to install iscan, you must do it manually. "); + string iscan_64bit_message = + // Do not change or translate "iscan", it is a package name. + // Do not change or translate "x86_64", it is an architecture name. + // Do not change or translate "AMD", it is a manufacturer name. + // Do not change or translate "scanimage", it is a program name. + // Do not change or translate "xscanimage", it is a program name. + // Do not change or translate "xsane", it is a program name. + // Do not change or translate "kooka", it is a program name. +_("Iscan is only available as 32-bit software. +On AMD 64-bit (x86_64) systems the scanner driver in the iscan package +works only if also the scanning user frontend is 32-bit software. +You can use the special frontend /usr/bin/iscan for Epson scanners +which is included in the iscan package. +If you like to use a standard frontend like scanimage, xscanimage, xsane, or kooka, +you must explicitely install the 32-bit package version +(i.e. get the package from the right media or repository). +"); if( Package::Installed( package_name ) ) { return true; } @@ -355,6 +370,9 @@ // Finally on x86_64 the 32-bit iscan software cannot be used with the usual scanning frontends. // Therefore there is only a message and the user must do the installation manually. y2milestone( "No automated installation of proprietary iscan." ); + if( Arch::x86_64() ) + { iscan_message = iscan_message + "\n" + iscan_64bit_message; + } Report::Error( iscan_message ); return false; } Modified: trunk/scanner/tools/create_scanner_database URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/create_scanner_database?rev=45551&r1=45550&r2=45551&view=diff ============================================================================== --- trunk/scanner/tools/create_scanner_database (original) +++ trunk/scanner/tools/create_scanner_database Tue Mar 18 14:47:02 2008 @@ -30,7 +30,6 @@ # At least the SANE description files must exist: PACKAGE="sane-backends" DESCRIPTION_FILES="/usr/share/sane/descriptions/*.desc" -rpm -q $PACKAGE &>/dev/null || { echo "Error: Required package $PACKAGE is not installed." 1>&2 ; exit 2 ; } ls $DESCRIPTION_FILES &>/dev/null || { echo "Error: Required SANE description files $DESCRIPTION_FILES not found." 1>&2 ; exit 3 ; } # Write the package which is processed: echo ":package \"$PACKAGE\"" >>$TMP_DATA Modified: trunk/scanner/tools/test_and_set_scanner_access_permissions URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/test_and_set_scanner_access_permissions?rev=45551&r1=45550&r2=45551&view=diff ============================================================================== --- trunk/scanner/tools/test_and_set_scanner_access_permissions (original) +++ trunk/scanner/tools/test_and_set_scanner_access_permissions Tue Mar 18 14:47:02 2008 @@ -112,57 +112,73 @@ then # It is a USB scanner: # Determine the USB vendor and product IDs: BUS_DEVICE=$( echo $LINE | cut -d ':' -s -f 2- ) - VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | grep -o 'ID [0-9A-Fa-f]*:[0-9A-Fa-f]*' | cut -b 4- ) + VENDOR_PRODUCT=$( lsusb -s $BUS_DEVICE | tr '[:upper:]' '[:lower:]' | grep -o 'id [0-9a-f]*:[0-9a-f]*' | cut -b 4- ) VENDOR=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 1 ) PRODUCT=$( echo $VENDOR_PRODUCT | cut -d ':' -s -f 2 ) - # Make sure that both VENDOR and PRODUCT do not contain only zeroes: - if echo $VENDOR | grep -q [1-9A-Fa-f] && echo $PRODUCT | grep -q [1-9A-Fa-f] - then # Test if this scanner is not already listed in the global HAL file: - if ! grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\"" - then # Write an entry to the local HAL file: - echo ' <match key="info.bus" string="usb_device">' >>$HAL_LOCAL_FILE - echo " " >>$HAL_LOCAL_FILE - echo " " >>$HAL_LOCAL_FILE - echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo '' >>$HAL_LOCAL_FILE - fi - fi + # Skip scanners where VENDOR or PRODUCT contains only zeroes: + echo $VENDOR | grep -q [1-9a-f] || continue + echo $PRODUCT | grep -q [1-9a-f] || continue + # Skip scanners which are already listed in the global HAL file: + grep -i -A 1 "usb_device.vendor_id\" int=\"0x$VENDOR\"" $HAL_GLOBAL_FILE | grep -q -i "usb_device.product_id\" int=\"0x$PRODUCT\"" && continue + # Skip "SCSI via USB" scanners: + # 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 not be enabled. + # See the Novell/Suse Bugzilla bug + # https://bugzilla.novell.com/show_bug.cgi?id=341565 + [ "04ce:0300" = "$VENDOR_PRODUCT" ] && continue + [ "05da:0094" = "$VENDOR_PRODUCT" ] && continue + [ "05da:0099" = "$VENDOR_PRODUCT" ] && continue + [ "05da:009a" = "$VENDOR_PRODUCT" ] && continue + [ "05da:00a0" = "$VENDOR_PRODUCT" ] && continue + [ "05da:00a3" = "$VENDOR_PRODUCT" ] && continue + [ "05da:80a3" = "$VENDOR_PRODUCT" ] && continue + [ "05da:80ac" = "$VENDOR_PRODUCT" ] && continue + [ "05da:00b6" = "$VENDOR_PRODUCT" ] && continue + # Write an entry to the local HAL file: + echo ' <match key="info.bus" string="usb_device">' >>$HAL_LOCAL_FILE + echo " " >>$HAL_LOCAL_FILE + echo " " >>$HAL_LOCAL_FILE + echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo '' >>$HAL_LOCAL_FILE fi if echo $LINE | grep -q '^/dev/sg[0-9][0-9]*$' then # It is a SCSI scanner: - # Test if this scanner does not show up as "scanner". - # There are two know manufacturers where this happens: "HP" and "EPSON". - # Some (all?) of their SCSI scanners show up as as "processor" + LSSCSI_LINE=$( lsscsi -g | grep $LINE ) + # Skip scanners which show up as SCSI type "scanner" because those + # match to the generic SCSI entry in the global HAL file. + echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner' && continue + # There are two know manufacturers where SCSI scanners do not show up as "scanner": + # "HP" and "EPSON": Some (all?) of their SCSI scanners show up as as "processor" # (because those devices do not support the SCSI scanner protocol # but only some kind of generic SCSI protocol): - LSSCSI_LINE=$( lsscsi -g | grep $LINE ) - if ! echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f2 | grep -q -i 'scanner' - then # Test for the particular manufacturer: - if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'HP' - then # Write a HP entry to the local HAL file: - echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE - echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE - echo ' <match key="@info.parent:scsi.vendor" string="HP">' >>$HAL_LOCAL_FILE - echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo '' >>$HAL_LOCAL_FILE - fi - if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'EPSON' - then # Write an EPSON entry to the local HAL file: - echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE - echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE - echo ' <match key="@info.parent:scsi.vendor" string="EPSON">' >>$HAL_LOCAL_FILE - echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo ' </match>' >>$HAL_LOCAL_FILE - echo '' >>$HAL_LOCAL_FILE - fi + # Test for the particular manufacturer: + if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'HP' + then # Write a HP entry to the local HAL file: + echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE + echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE + echo ' <match key="@info.parent:scsi.vendor" string="HP">' >>$HAL_LOCAL_FILE + echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo '' >>$HAL_LOCAL_FILE + fi + if echo $LSSCSI_LINE | tr -s ' ' | cut -d ' ' -f3 | grep -q -i 'EPSON' + then # Write an EPSON entry to the local HAL file: + echo ' <match key="info.category" string="scsi_generic">' >>$HAL_LOCAL_FILE + echo ' <match key="@info.parent:scsi.type" string="processor">' >>$HAL_LOCAL_FILE + echo ' <match key="@info.parent:scsi.vendor" string="EPSON">' >>$HAL_LOCAL_FILE + echo ' <append key="info.capabilities" type="strlist">scanner</append>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo ' </match>' >>$HAL_LOCAL_FILE + echo '' >>$HAL_LOCAL_FILE fi fi done -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org