Hello community,
here is the log from the commit of package sane
checked in at Fri Oct 27 19:04:22 CEST 2006.
--------
--- sane/sane.changes 2006-10-22 12:25:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/sane/sane.changes 2006-10-27 12:59:26.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Oct 27 11:50:40 CEST 2006 - jsmeix@suse.de
+
+- Updated hpaio.desc from the current HPLIP version 1.6.10
+- Updated epkowa.desc from the current Iscan version 2.3.0.1.
+- Added fixes of possible strncat buffer overflows and
+ strncpy unterminated string errors in as6e.c
+ 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).
+- Moved sane-dev from {_initrddir} to {_datadir}/sane/ to have it
+ still available in case of backward compatibility problems.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sane.spec ++++++
--- /var/tmp/diff_new_pack.q96rv3/_old 2006-10-27 19:03:41.000000000 +0200
+++ /var/tmp/diff_new_pack.q96rv3/_new 2006-10-27 19:03:41.000000000 +0200
@@ -12,12 +12,12 @@
Name: sane
BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel libpng net-snmp-devel pkgconfig te_ams te_latex
-License: Other License(s), see package, GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL) - all versions, Other License(s), see package
Group: Hardware/Scanner
Autoreqprov: on
Summary: SANE (Scanner Access Now Easy), the Scan Solution
Version: 1.0.18
-Release: 22
+Release: 23
URL: http://www.sane-project.org/
# URL for Source0: http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
Source0: sane-backends-%{version}.tar.bz2
@@ -39,10 +39,20 @@
# -e 's/[Ss][Ee][Rr][Ii][Ee][Ss]/series/' \
# Make seperate model entries e.g. for "LaserJet 3300 3310 3320".
# Change entries like "FooBar series 123" to "FooBar 123 series".
+# Check if models are no longer listed:
+# ( export IFS='"' ; \
+# for m in $( grep '^:model' hpaio.desc.old | grep -o '".*' ) ; \
+# do grep -q "$m" hpaio.desc || echo $m ; \
+# done )
Source104: hpaio.desc
# Original iscan descriptions-external file for the epkowa backend (provided by the package iscan).
# This file is a copy of .../doc/epkowa.desc in the sources of the iscan package
# but for compliance with the rest the manufacturer name is changed from "EPSON" to "Epson":
+# Check if models are no longer listed:
+# ( export IFS='"' ; \
+# for m in $( grep '^:model' epkowa.desc.old | grep -o '".*' ) ; \
+# do grep -q "$m" epkowa.desc || echo $m ; \
+# done )
Source105: epkowa.desc
# Script which outputs a global HAL fdi file for scanners which are known to SANE:
Source106: create_hal_global_fdi_for_scanners
@@ -274,12 +284,11 @@
# because our resmgr grants USB access by default without hotplug or usermap stuff.
install -m644 tools/hotplug/libsane.usermap %{buildroot}%{_datadir}/sane/
install -m755 tools/hotplug/libusbscanner %{buildroot}%{_datadir}/sane/
-# Install the script which outputs a global HAL fdi file for scanners which are known to SANE:
+# Install the script which outputs a global HAL fdi file for scanners which are known to SANE.
+# Calling it as postinstall script should obsolete /etc/init.d/sane-dev.
install -m755 %{SOURCE106} %{buildroot}%{_datadir}/sane/
-# sane-dev related stuff:
-install -d -m755 %{buildroot}%{_initrddir}
-install -m755 %{SOURCE100} %{buildroot}%{_initrddir}/sane-dev
-ln -sf ../..%{_initrddir}/sane-dev %{buildroot}%{_sbindir}/rcsane-dev
+# Have sane-dev still available in case of backward compatibility problems:
+install -m755 %{SOURCE100} %{buildroot}%{_datadir}/sane/
# xinetd stuff:
install -d -m755 %{buildroot}%{_sysconfdir}/xinetd.d/
install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/xinetd.d/
@@ -289,83 +298,14 @@
%post
/sbin/ldconfig
-# try to update resmgr permissions for scanners
-# in particular for an update from 10.0 to 10.1 (see Suse Bugzilla bug #157055)
-# but do not depend on any hal packages because SANE can work without HAL:
-# exit silently if any new HAL config file(s) for resmgr already exists:
-ls /etc/hal/fdi/policy/10osvendor/*-scanner.fdi &>/dev/null && exit 0
-# the HAL fdi file (see Suse Bugzilla bug #142859)
-# triggers resmgr only during booting or when the scanner is plugged into USB
-# to get resmgr permissions without reboot or the need to re-plug the scanner
-# resmgr is called directly (see Suse Bugzilla bug #153705):
-# determine the connected USB scanners and exit silently if not possible
-test -x /usr/bin/sane-find-scanner || exit 0
-# set up a time-bomb background process to avoid that sane-find-scanner may not return
-( sleep 3 ; killall -9 sane-find-scanner &>/dev/null ) &
-# only USB scaners are found because an output line must contain 'libusb':
-SCANNERS="$( /usr/bin/sane-find-scanner -q \
- | sed -n -e 's/^.*vendor=0x\([0-9A-Fa-f]*\).*product=0x\([0-9A-Fa-f]*\).*libusb:\([0-9]*:[0-9]*\)/\1,\2;\3/p' )"
-# try to do the resmgr calls and exit silently if not possible:
-test -x /sbin/resmgr || exit 0
-for SCANNER in $( echo "$SCANNERS" )
-do # make fallback IDS for the HAL fdi file (used below):
- ID="${SCANNER%%%%;*}"
- IDS="$IDS $ID"
- # get the USB devices for the resmgr call:
- DEVICE="${SCANNER##*;}"
- BUSNUMBER="${DEVICE%%%%:*}"
- DEVICENUMBER="${DEVICE##*:}"
- if test -n "$BUSNUMBER" -a -n "$DEVICENUMBER"
- then # call resmgr:
- /sbin/resmgr add /dev/bus/usb/$BUSNUMBER/$DEVICENUMBER scanner usb
- fi
-done
-# try to set up the HAL fdi file and exit silently if it fails
-# (do not pre-require any hal package because SANE can work without it):
-mkdir -p -m u=rwx,g=rx,o=rx /etc/hal/fdi/policy/10osvendor || exit 0
-OUT="/etc/hal/fdi/policy/10osvendor/80-scanner.fdi"
-cat /dev/null >$OUT || exit 0
-chmod u=rw,g=r,o=r $OUT || exit 0
-# write the header with a comment how to make entries manually:
-echo '<?xml version="1.0" encoding="ISO-8859-1"?>' >>$OUT
-echo '<deviceinfo version="0.2">' >>$OUT
-echo ' <device>' >>$OUT
-echo '' >>$OUT
-echo '<!-- To grant access to USB scanners create entries like:' >>$OUT
-echo ' <match key="info.category" string="usbraw">' >>$OUT
-echo ' <match key="@info.parent:usb_device.vendor_id" int="0x1a2b">' >>$OUT
-echo ' <match key="@info.parent:usb_device.product_id" int="0x3c4d">' >>$OUT
-echo ' <merge key="resmgr.class" type="string">scanner</merge>' >>$OUT
-echo ' </match>' >>$OUT
-echo ' </match>' >>$OUT
-echo ' </match>' >>$OUT
-echo '"1a2b" and "3c4d" stand for the USB device IDs' >>$OUT
-echo 'as displayed by the command /usr/sbin/lsusb -->' >>$OUT
-echo '' >>$OUT
-# if an old resmgr config file(s) exist (e.g.from 10.0), extract the USB IDs from there
-# otherwise use the fallback IDS from the connected scanners (made above):
-if ls /etc/resmgr.conf.d/*-scanner.conf &>/dev/null
-then IDS="$( cat /etc/resmgr.conf.d/*-scanner.conf \
- | sed -n -e 's/^add usb:vendor=0x\([0-9A-Fa-f]*\),product=0x\([0-9A-Fa-f]*\) scanner$/\1,\2/p' )"
-fi
-for ID in $( echo "$IDS" )
-do VENDOR="${ID%%%%,*}"
- PRODUCT="${ID##*,}"
- if test -n "$VENDOR" -a -n "$PRODUCT"
- then # write an entry:
- echo ' <match key="info.category" string="usbraw">' >>$OUT
- echo "