commit sane-backends for openSUSE:Factory

2020-09-25 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2020-09-25 16:21:35

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new.4249 (New)


Package is "sane-backends"

Fri Sep 25 16:21:35 2020 rev:90 rq:836293 version:1.0.31

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2020-08-23 09:21:09.186684246 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new.4249/sane-backends.changes
2020-09-25 16:21:56.515380758 +0200
@@ -1,0 +2,70 @@
+Wed Sep 23 11:56:03 CEST 2020 - jsm...@suse.de
+
+- Upgraded to sane-backends version 1.0.31
+  Changes since 1.0.30
+  see https://gitlab.com/sane-project/backends/-/blob/master/NEWS
+  Backends
+  * adds the canon_lide70 backend
+  * avision: adds support for the KODAK i1120,
+fixes thread cancellation issues,
+disables exposure option for non-filmscanners
+  * canon_dr: improves error reporting
+  * dmc: fixes compiler warnings on the scan area options
+  * epsonds: rewrites the network I/O following changes
+made to the epson2 backend in 1.0.30 to fix security issues.
+Network support is still unsupported.
+  * escl: adds ADF support, fixes many minor issues and improves
+error handling. Now also supports devices behind a proxy
+(needs explicit configuration).
+  * fujitsu: adds support for the fi-800R and a card scanning
+slot, fixes a bug when reading hardware sensors on the first
+invocation. Adds USB IDs for fi-7800 and fi-7900.
+  * genesys: adds support for the Canon 5600F, Canon LiDE 90,
+Plustek OpticFilm 7200 and 7200 (v2), 7400, 7600i, 8100
+and 8200i. Fixes several issues with the Canon 8600F.
+Adds 4800dpi support for the Canon LiDE 210 and fixes 3200dpi
+flatbed support on the Canon 8400F. Adds an option to fill
+dark calibration with a constant. Adds transparency support
+for gl847 chipset based devices. Fixes CIS scanner support
+for gl842 chipset based devices. Removes lineart and image
+enhancement emulation support.
+  * gphoto: supports the PLANon DocuPen RC800 (with a recent
+enough version of gphoto2)
+  * gt68xx: modifies scan cancellation behaviour
+  * hp5400: adds button support, fixes a scan cancellation
+crash issue
+  * pixma: add supports for the i-SENSYS MF440 Series and untested
+support for the PIXMMA G7000 Series and GM4000 Series as well
+as the i-SENSYS MF720 Series.
+  * plustek: fixes a potential buffer overrun
+  * test: adds gamma options
+  Documentation
+  * removes the SANE Standard. This is now maintained
+as a separate project at
+https://gitlab.com/sane-project/standard
+HTML and PDF versions can be found at
+https://sane-project.gitlab.io/standard/
+  * adds and updates information for multiple supported and
+unsupported devices
+  * translation updates for British English, French, German,
+Italian and Ukranian
+  * scanimage: documents the JPEG compression level
+  * minor improvements documenting build requirements
+  Build
+  * removes the --with-api-spec option from configure
+  * replaces the --enable-avahi option with an --with-avahi
+that defaults to enabling if possible. If the option is given
+and the required support is not available, configure will
+exit with an error.
+  * improves checking for libjpeg version dependent requirements
+  * has been made reproducable (upstream issue 228)
+  * fixes build issues on MinGW
+  Miscellaneous
+  * various fixes and improvements in the USB record/replay support
+  * fixes a file descriptor validation test in sanei_pio
+  * adds missing include in sanei_usb
+- sane-backends.builttime.patch is no longer needed because the
+  issue https://gitlab.com/sane-project/backends/-/issues/228
+  is fixed in the upstream sources
+
+---

Old:

  sane-backends-1.0.30.tar.gz
  sane-backends.builttime.patch

New:

  sane-backends-1.0.31.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.vWETQY/_old  2020-09-25 16:21:57.971382047 +0200
+++ /var/tmp/diff_new_pack.vWETQY/_new  2020-09-25 16:21:57.975382050 +0200
@@ -16,8 +16,11 @@
 #
 
 
-# Enable support for PWG eSCL network backend
+# Cf. https://rpm.org/user_doc/conditional_builds.html
+# by default enable support for PWG eSCL network backend
 %bcond_without escl
+# by default disable support for PWG eSCL network backend
+#bcond_with escl
 
 Name:   sane-backends
 BuildRequires:  gcc-c++
@@ -30,9 +33,13 @@
 %if %{with escl}
 BuildRequires:  pkgconfig(avahi-client) >= 0.6.24
 BuildRequires:  pkgconfig(libcurl)

commit sane-backends for openSUSE:Factory

2020-08-23 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2020-08-23 09:21:04

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new.3399 (New)


Package is "sane-backends"

Sun Aug 23 09:21:04 2020 rev:89 rq:828255 version:1.0.30

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2020-02-29 21:18:20.614052245 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new.3399/sane-backends.changes
2020-08-23 09:21:09.186684246 +0200
@@ -1,0 +2,19 @@
+Tue Aug 18 15:15:05 UTC 2020 - Stefan Brüns 
+
+- Update to 1.0.30:
+  * epson2: fixes CVE-2020-12867 (GHSL-2020-075) and several memory
+management issues found while addressing that CVE
+  * epsonds: addresses out-of-bound memory access issues to fix
+CVE-2020-12862 (GHSL-2020-082) and CVE-2020-12863 (GHSL-2020-083),
+addresses a buffer overflow fixing CVE-2020-12865 (GHSL-2020-084)
+and disables network autodiscovery to mitigate CVE-2020-12866
+(GHSL-2020-079), CVE-2020-12861 (GHSL-2020-080) and CVE-2020-12864
+(GHSL-2020-081).  Note that this backend does not support network
+scanners to begin with.
+  * magicolor: fixes a floating point exception and uninitialized data
+read
+  * fixes an overflow in sanei_tcp_read()
+- Move saned to a separate package
+- Cleanup spec file, remove some obsolete mangling of udev rules
+
+---

Old:

  sane-backends-1.0.29.tar.gz

New:

  sane-backends-1.0.30.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.47IAc5/_old  2020-08-23 09:21:09.998684696 +0200
+++ /var/tmp/diff_new_pack.47IAc5/_new  2020-08-23 09:21:10.002684699 +0200
@@ -24,7 +24,6 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
-# Cf. the comment about 'libusb' at .configure below:
 BuildRequires:  libv4l-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkgconfig
@@ -44,7 +43,7 @@
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 License:GPL-2.0-or-later AND SUSE-GPL-2.0+-with-sane-exception AND 
SUSE-Public-Domain
 Group:  Hardware/Scanner
-Version:1.0.29
+Version:1.0.30
 Release:0
 URL:http://www.sane-project.org/
 # Unfortunately, the first version does not build, as it does not contain a 
prebuilt configure,
@@ -52,7 +51,7 @@
 # https://gitlab.com/sane-project/backends/issues/248
 # Use the version including a semi-random hash instead, which is a dist tarball
 # Source0:
https://gitlab.com/sane-project/backends/-/archive/%%{version}/backends-%%{version}.tar.gz#/sane-backends-%%{version}.tar.gz
-Source0:
https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-1.0.29.tar.gz
+Source0:
https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-1.0.30.tar.gz
 # Source100... is SUSE specific stuff:
 # Source102 is the OpenSLP registration file for the saned:
 Source102:  sane.reg
@@ -168,6 +167,16 @@
 If you do not like automated driver activation, do not install this
 package or remove it when it is already installed.
 
+%package -n sane-saned
+Summary:Sane network server
+License:GPL-2.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain
+Group:  Hardware/Scanner
+Provides:   sane-backends:%{_sbindir}/saned
+Conflicts:  %{name} < %{version}
+
+%description -n sane-saned
+Saned allows access to locally attached scanners over the network.
+
 %prep
 %setup -q
 # Patch2 sane-backends.builttime.patch avoids build-compare noise
@@ -201,14 +210,7 @@
 export LDFLAGS="-L/%_lib $LDFLAGS"
 # Enable pthread instead of fork (used in Debian since Feb 2009 and no issues 
so far),
 # see https://bugzilla.novell.com/show_bug.cgi?id=633780
-# Enable libusb-1.0 support which is available since sane-backends 1.0.20
-# and libusb-1_0 is available at least since openSUSE 11.1.
-# On all systems, the --enable-libusb* flags (in particular 
--enable-libusb_1_0 ) are now ignored.
-# Instead, the --with-usb and --without-usb flags now control support.
-# When neither is given, USB support will be enabled if possible and disabled 
otherwise.
-# If --with-usb is requested but not possible, ./configure will fail.
-# There is no support to prefer libusb-0.1 over libusb-1.0.
-# When libusb-1.0 is not found, libusb-0.1 will be tried.
+#
 # Without converting API spec to supported output formats PostScript, PDF, HTML
 # i.e. use none of --with_api_ps --with_api_pdf --with_api_html cf. 
configure.ac
 # because 

commit sane-backends for openSUSE:Factory

2020-02-29 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2020-02-29 21:18:18

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new.26092 (New)


Package is "sane-backends"

Sat Feb 29 21:18:18 2020 rev:88 rq:778823 version:1.0.29

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2018-04-17 11:09:15.889628489 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new.26092/sane-backends.changes   
2020-02-29 21:18:20.614052245 +0100
@@ -1,0 +2,84 @@
+Thu Feb 20 20:00:43 UTC 2020 - Stefan Brüns 
+
+- Move udev rules from /etc/udev/ to /usr/udev.
+- Package libsane1 library as a separate package. This avoids
+  pulling in the backends just a application links to it.
+- Hide the backends from automatic Provides generation, as these
+  all have a libsane.so SONAME.
+
+---
+Thu Feb 20 16:34:26 UTC 2020 - Stefan Brüns 
+
+- Update to 1.0.29:
+  * Backends
++ adds an escl backend (theoretically supporting all AirPrint
+  devices with a scan unit)
++ adds support for 23 new scanner models via existing backends
++ significantly changes genesys and pixma backends
++ fixes bugs in canon_dr, fujitsu, hp3900, mustek_usb2,
+  plustek and xerox_mfp backends
++ fixes all compiler warnings on Debian 10 (#120)
++ fixes portability issues for uClibc-ng and MacOS builds
++ adds support to record and replay USB I/O traffic
++ adds timestamps to debug logs
+  * Frontends
++ fixes a 32-bit arithmetic overflow issue in scanimage
+  * Documentation
++ updates translations for British English, Catalan, German,
+  Ukrainian, Valencian
++ adds scangearmp2 external backend descriptions
++ updates hpaio and utsushi external backend descriptions
++ adds the ChangeLogs/ directory to the source tarball (#103)
+  * Build
++ additionally requires libcurl and libxml2 to build the
+  escl backend
++ requires libxml2 for USB I/O recording and replay
+  functionality
++ re-enables pthread support for backends that use its API
+  directly, irrespective of the pthread_t type (#153)
++ moves genesys and pixma backends to a directory of their own
+- Update to 1.0.28:
+  * Backends
++ adds a ricoh2 backend
++ adds support for 40+ new scanner models
++ significantly changes canon_dr, fujitsu, genesys, gt68xx,
++ hp5590 and, pixma backends
++ fixes bugs in as6e, avision, mustek and plustek backends
++ fixes scores of compiler warnings
+  * Frontends
++ adds, changes and removes options for saned (see man 8 saned
+  for details)
+  - adds: -l (listen), -D (daemonize), -o (once),
+-e (stderr), -u (user)
+  - removes: -s (syslog). Use -a -d level -o -f for the
+old behavior
+  - changes: -d (debug). Use -a -d level -o -f -e for the
+old behavior
++ saned now cancels scans if the data connections appears to
+  have gone away (after 4 seconds by default, configurable in
+  saned.conf)
++ adds --output-file option to scanimage
++ adds --help option to scan-find-scanner
++ changes sane-desc to create relative hyperlinks
+  * Documentation
++ adds translations for Catalan, Hebrew and Valencian
++ updates translations for British English, Dutch, German and
++ Ukrainian
++ marks unmaintained backends as such
++ documents USB workaround in sane-usb manual page
+  * Build
++ requires a C++11 compatible compiler for the genesys backend
++ requires a JPEG library when building the pixma backend
++ fixes unneeded linking when not using preloadable backend
+  support
++ disables pthread support for systems with non-integral
+  pthread_t type
++ normalizes trailing whitespace in source code files. If you
+  have local patches that no longer apply, have a look at the
+  whitespace ignoring options of patch and git apply.
+- Rebased patches:
+  * sane-backends.builttime.patch
+- Dropped patches:
+  * no-descriptions-external-hpoj.patch
+
+---

Old:

  no-descriptions-external-hpoj.patch
  sane-backends-1.0.27.tar.gz

New:

  sane-backends-1.0.29.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.IAMhP2/_old  2020-02-29 21:18:21.674051737 +0100
+++ /var/tmp/diff_new_pack.IAMhP2/_new  2020-02-29 21:18:21.678051736 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # 

commit sane-backends for openSUSE:Factory

2018-04-17 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2018-04-17 11:09:15

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Tue Apr 17 11:09:15 2018 rev:87 rq:595948 version:1.0.27

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2018-03-24 16:11:01.304924175 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2018-04-17 11:09:15.889628489 +0200
@@ -1,0 +2,7 @@
+Thu Apr 12 12:02:07 CEST 2018 - jsm...@suse.de
+
+- Replaced the non-working saned@.service with the simpler kind
+  according to the second template in "man saned" of the therein
+  described "systemd configuration for saned" (boo#1074054).
+
+---



Other differences:
--
++ saned@.service ++
--- /var/tmp/diff_new_pack.42z8U3/_old  2018-04-17 11:09:16.657592686 +0200
+++ /var/tmp/diff_new_pack.42z8U3/_new  2018-04-17 11:09:16.657592686 +0200
@@ -1,18 +1,15 @@
+
 [Unit]
 Description=Scanner Service
 Requires=saned.socket
 
 [Service]
 ExecStart=/usr/sbin/saned
-User=saned
-Group=saned
-StandardInput=null
-StandardOutput=syslog
-StandardError=syslog
-Environment=SANE_CONFIG_DIR=@CONFIGDIR@
-# If you need to debug your configuration uncomment the next line and
-# change it as appropriate to set the desired debug options
-# Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_NET=255
+User=root
+Group=root
+StandardInput=socket
+Environment=SANE_CONFIG_DIR=/etc/sane.d
 
 [Install]
 Also=saned.socket
+




commit sane-backends for openSUSE:Factory

2018-03-24 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2018-03-24 16:11:00

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Sat Mar 24 16:11:00 2018 rev:86 rq:589780 version:1.0.27

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2017-11-01 11:07:53.069617106 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2018-03-24 16:11:01.304924175 +0100
@@ -1,0 +2,12 @@
+Wed Mar 21 16:29:29 CET 2018 - jsm...@suse.de
+
+- Drop BuildRequires for libieee1284-devel and libieee1284
+  which is only needed for some parallel port scanners
+  but parallel port scanners are no longer supported
+  so that the backends canon_pp, hpsj5s, and mustek_pp
+  are no longer provided.
+- Fixed installation of systemd unit files saned@.service
+  and saned.socket that enable socket based saned activation
+  which replaces xinetd (boo#1074054).
+
+---
@@ -9 +21,3 @@
-- Deleted xinetd service in favor of socked based activation
+- Deleted xinetd service in favor of socket based activation
+  via systemd unit files saned@.service and saned.socket
+  see https://build.opensuse.org/request/show/504186



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.Pyhkfc/_old  2018-03-24 16:11:02.492881351 +0100
+++ /var/tmp/diff_new_pack.Pyhkfc/_new  2018-03-24 16:11:02.500881063 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,11 +17,6 @@
 
 
 Name:   sane-backends
-%if 0%{?suse_version} > 1130
-BuildRequires:  libieee1284-devel
-%else
-BuildRequires:  libieee1284
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
@@ -33,10 +28,10 @@
 BuildRequires:  pkg-config
 %systemd_requires
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
-# There is no 1.0.26 release of sane-backends. That number was skipped so that 
the SANE upstream
-# development version numbers would more clearly be an extension of the prior 
release:
 License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
 Group:  Hardware/Scanner
+# There is no 1.0.26 release of sane-backends. That number was skipped so that 
the SANE upstream
+# development version numbers would more clearly be an extension of the prior 
release:
 Version:1.0.27
 Release:0
 Url:http://www.sane-project.org/
@@ -71,7 +66,7 @@
 # to extract the needed info from which create_sane-backends-autoconfig.rules
 # generates the 56-sane-backends-autoconfig.rules file:
 Source201:  create_sane-backends-autoconfig.rules
-# Sources 202 and 203 are files to enable socked based service activation 
which replaced xinetd
+# Sources 202 and 203 are files to enable socket based service activation 
which replaced xinetd
 Source202:  saned@.service
 Source203:  saned.socket
 # Patch2 sane-backends.builttime.patch avoids build-compare noise
@@ -420,9 +415,14 @@
 sed -i -e '/^# Epson Perfection 2450 /i# Any SCSI processor EPSON 
SCANNER...\nKERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", 
ATTRS{model}=="SCANNER*", MODE="0664", GROUP="lp", ENV{libsane_matched}="yes"' 
tools/udev/libsane.rules
 # Install the udev rules file:
 install -m644 tools/udev/libsane.rules 
%{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules
-# Service files
-install -d -m644 %{buildroot}%{_unitdir}/saned@.service
-install -d -m644 %{buildroot}%{_unitdir}/saned.socket
+# Service files:
+# Sources 202 and 203 are files to enable socket based service activation 
which replaced xinetd
+# Source202 is saned@.service and Source203 is saned.socket
+# see https://bugzilla.opensuse.org/show_bug.cgi?id=1074054#c5
+# and https://bugzilla.opensuse.org/attachment.cgi?id=760460
+install -d -m755 %{buildroot}%{_unitdir}
+install -m644 %{SOURCE202} %{buildroot}%{_unitdir}
+install -m644 %{SOURCE203} %{buildroot}%{_unitdir}
 # OpenSLP registration stuff:
 install -d -m755 %{buildroot}%{_sysconfdir}/slp.reg.d
 install -m644 %{SOURCE102} %{buildroot}%{_sysconfdir}/slp.reg.d
@@ -433,6 +433,18 @@
 %find_lang sane-backends
 
 %pre
+if [ $1 = 2 ] ; then
+# In case of an upgrade the erroneously created as directories 
saned.socket and saned@.service
+# must be removed, 

commit sane-backends for openSUSE:Factory

2017-11-01 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2017-11-01 11:07:52

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Wed Nov  1 11:07:52 2017 rev:85 rq:537490 version:1.0.27

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2017-06-23 09:17:17.655511335 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2017-11-01 11:07:53.069617106 +0100
@@ -1,0 +2,5 @@
+Sun Oct 29 10:14:52 UTC 2017 - meiss...@suse.com
+
+- add a 32bit devel package for use in wine32 bit builds
+
+---



Other differences:
--
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.qpmtlk/_old  2017-11-01 11:07:53.957584669 +0100
+++ /var/tmp/diff_new_pack.qpmtlk/_new  2017-11-01 11:07:53.957584669 +0100
@@ -1 +1,2 @@
 sane-backends
+sane-backends-devel




commit sane-backends for openSUSE:Factory

2017-06-23 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2017-06-23 09:17:10

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Fri Jun 23 09:17:10 2017 rev:84 rq:504312 version:1.0.27

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2017-06-07 09:53:02.314904032 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2017-06-23 09:17:17.655511335 +0200
@@ -1,0 +2,5 @@
+Fri Jun 16 11:42:37 UTC 2017 - nmou...@suse.com
+
+- Deleted xinetd service in favor of socked based activation
+
+---

Old:

  sane-port

New:

  saned.socket
  saned@.service



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.2tzvbJ/_old  2017-06-23 09:17:18.783351971 +0200
+++ /var/tmp/diff_new_pack.2tzvbJ/_new  2017-06-23 09:17:18.783351971 +0200
@@ -31,11 +31,12 @@
 BuildRequires:  libv4l-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkg-config
+%systemd_requires
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
-License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
-Group:  Hardware/Scanner
 # There is no 1.0.26 release of sane-backends. That number was skipped so that 
the SANE upstream
 # development version numbers would more clearly be an extension of the prior 
release:
+License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
+Group:  Hardware/Scanner
 Version:1.0.27
 Release:0
 Url:http://www.sane-project.org/
@@ -50,8 +51,6 @@
 # md5sum -c sane-backends-1.0.27.tar.gz.md5
 Source0:
https://alioth.debian.org/frs/download.php/file/4224/sane-backends-%{version}.tar.gz
 # Source100... is SUSE specific stuff:
-# Source101 is the xinetd file for the saned:
-Source101:  sane-port
 # Source102 is the OpenSLP registration file for the saned:
 Source102:  sane.reg
 # Source110 creates our hpaio.desc file directly from the models.dat file of 
HPLIP:
@@ -72,6 +71,9 @@
 # to extract the needed info from which create_sane-backends-autoconfig.rules
 # generates the 56-sane-backends-autoconfig.rules file:
 Source201:  create_sane-backends-autoconfig.rules
+# Sources 202 and 203 are files to enable socked based service activation 
which replaced xinetd
+Source202:  saned@.service
+Source203:  saned.socket
 # Patch2 sane-backends.builttime.patch avoids build-compare noise
 Patch2: sane-backends.builttime.patch
 # Patch100... is SUSE specific stuff:
@@ -418,9 +420,9 @@
 sed -i -e '/^# Epson Perfection 2450 /i# Any SCSI processor EPSON 
SCANNER...\nKERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", 
ATTRS{model}=="SCANNER*", MODE="0664", GROUP="lp", ENV{libsane_matched}="yes"' 
tools/udev/libsane.rules
 # Install the udev rules file:
 install -m644 tools/udev/libsane.rules 
%{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules
-# xinetd stuff:
-install -d -m755 %{buildroot}%{_sysconfdir}/xinetd.d/
-install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/xinetd.d/
+# Service files
+install -d -m644 %{buildroot}%{_unitdir}/saned@.service
+install -d -m644 %{buildroot}%{_unitdir}/saned.socket
 # OpenSLP registration stuff:
 install -d -m755 %{buildroot}%{_sysconfdir}/slp.reg.d
 install -m644 %{SOURCE102} %{buildroot}%{_sysconfdir}/slp.reg.d
@@ -430,13 +432,19 @@
 # 
https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25find_lang
 %find_lang sane-backends
 
+%pre
+%service_add_pre saned.socket
+
 %post
 /sbin/ldconfig
-exit 0
+%service_add_post saned.socket
+
+%preun
+%service_del_preun saned.socket
 
 %postun
 /sbin/ldconfig
-exit 0
+%service_del_postun saned.socket
 
 %files -f sane-backends.lang
 %defattr(-,root,root)
@@ -444,7 +452,6 @@
 %config(noreplace) %{_sysconfdir}/sane.d/*.conf
 %dir %{_sysconfdir}/slp.reg.d
 %config(noreplace) %{_sysconfdir}/slp.reg.d/*
-%config(noreplace) %{_sysconfdir}/xinetd.d/sane-port
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
 %{_sysconfdir}/udev/rules.d/55-libsane.rules
@@ -456,6 +463,8 @@
 %{_datadir}/sane/
 %{_libdir}/libsane.so.*
 %{_libdir}/sane/
+%{_unitdir}/saned@.service
+%{_unitdir}/saned.socket
 #dir /var/lock/sane
 %doc %{_defaultdocdir}/sane-backends/
 %doc %{_mandir}/man1/scanimage.1.gz

++ saned.socket ++
[Unit]
Description=saned incoming socket

[Socket]
ListenStream=6566
Accept=yes
MaxConnections=1

[Install]
WantedBy=sockets.target
++ saned@.service ++
[Unit]
Description=Scanner Service
Requires=saned.socket

[Service]

commit sane-backends for openSUSE:Factory

2017-06-07 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2017-06-07 09:52:46

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Wed Jun  7 09:52:46 2017 rev:83 rq:500054 version:1.0.27

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2017-03-03 17:32:13.397513465 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2017-06-07 09:53:02.314904032 +0200
@@ -1,0 +2,35 @@
+Wed May 24 10:02:33 CEST 2017 - jsm...@suse.de
+
+- Upgraded to sane-backends version 1.0.27:
+  There is no 1.0.26 release of sane-backends.
+  That number was skipped so that the SANE upstream
+  development version numbers would more clearly be
+  an extension of the prior release.
+  Changes since 1.0.25:
+  * Significant enhancements to canon_dr, epjitsu, epsonds,
+fujitsu, genesys, hp3500, pixma and xerox-mfp backends.
+  * Minor updates, bugfixes or scanners added in several backends.
+  * 30+ new scanner models supported.
+  * Made libusb-1.0 the default for USB support.
+  * Switched code from C90 to C99 (Thanks to Volker Diels-Grabsch).
+  * Updated Linux USB3 workaround:
+The Linux USB3 workaround which was added in version 1.0.25
+is now disabled by default. If you have difficulty using
+a scanner which previously worked, or intermittent scanner
+availability, try setting the new environment variable
+SANE_USB_WORKAROUND=1
+before starting your frontend.
+  * Documentation and translation updates.
+  * Bugfixes (Avahi, threading, USB, ICC/PNG/JPEG, etc).
+  * Reduced compiler warnings, improved code:
+A special thanks goes to Olaf Meeuwissen for picking up
+the janitorial duties in sane-backends. He has found and
+fixed a large number of long-standing bugs, curated the
+SANE upstream bug tracker, improved the build scripts
+and docs, and provided user support.
+- CVE-2017-6318.patch is no longer needed because
+  the issue is fixed in the upstream sources.
+- dell1600n_net-fix-strncat.patch is no longer needed because
+  the issue is fixed in the upstream sources.
+
+---

Old:

  CVE-2017-6318.patch
  dell1600n_net-fix-strncat.patch
  sane-backends-1.0.25.tar.gz

New:

  sane-backends-1.0.27.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.qamEPF/_old  2017-06-07 09:53:03.130788732 +0200
+++ /var/tmp/diff_new_pack.qamEPF/_new  2017-06-07 09:53:03.134788166 +0200
@@ -26,6 +26,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
+# Cf. the comment about 'libusb' at .configure below:
 BuildRequires:  libusb-1_0-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  net-snmp-devel
@@ -33,16 +34,21 @@
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
 Group:  Hardware/Scanner
-Version:1.0.25
+# There is no 1.0.26 release of sane-backends. That number was skipped so that 
the SANE upstream
+# development version numbers would more clearly be an extension of the prior 
release:
+Version:1.0.27
 Release:0
 Url:http://www.sane-project.org/
+# URLs to get Source0:
+# On http://www.sane-project.org/source.html at "Stable Source" there is the 
link to "alioth.debian.org"
+# that points to http://alioth.debian.org/project/showfiles.php?group_id=30186 
and there:
 # How to get Source0:
-# wget --no-check-certificate 
https://alioth.debian.org/frs/download.php/file/4146/sane-backends-1.0.25.tar.gz
+# wget --no-check-certificate 
https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
 # How to get the MD5 sum file:
-# wget --no-check-certificate 
https://alioth.debian.org/frs/download.php/file/4144/sane-backends-1.0.25.tar.gz.md5
+# wget --no-check-certificate 
https://alioth.debian.org/frs/download.php/file/4223/sane-backends-1.0.27.tar.gz.md5
 # How to check the MD5 sum:
-# md5sum -c sane-backends-1.0.25.tar.gz.md5
-Source0:
https://alioth.debian.org/frs/download.php/file/4146/sane-backends-%{version}.tar.gz
+# md5sum -c sane-backends-1.0.27.tar.gz.md5
+Source0:
https://alioth.debian.org/frs/download.php/file/4224/sane-backends-%{version}.tar.gz
 # Source100... is SUSE specific stuff:
 # Source101 is the xinetd file for the saned:
 Source101:  sane-port
@@ -66,20 +72,8 @@
 # to extract the needed info from which create_sane-backends-autoconfig.rules
 # generates the 56-sane-backends-autoconfig.rules file:
 

commit sane-backends for openSUSE:Factory

2017-03-03 Thread root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2017-03-03 17:32:12

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Fri Mar  3 17:32:12 2017 rev:82 rq:460926 version:1.0.25

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2016-01-13 22:44:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2017-03-03 17:32:13.397513465 +0100
@@ -1,0 +2,10 @@
+Tue Feb 28 12:15:12 CET 2017 - jsm...@suse.de
+
+- CVE-2017-6318.patch fixes CVE-2017-6318 which is about that via
+  access to saned some opcodes could leak uninitialized memory
+  back to the requester allowing information disclosure
+  of memory content in saned (bsc#1027197).
+  In general regarding "access to saned" see
+  https://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings
+
+---

New:

  CVE-2017-6318.patch



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.TNLpab/_old  2017-03-03 17:32:14.501357499 +0100
+++ /var/tmp/diff_new_pack.TNLpab/_new  2017-03-03 17:32:14.501357499 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -74,6 +74,12 @@
 Patch1: dell1600n_net-fix-strncat.patch
 # Patch2 sane-backends.builttime.patch avoids build-compare noise
 Patch2: sane-backends.builttime.patch
+# Patch3 CVE-2017-6318.patch fixes CVE-2017-6318 which is about that via
+# access to saned some opcodes could leak uninitialized memory back to the 
requester
+# allowing information disclosure of memory content in saned,
+# see 
https://lists.alioth.debian.org/pipermail/sane-devel/2017-February/035029.html
+# and https://bugzilla.suse.com/show_bug.cgi?id=1027197
+Patch3: CVE-2017-6318.patch
 # Patch100... is SUSE specific stuff:
 # Patch101 no-descriptions-external-hpoj.patch removes 
descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
@@ -169,7 +175,14 @@
 #   GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1)
 # see 
https://alioth.debian.org/tracker/index.php?func=detail=315198_id=30186=410366
 %patch1
+# Patch2 sane-backends.builttime.patch avoids build-compare noise
 %patch2 -p1
+# Patch3 CVE-2017-6318.patch fixes CVE-2017-6318 which is about that via
+# access to saned some opcodes could leak uninitialized memory back to the 
requester
+# allowing information disclosure of memory content in saned,
+# see 
https://lists.alioth.debian.org/pipermail/sane-devel/2017-February/035029.html
+# and https://bugzilla.suse.com/show_bug.cgi?id=1027197
+%patch3
 # Patch100... is SUSE specific stuff:
 # Patch101 no-descriptions-external-hpoj.patch removes 
descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:

++ CVE-2017-6318.patch ++
--- frontend/saned.c
+++ frontend/saned.c
@@ -1992,6 +1992,32 @@ process_request (Wire * w)
return 1;
  }
 
+/* Debian BTS #853804 */
+if (w->direction == WIRE_DECODE
+&& req.value_type == SANE_TYPE_STRING
+&& req.action == SANE_ACTION_GET_VALUE)
+  {
+if (req.value)
+  {
+/* FIXME: If req.value contained embedded NUL
+ *characters, this is wrong.
+ */
+w->allocated_memory -= (1 + strlen (req.value));
+free (req.value);
+  }
+req.value = malloc (req.value_size);
+if (!req.value)
+  {
+w->status = ENOMEM;
+DBG (DBG_ERR,
+ "process_request: (control_option) "
+ "h=%d (%s)\n", req.handle, strerror (w->status));
+return 1;
+  }
+memset (req.value, 0, req.value_size);
+w->allocated_memory += req.value_size;
+  }
+
can_authorize = 1;
 
memset (, 0, sizeof (reply)); /* avoid leaking bits */



commit sane-backends for openSUSE:Factory

2016-01-13 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2016-01-13 22:44:24

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2015-10-19 22:48:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2016-01-13 22:44:26.0 +0100
@@ -1,0 +2,11 @@
+Mon Jan 11 11:44:28 UTC 2016 - o...@aepfle.de
+
+- sane-backends.builttime.patch: reduce build-compare noise
+
+---
+Tue Dec 29 22:32:37 UTC 2015 - stefan.bru...@rwth-aachen.de
+
+- remove gphoto2 backend, as is usefulness is highly questionable,
+  but adds many (indirect) build and runtime dependencies
+
+---

New:

  sane-backends.builttime.patch



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.mVfa4D/_old  2016-01-13 22:44:27.0 +0100
+++ /var/tmp/diff_new_pack.mVfa4D/_new  2016-01-13 22:44:27.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
 
 
 Name:   sane-backends
-BuildRequires:  libgphoto2-devel
 %if 0%{?suse_version} > 1130
 BuildRequires:  libieee1284-devel
 %else
@@ -73,6 +72,8 @@
 #   GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1):
 # see 
https://alioth.debian.org/tracker/index.php?func=detail=315198_id=30186=410366
 Patch1: dell1600n_net-fix-strncat.patch
+# Patch2 sane-backends.builttime.patch avoids build-compare noise
+Patch2: sane-backends.builttime.patch
 # Patch100... is SUSE specific stuff:
 # Patch101 no-descriptions-external-hpoj.patch removes 
descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
@@ -168,6 +169,7 @@
 #   GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1)
 # see 
https://alioth.debian.org/tracker/index.php?func=detail=315198_id=30186=410366
 %patch1
+%patch2 -p1
 # Patch100... is SUSE specific stuff:
 # Patch101 no-descriptions-external-hpoj.patch removes 
descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
@@ -223,7 +225,6 @@
 --sbindir=%{_sbindir} \
 --mandir=%{_mandir} \
 --datadir=%{_datadir} \
---with-gphoto2 \
 --with-docdir=%{_defaultdocdir}/sane-backends \
 --enable-pthread \
 --enable-libusb_1_0 \

++ sane-backends.builttime.patch ++
---
 tools/sane-desc.c |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

Index: sane-backends-1.0.25/tools/sane-desc.c
===
--- sane-backends-1.0.25.orig/tools/sane-desc.c
+++ sane-backends-1.0.25/tools/sane-desc.c
@@ -2816,8 +2816,8 @@ html_print_footer (void)
  "\n"
  "http://www.sane-project.org/imprint.html\"\n;
  ">Contact\n" "\n" "\n");
-  printf ("This page was last updated on %s by sane-desc %s from %s\n",
- asctime (localtime (_time)), SANE_DESC_VERSION, 
PACKAGE_STRING);
+  printf ("This page was last updated by sane-desc %s from %s\n",
+  SANE_DESC_VERSION, PACKAGE_STRING);
   printf ("\n");
   printf (" \n");
 }
@@ -3326,10 +3326,10 @@ print_usermap_header (void)
 
   printf
 ("# This file was automatically created based on description files 
(*.desc)\n"
-"# by sane-desc %s from %s on %s"
+"# by sane-desc %s from %s"
 "#\n"
 ,
-SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (_time)));
+SANE_DESC_VERSION, PACKAGE_STRING);
 
   printf
  ("# The entries below are used to detect a USB device and change owner\n"
@@ -3398,8 +3398,8 @@ print_db_header (void)
 {
   time_t current_time = time (0);
   printf ("# This file was automatically created based on description files 
(*.desc)\n"
- "# by sane-desc %s from %s on %s",
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime 
(_time)));
+ "# by sane-desc %s from %s",
+ SANE_DESC_VERSION, PACKAGE_STRING);
   printf
 ("#\n"
  "# The entries below are used to detect a USB device when it's plugged 
in\n"
@@ -3463,8 +3463,8 @@ print_udev_header (void)

commit sane-backends for openSUSE:Factory

2015-10-19 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2015-10-19 22:47:59

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is "sane-backends"

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2015-01-22 21:48:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2015-10-19 22:48:00.0 +0200
@@ -1,0 +2,50 @@
+Tue Oct  6 10:55:10 CEST 2015 - jsm...@suse.de
+
+- Upgraded to sane-backends version 1.0.25:
+  Changes since 1.0.24:
+  * New backends: epsonds (Epson DS, PX and WF series),
+pieusb (PIE and Reflecta film/slide scanners).
+  * Support for JPG and PNG output format in scanimage.
+  * Significant enhancements to avision, canon_dr, epjitsu,
+fujitsu, genesys, kodakaio and pixma backends.
+  * Minor updates, bugfixes or scanners added in several backends.
+  * 300 new scanner models supported.
+  * Workaround for USB3 problems in Linux kernel.
+  * Added code for IR functionality.
+  * Documentation and translation updates.
+  * Bugfixes (threading, networking, udev rules).
+  A big thanks to Olaf Meeuwissen, for his efforts in bug triage,
+  patch wrangling and code cleanups.
+- fix-buffer-overflow.patch, fix-mustek_pp_ccd300.c.patch,
+  install-umax_pp-tool.patch, MG5550-works.patch are obsolete
+  since sane-backends-1.0.24 because it is fixed in the source.
+- re-add-SANE_CAP_ALWAYS_SETTABLE.patch should be longer needed
+  because there should be longer a fontend that references
+  SANE_CAP_ALWAYS_SETTABLE in its source code.
+- Recreated adapt_epkowa.desc_for_yast2-scanner.patch
+  according to the comment in sane-backends.spec
+  so that it applies for sane-backends-1.0.25.
+- Dropped avision.c.patch and avision.conf.patch
+  (cf. the entry below dated "Mon Sep 15 23:23:23 UTC 2013")
+  because it does no longer apply to sane-backends-1.0.25 sources.
+  Issues that are not specific for a particular Linux distribution
+  must be fixed directly at SANE upstream so that all Linux
+  distributions get it properly fixed and not via patches
+  at one particular Linux distribution where it falls apart
+  each time when SANE upstream changes that sources.
+- Added BuildRequires for libpng-devel and libtiff-devel because
+  scanimage output format supports PNG and TIFF.
+- dell1600n_net-fix-strncat.patch fixes the following build error:
+  Statement might be overflowing a buffer in strncat.
+  BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong
+  GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1)
+  The upstream issue report is
+  
https://alioth.debian.org/tracker/index.php?func=detail=315198_id=30186=410366
+- Disabled use of LaTeX to generate documentation because LaTeX
+  blows up the build system and "BuildRequires: texlive-latex"
+  causes various cycles and the sane.ps documentation
+  is not for users but for developers who could get
+  the "Programmer's Documentation" from SANE upstream
+  at http://www.sane-project.org/docs.html
+
+---

Old:

  MG5550-works.patch
  avision.c.patch
  avision.conf.patch
  fix-buffer-overflow.patch
  fix-mustek_pp_ccd300.c.patch
  install-umax_pp-tool.patch
  re-add-SANE_CAP_ALWAYS_SETTABLE.patch
  sane-backends-1.0.24.tar.gz

New:

  dell1600n_net-fix-strncat.patch
  sane-backends-1.0.25.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.lMXtbd/_old  2015-10-19 22:48:02.0 +0200
+++ /var/tmp/diff_new_pack.lMXtbd/_new  2015-10-19 22:48:02.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,53 +24,35 @@
 BuildRequires:  libieee1284
 %endif
 BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
 BuildRequires:  libtool
 BuildRequires:  libusb-1_0-devel
 BuildRequires:  libv4l-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkg-config
-# texlive-latex is needed to make doc/sane.ps from doc/sane.tex
-# but texlive-latex requires texlive which requires ghostscript-x11
-# but ghostscript-x11 is not needed for sane.tex -> sane.dvi -> sane.ps
-# so that the needless package ghostscript-x11 blows up the build system
-# and is explicitly excluded to be installed in the build system:
-BuildRequires:  texlive-latex
-#!BuildIgnore: 

commit sane-backends for openSUSE:Factory

2015-01-22 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2015-01-22 21:48:19

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2013-12-04 12:31:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2015-01-22 21:48:30.0 +0100
@@ -1,0 +2,5 @@
+Wed Jan 14 12:41:18 UTC 2015 - johan...@lst.de
+
+- MG5550-works.patch: support Canon Pixma MG5500
+
+---

New:

  MG5550-works.patch



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.rXF106/_old  2015-01-22 21:48:31.0 +0100
+++ /var/tmp/diff_new_pack.rXF106/_new  2015-01-22 21:48:31.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -188,6 +188,11 @@
 # 
https://alioth.debian.org/tracker/index.php?func=detailaid=314108group_id=30186atid=410366
 Patch110:   avision.conf.patch
 Patch111:   avision.c.patch
+
+# unchanged git checkin 
http://anonscm.debian.org/cgit/sane/sane-backends.git/commit/?id=54358f27e1d6cf8b537866d8034919fcbebea1f1
+# remove for upstream version 25
+Patch112:   MG5550-works.patch
+
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets 
for post/postun:
@@ -282,6 +287,7 @@
 # 
https://alioth.debian.org/tracker/index.php?func=detailaid=314108group_id=30186atid=410366
 %patch110
 %patch111
+%patch112 -p1
 # Source100... is SUSE specific stuff:
 # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
 # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is 
dropped.

++ MG5550-works.patch ++
diff -ur sane-backends-1.0.24.orig/backend/pixma_mp150.c 
sane-backends-1.0.24/backend/pixma_mp150.c
--- sane-backends-1.0.24.orig/backend/pixma_mp150.c 2013-09-18 
02:43:00.0 +0200
+++ sane-backends-1.0.24/backend/pixma_mp150.c  2015-01-11 12:45:24.644527570 
+0100
@@ -1139,6 +1139,7 @@
s-cfg-pid != MG3100_PID
s-cfg-pid != MG2100_PID
s-cfg-pid != MG5300_PID
+   s-cfg-pid != MG5500_PID
s-cfg-pid != MG6300_PID)
   reorder_pixels (mp-linebuf, sptr, c, n, m, s-param-wx, 
line_size);
   
diff -ur sane-backends-1.0.24.orig/ChangeLog sane-backends-1.0.24/ChangeLog
--- sane-backends-1.0.24.orig/ChangeLog 2013-10-01 03:23:49.0 +0200
+++ sane-backends-1.0.24/ChangeLog  2015-01-11 12:22:30.607870381 +0100
@@ -1,3 +1,7 @@
+2014-09-18 Rolf Bensch rolf at bensch hyphen online dot de
+   * backend/pixma_mp150.c, doc/descriptions/pixma.desc, 
doc/sane-pixma.man:
+ Canon Pixma MG5500 Series is working, bug #314819.
+
 **  Release of sane-backends 1.0.24. End of code freeze **
 
 2013-09-30 m. allan noah kitno455 at gmail dot com
diff -ur sane-backends-1.0.24.orig/doc/descriptions/pixma.desc 
sane-backends-1.0.24/doc/descriptions/pixma.desc
--- sane-backends-1.0.24.orig/doc/descriptions/pixma.desc   2013-10-01 
02:10:43.0 +0200
+++ sane-backends-1.0.24/doc/descriptions/pixma.desc2015-01-11 
12:32:20.834566730 +0100
@@ -127,10 +127,10 @@
 :comment Testers needed!
 
 :model PIXMA MG5500 Series
-:interface USB
+:interface USB WiFi
 :usbid 0x04a9 0x1771
-:status :untested
-:comment Testers needed!
+:status :complete
+:comment All resolutions supported (up to 1200DPI).
 
 :model PIXMA MG6100 Series
 :interface USB
diff -ur sane-backends-1.0.24.orig/doc/sane-pixma.man 
sane-backends-1.0.24/doc/sane-pixma.man
--- sane-backends-1.0.24.orig/doc/sane-pixma.man2013-10-01 
02:10:43.0 +0200
+++ sane-backends-1.0.24/doc/sane-pixma.man 2015-01-11 12:39:28.205594376 
+0100
@@ -15,7 +15,7 @@
 Currently, the following models work with this backend:
 .PP
 .RS
-PIXMA MG2100, MG3100, MG4200, MG5100, MG5200, MG5300
+PIXMA MG2100, MG3100, MG4200, MG5100, MG5200, MG5300, MG5500
 .br
 PIXMA MG6100, MG6200, MG6300, MG8200
 .br
@@ -77,7 +77,7 @@
 .RS
 PIXMA E500, E510, E600, E610
 .br
-PIXMA MG2200, MG2400, MG2500, MG3200, MG4100, MG5400, MG5500
+PIXMA MG2200, MG2400, MG2500, MG3200, 

commit sane-backends for openSUSE:Factory

2013-12-04 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2013-12-04 12:31:04

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2013-09-25 17:20:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2013-12-04 12:31:05.0 +0100
@@ -1,0 +2,27 @@
+Tue Dec  3 11:09:25 CET 2013 - jsm...@suse.de
+
+- Upgraded to sane-backends version 1.0.24:
+  Changes since 1.0.23:
+  * Significant enhancements to pixma, genesys, kodakaio,
+fujitsu, canon_dr.
+  * Minor updates, bugfixes or scanners added in several backends.
+  * Added new testsuite.
+  * 51 new scanner models supported.
+  * USB support improvements.
+  * Improved build system (mingw64, bug fixes,
+default pthread on Linux).
+  * Documentation updates.
+  * Bugfixes.
+  For Details see the ChangeLog file.
+- sane-backends-1.0.21-SCX4500W.patch that adds usb id for SCX4500W
+  is obsolete since sane-backends-1.0.24 because it is fixed
+  in the source.
+- fix-no-return-in-nonvoid-function.patch that fixes a
+  control reaches end of non-void function gcc warning
+  in kodakaio.c is obsolete since sane-backends-1.0.24
+  because it is fixed in the source.
+- Recreated adapt_epkowa.desc_for_yast2-scanner.patch
+  according to the comment in sane-backends.spec
+  so that it applies for sane-backends-1.0.24.
+
+---
@@ -4,2 +31,2 @@
-- workaround for hp scanjet 8200
-  As described in https://bugzilla.novell.com/show_bug.cgi?id=840443
+- Workaround for hp scanjet 8200: As described in
+  https://bugzilla.novell.com/show_bug.cgi?id=840443
@@ -8 +35,2 @@
-  In order circumvent this issue, following workaround has been implemented:
+  In order circumvent this issue, following workaround has been
+  implemented:
@@ -12,2 +40,4 @@
- (namely detection of NO ADF but reporting of SOME ADF type) is given.
-  Per default the new option is inactive by comment; activate at your own risk!
+ (namely detection of NO ADF but reporting of SOME ADF type)
+ is given.
+  Per default the new option is inactive by comment.
+  Activate at your own risk!
@@ -15,4 +45,3 @@
-  
https://alioth.debian.org/tracker/index.php?func=detailaid=314108group_id=30186atid=410366
-- created patch110 for avision.conf
-- created patch111 for avision.c
-- introduced patch110 and patch111 into sane-backends.spec
+  
https://alioth.debian.org/tracker/index.php?func=detailaid=314108group_id=30186atid=410366
+- created patch110 (avision.conf.patch) for avision.conf
+- created patch111 (avision.c.patch) for avision.c

Old:

  fix-no-return-in-nonvoid-function.patch
  sane-backends-1.0.21-SCX4500W.patch
  sane-backends-1.0.23.tar.gz

New:

  sane-backends-1.0.24.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.1MD6c0/_old  2013-12-04 12:31:06.0 +0100
+++ /var/tmp/diff_new_pack.1MD6c0/_new  2013-12-04 12:31:06.0 +0100
@@ -39,20 +39,16 @@
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
 Group:  Hardware/Scanner
-Version:1.0.23
+Version:1.0.24
 Release:0
 Url:http://www.sane-project.org/
-# URLs for Source0:
-# https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1
-# https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2
-# https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3
-# Get 
https://alioth.debian.org/frs/download.php/3756/sane-backends-1.0.23.tar.gz.md5
-# for the MD5 sum for sane-backends-1.0.23.tar.gz 
e226a89c54173efea80e91e9a5eb6573
-# See https://alioth.debian.org/frs/download.php/3755/README.txt
-# how to make sane-backends-1.0.23.tar.gz and how to verify it:
-# $ cat sane-backends-1.0.23.tar.gz.[1-3]  sane-backends-1.0.23.tar.gz
-# $ md5sum -c sane-backends-1.0.23.tar.gz.md5
-Source0:sane-backends-%{version}.tar.gz
+# How to get Source0:
+# wget --no-check-certificate 
https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz
+# How to get the MD5 sum file:
+# wget --no-check-certificate 
https://alioth.debian.org/frs/download.php/file/3956/sane-backends-1.0.24.tar.gz.md5
+# How to check the MD5 sum:
+# md5sum -c sane-backends-1.0.24.tar.gz.md5
+Source0:
https://alioth.debian.org/frs/download.php/file/3958/sane-backends-%{version}.tar.gz
 # Source100... is SUSE specific stuff:
 # 

commit sane-backends for openSUSE:Factory

2013-09-25 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2013-09-25 17:20:03

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2013-04-05 13:15:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2013-09-25 17:20:04.0 +0200
@@ -1,0 +2,19 @@
+Mon Sep 15 23:23:23 UTC 2013 - p...@gmx.com
+
+- workaround for hp scanjet 8200
+  As described in https://bugzilla.novell.com/show_bug.cgi?id=840443
+  when operating on a hp scanjet 8200 the avision driver gets stuck
+  in a loop trying to detect an ADF, even if none is present.
+  In order circumvent this issue, following workaround has been implemented:
+  1) create an option enforce-no-adf in the file avision.conf
+  2) patch the code in avision.c to make use of this option,
+ if the conditions that lead to the unsuccessful ADF search
+ (namely detection of NO ADF but reporting of SOME ADF type) is given.
+  Per default the new option is inactive by comment; activate at your own risk!
+  An upstream report was added to
+  
https://alioth.debian.org/tracker/index.php?func=detailaid=314108group_id=30186atid=410366
+- created patch110 for avision.conf
+- created patch111 for avision.c
+- introduced patch110 and patch111 into sane-backends.spec
+
+---

New:

  avision.c.patch
  avision.conf.patch



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.25yMmk/_old  2013-09-25 17:20:05.0 +0200
+++ /var/tmp/diff_new_pack.25yMmk/_new  2013-09-25 17:20:05.0 +0200
@@ -188,6 +188,12 @@
 # Furthermore it removes unsupported models from epkowa.desc because
 # otherwise there would be confusing model entries shown in yast2-scanner:
 Patch109:   adapt_epkowa.desc_for_yast2-scanner.patch
+#
+# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443
+# 
https://alioth.debian.org/tracker/index.php?func=detailaid=314108group_id=30186atid=410366
+Patch110:   avision.conf.patch
+Patch111:   avision.c.patch
+#
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets 
for post/postun:
@@ -284,6 +290,11 @@
 # Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for 
yast2-scanner
 # see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14
 %patch109
+#
+# hope this is the right place to insert
+%patch110
+%patch111
+#
 # Source100... is SUSE specific stuff:
 # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
 # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is 
dropped.

++ avision.c.patch ++
--- backend/avision.c.orig  2012-07-01 04:00:44.0 +0200
+++ backend/avision.c   2013-09-15 13:24:31.150933718 +0200
@@ -1273,6 +1273,12 @@
 static SANE_Bool force_a4 = SANE_FALSE;
 static SANE_Bool force_a3 = SANE_FALSE;
 
+/* 2013-09-15_PNu
+ * HP Scanjet 8200 w/o ADF fails during the ADF reset loop in 
get_accessories_info()
+ * Brute force option enforce-no-adf
+ */
+static SANE_Bool enforce_no_adf = SANE_FALSE;
+
 /* hardware resolutions to interpolate from */
 static const int  hw_res_list_c5[] =
   {
@@ -3208,6 +3214,17 @@
 
   dev-inquiry_adf |= result [0];
 
+  /* 2013-09-15_PNu
+   * HP Scanjet 8200 w/o ADF fails during the following ADF reset loop
+   */
+  if (enforce_no_adf) {
+if (result[0] == 0) {
+  result[2] = 0; /* to prevent fail of following loop */
+  DBG (3, get_accessories_info: no adf enforced!\n);
+}
+  }
+  /* /2013-09-15_PNu */
+
   if (dev-hw-feature_type2  AV_ADF_FLIPPING_DUPLEX)
   {
 if (result[0] == 1)
@@ -7637,6 +7654,14 @@
linenumber);
static_calib_list [2] = SANE_TRUE; 
  }
+ else if (strcmp (word, enforce-no-adf) == 0) {
+   /* 2013-09-15_PNu
+* Brute force option enforce-no-adf
+*/
+   DBG (3, sane_reload_devices: config file line %d: 
enforce-no-adf\n,
+   linenumber);
+   enforce_no_adf = SANE_TRUE; 
+ }
  else
DBG (1, sane_reload_devices: config file line %d: options 
unknown!\n,
linenumber);
++ avision.conf.patch ++
--- backend/avision.conf.in.orig2013-09-09 01:19:36.843243005 +0200
+++ backend/avision.conf.in 2013-09-15 

commit sane-backends for openSUSE:Factory

2013-04-05 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2013-04-05 13:15:44

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2013-03-11 10:25:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2013-04-05 13:15:46.0 +0200
@@ -1,0 +2,7 @@
+Thu Apr  4 15:52:19 UTC 2013 - meiss...@suse.com
+
+- fixed /etc/slp.reg.d/ ownership conflict, just have
+  it as %dir and the files as %config.
+  (see OBS RQ 162582 decline message)
+
+---



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.zbL5rV/_old  2013-04-05 13:15:48.0 +0200
+++ /var/tmp/diff_new_pack.zbL5rV/_new  2013-04-05 13:15:48.0 +0200
@@ -541,7 +541,8 @@
 %defattr(-,root,root)
 %dir %{_sysconfdir}/sane.d
 %config(noreplace) %{_sysconfdir}/sane.d/*.conf
-%config(noreplace) %{_sysconfdir}/slp.reg.d
+%dir %{_sysconfdir}/slp.reg.d
+%config(noreplace) %{_sysconfdir}/slp.reg.d/*
 %config(noreplace) %{_sysconfdir}/xinetd.d/sane-port
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit sane-backends for openSUSE:Factory

2013-01-24 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2013-01-24 10:40:47

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2013-01-08 21:12:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2013-01-24 10:40:49.0 +0100
@@ -1,0 +2,5 @@
+Sat Jan 19 12:53:11 UTC 2013 - lnus...@suse.de
+
+- require libv4l-devel to enable v4l backend
+
+---



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.mKzlaJ/_old  2013-01-24 10:40:51.0 +0100
+++ /var/tmp/diff_new_pack.mKzlaJ/_new  2013-01-24 10:40:51.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   sane-backends
 BuildRequires:  libgphoto2-devel
 %if 0%{?suse_version}  1130
@@ -25,6 +26,7 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtool
 BuildRequires:  libusb-1_0-devel
+BuildRequires:  libv4l-devel
 BuildRequires:  net-snmp-devel
 BuildRequires:  pkg-config
 # texlive-latex is needed to make doc/sane.ps from doc/sane.tex

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit sane-backends for openSUSE:Factory

2013-01-08 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2013-01-08 21:12:51

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2012-12-10 14:27:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2013-01-08 21:12:52.0 +0100
@@ -1,0 +2,11 @@
+Tue Dec 11 14:42:20 CET 2012 - jsm...@suse.de
+
+- Our own special source file epkowa.desc is dropped because
+  the package iscan-free is dropped (bnc#788756). Instead
+  adapt_epkowa.desc_for_yast2-scanner.patch adapts the upstream
+  epkowa.desc for yast2-scanner which works without additional
+  adaptions in yast2-scanner so that the sane-backends package
+  works on released openSUSE systems without a RPM requirement
+  for a yast2-scanner update (bnc#788756 starting at comment#14).
+
+---

Old:

  epkowa.desc

New:

  adapt_epkowa.desc_for_yast2-scanner.patch



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.G26Rel/_old  2013-01-08 21:12:53.0 +0100
+++ /var/tmp/diff_new_pack.G26Rel/_new  2013-01-08 21:12:53.0 +0100
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:   sane-backends
 BuildRequires:  libgphoto2-devel
 %if 0%{?suse_version}  1130
@@ -63,12 +62,8 @@
 # Source104 was our hpaio.desc file which was derived from 
scan/sane/hpaio.desc from the hplip sources
 # but as scan/sane/hpaio.desc was completely messed up Source104 is now 
dropped and we
 # create our hpaio.desc file directly from the models.dat file of HPLIP via 
Source109 and Source110.
-# Source105 is the original iscan descriptions-external file for the epkowa 
backend.
-# This file is based on a copy of doc/epkowa.desc in the sources of our 
iscan-free package.
-# Meanwhile there is a newer epkowa.desc in the sources of this sane-backends 
package.
-# Only the missing models from the newer epkowa.desc which require proprietary 
software
-# were added so that users of those models are informed via yast2-scanner.
-Source105:  epkowa.desc
+# Since openSUSE 12.2 Source105 epkowa.desc is dropped because the package 
iscan-free is dropped.
+# Instead adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for 
yast2-scanner.
 # Since openSUSE 10.3 Source106: create_hal_global_fdi_for_scanners is 
dropped because
 # it is replaced by Source108: create_hal_global_fdi_from_libsane.rules.
 # Source107 are readymade udev rules for openSUSE 10.3 derived from 
sane-backends 1.0.18-cvs.
@@ -180,6 +175,17 @@
 # which lets build fail with no-return-in-nonvoid-function error in 
kodakaio.c - the upstream bug report is
 # 
https://alioth.debian.org/tracker/index.php?func=detailaid=313858group_id=30186atid=410366
 Patch108:   fix-no-return-in-nonvoid-function.patch
+# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for 
yast2-scanner
+# (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14).
+# It adds requires DFSG non-free Image Scan software from Avasys to all 
comments
+# (or adds such a comment if there is not yet a comment) so that yast2-scanner
+# (via requires DFSG non-free string match in create_scanner_database)
+# shows always the info regarding Image Scan download from Avasys
+# (compare https://bugzilla.novell.com/show_bug.cgi?id=569917
+#  and https://bugzilla.novell.com/show_bug.cgi?id=746038).
+# Furthermore it removes unsupported models from epkowa.desc because
+# otherwise there would be confusing model entries shown in yast2-scanner:
+Patch109:   adapt_epkowa.desc_for_yast2-scanner.patch
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets 
for post/postun:
@@ -273,15 +279,13 @@
 # which lets build fail with no-return-in-nonvoid-function error in 
kodakaio.c - the upstream bug report is
 # 
https://alioth.debian.org/tracker/index.php?func=detailaid=313858group_id=30186atid=410366
 %patch108
+# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for 
yast2-scanner
+# see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14
+%patch109
 # Source100... is SUSE specific stuff:
 # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
 # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is 
dropped.
 rm 

commit sane-backends for openSUSE:Factory

2012-12-10 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2012-12-10 14:27:31

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2012-10-16 21:33:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2012-12-10 14:27:33.0 +0100
@@ -4 +4 @@
-- Upgraded to sane-backends version 1.0.22:
+- Upgraded to sane-backends version 1.0.23:



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.C7VGLU/_old  2012-12-10 14:27:37.0 +0100
+++ /var/tmp/diff_new_pack.C7VGLU/_new  2012-12-10 14:27:37.0 +0100
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   sane-backends
 BuildRequires:  libgphoto2-devel
 %if 0%{?suse_version}  1130

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit sane-backends for openSUSE:Factory

2012-10-16 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2012-10-16 21:33:46

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2012-08-24 13:55:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2012-10-16 21:33:48.0 +0200
@@ -1,0 +2,24 @@
+Tue Oct 16 13:47:46 CEST 2012 - jsm...@suse.de
+
+- Upgraded to sane-backends version 1.0.22:
+  New backends:
+  kvs40xx (Panasonic KV-S40xx), kodakaio (Kodak AiO ESP and Hero).
+  Significant enhancements to several backends.
+  30 new scanner models supported.
+  V4L support improvements.
+  Improvements for builds on multiple platforms.
+  Improved udev rules.
+  Updated software deskew algorithm.
+  Documentation updates.
+  Bugfixes.
+  Note:
+  This is one more release of the SANE 1.0 series, compare
+  the below entry dated Thu Feb 28 13:56:15 CET 2008.
+- sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch that
+  fixes usb device support in xerox_mfp is obsolete since
+  sane-backends-1.0.23 because it is fixed in the source.
+- fix-no-return-in-nonvoid-function.patch fixes a control reaches
+  end of non-void function gcc warning which lets build fail
+  with no-return-in-nonvoid-function error in kodakaio.c.
+
+---
@@ -32 +56,2 @@
-- re-add support for USB scanners
+- added explicit BuildRequires libusb-compat-devel to
+  re-add support for USB scanners
@@ -37,2 +62,3 @@
-- add usb id for SCX4500W
-- fix usb device handling regression in xerox_mfp (bnc#745245)
+- sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W
+- sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes
+  usb device handling regression in xerox_mfp (bnc#745245)

Old:

  sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
  sane-backends-1.0.22.tar.bz2

New:

  fix-no-return-in-nonvoid-function.patch
  sane-backends-1.0.23.tar.gz



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.zkajb3/_old  2012-10-16 21:33:50.0 +0200
+++ /var/tmp/diff_new_pack.zkajb3/_new  2012-10-16 21:33:50.0 +0200
@@ -37,12 +37,20 @@
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
 Group:  Hardware/Scanner
-Version:1.0.22
+Version:1.0.23
 Release:0
 Url:http://www.sane-project.org/
-# URL for Source0: 
https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz
-# MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): 
be586a23633949cf2ecf0c9c6d769130
-Source0:sane-backends-%{version}.tar.bz2
+# URLs for Source0:
+# https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1
+# https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2
+# https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3
+# Get 
https://alioth.debian.org/frs/download.php/3756/sane-backends-1.0.23.tar.gz.md5
+# for the MD5 sum for sane-backends-1.0.23.tar.gz 
e226a89c54173efea80e91e9a5eb6573
+# See https://alioth.debian.org/frs/download.php/3755/README.txt
+# how to make sane-backends-1.0.23.tar.gz and how to verify it:
+# $ cat sane-backends-1.0.23.tar.gz.[1-3]  sane-backends-1.0.23.tar.gz
+# $ md5sum -c sane-backends-1.0.23.tar.gz.md5
+Source0:sane-backends-%{version}.tar.gz
 # Source100... is SUSE specific stuff:
 # Source100 is the evil-hack init-script sane-dev to grant scanner access 
permissions.
 # Source100 is no longer provided because sane-backends-1.0.19 has udev and 
HAL support.
@@ -165,8 +173,12 @@
 # and is therefore removed since sane-backends-1.0.21 which contains those 
changes.
 # Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W:
 Patch106:   sane-backends-1.0.21-SCX4500W.patch
-# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb 
device support in xerox_mfp (bnc#745245):
-Patch107:   sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
+# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb 
device support in xerox_mfp (bnc#745245)
+# is obsolete since sane-backends-1.0.23 because it is fixed in the source.
+# Patch108 fix-no-return-in-nonvoid-function.patch fixes a control reaches 
end of non-void function gcc warning
+# which lets build fail with no-return-in-nonvoid-function error in 
kodakaio.c - the upstream bug report is
+# 

commit sane-backends for openSUSE:Factory

2012-08-24 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2012-08-24 13:55:27

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2012-04-23 16:13:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2012-08-24 13:55:29.0 +0200
@@ -1,0 +2,10 @@
+Thu Aug 23 09:24:52 UTC 2012 - cfarr...@suse.com
+
+- license update: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and
+  SUSE-Public-Domain
+  The LICENSE file in the sane-backends packages explains the licensing of
+  the package. Added SUSE-GPL-2.0+-with-sane-exception to the spreadsheet
+  linked from license.opensuse.org as that license is not yet upstream at
+  http://www.spdx.org/licenses (hence the SUSE- proprietary extension)
+
+---



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.8j6DiJ/_old  2012-08-24 13:55:31.0 +0200
+++ /var/tmp/diff_new_pack.8j6DiJ/_new  2012-08-24 13:55:31.0 +0200
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:   sane-backends
 BuildRequires:  libgphoto2-devel
 %if 0%{?suse_version}  1130
@@ -36,7 +35,7 @@
 BuildRequires:  texlive-latex
 #!BuildIgnore: ghostscript-x11
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
-License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
+License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
 Group:  Hardware/Scanner
 Version:1.0.22
 Release:0
@@ -186,22 +185,22 @@
 # skip-check-libtool-deps
 
 %description
-The software consists of SANE scanner drivers, scanimage, and the
-saned daemon.
-
-A SANE scanner driver is used via a SANE front-end. This package
-contains the command line front-end scanimage. There are various
-graphical front-ends like xscanimage (package sane-frontends), XSane
-(package xsane), and the KDE front-end Kooka (package
-kdegraphics3-scan).
+The software consists of SANE scanner drivers,
+scanimage, and the saned daemon.
 
-The saned daemon provides the service sane-port to access scanners
-that are connected to a server via network from client hosts that run
-the net meta driver.
+A SANE scanner driver is used via a SANE front-end.
+This package contains the command line front-end scanimage.
+There are graphical front-ends in other packages like
+XSane (package xsane), Skanlite for KDE4 (package skanlite),
+and Kooka for KDE3 (package kdegraphics3-scan).
+
+The saned daemon provides the service sane-port
+to access scanners that are connected to a server
+via network from client hosts that run the net meta driver.
 
 %package devel
 Summary:Development files for sane-backends
-License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
+License:GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and 
SUSE-Public-Domain
 Group:  Development/Libraries/C and C++
 Requires:   %{name} = %{version}
 Requires:   net-snmp-devel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit sane-backends for openSUSE:Factory

2012-04-23 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2012-04-23 16:13:07

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2012-03-22 13:36:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2012-04-23 16:13:08.0 +0200
@@ -1,0 +2,18 @@
+Fri Apr 20 12:24:49 CEST 2012 - jsm...@suse.de
+
+- Configure --enable-libusb_1_0 plus BuildRequires libusb-1_0-devel
+  to use libusb1 (instead of using libusb0 via libusb-compat),
+  see https://bugzilla.novell.com/show_bug.cgi?id=559697#c7
+  for the libusb versioning numbering.
+- Use traditional bash scriptlets for post/postun with
+  an explicite exit 0 line at the end to be fail safe
+  and therefore also PreReq: /sbin/ldconfig explicitly,
+  see the Shared_libraries section in
+  http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets
+- BuildIgnore ghostscript-x11 because BuildRequires texlive-latex
+  is needed for sane.tex - sane.dvi - sane.ps but texlive-latex
+  requires texlive which requires ghostscript-x11 but the latter
+  is not needed and blows up the build system.
+- Minor cleanups in the spec file.
+
+---



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.u3XQay/_old  2012-04-23 16:13:10.0 +0200
+++ /var/tmp/diff_new_pack.u3XQay/_new  2012-04-23 16:13:10.0 +0200
@@ -18,17 +18,23 @@
 
 Name:   sane-backends
 BuildRequires:  libgphoto2-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libtool
-BuildRequires:  libusb-compat-devel
-BuildRequires:  net-snmp-devel
-BuildRequires:  pkg-config
-BuildRequires:  texlive-latex
 %if 0%{?suse_version}  1130
 BuildRequires:  libieee1284-devel
 %else
 BuildRequires:  libieee1284
 %endif
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtool
+BuildRequires:  libusb-1_0-devel
+BuildRequires:  net-snmp-devel
+BuildRequires:  pkg-config
+# texlive-latex is needed to make doc/sane.ps from doc/sane.tex
+# but texlive-latex requires texlive which requires ghostscript-x11
+# but ghostscript-x11 is not needed for sane.tex - sane.dvi - sane.ps
+# so that the needless package ghostscript-x11 blows up the build system
+# and is explicitly excluded to be installed in the build system:
+BuildRequires:  texlive-latex
+#!BuildIgnore: ghostscript-x11
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
 Group:  Hardware/Scanner
@@ -80,7 +86,7 @@
 Source201:  create_sane-backends-autoconfig.rules
 # Patch1 does locale rename: no - nb:
 # Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'.
-# Patch2 fixes too small arrays in backend/niash.c:
+# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c:
 Patch2: fix-buffer-overflow.patch
 # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime 
value:
 # Patch3 is obsolete since sane-backends-1.0.19 because it is fixed in the 
source.
@@ -93,17 +99,17 @@
 # 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 is obsolete since sane-backends-1.0.20 because it is fixed in the 
source.
-# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously
-# removed in sane-backends-1.0.20 so that sane-frontends and xsane can no 
longer build,
-# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675
+# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds 
SANE_CAP_ALWAYS_SETTABLE to sane.h
+# which was erroneously removed in sane-backends-1.0.20 so that sane-frontends 
and xsane
+# can no longer build, see 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675
 # SANE_CAP_ALWAYS_SETTABLE is still missing in sane-backends-1.0.21
 Patch8: re-add-SANE_CAP_ALWAYS_SETTABLE.patch
 # Patch9 fix-hp3900_config.c.patch fixes a possible for loop overflow in 
hp3900_config.c
 # see https://bugzilla.novell.com/show_bug.cgi?id=517281
 # and 
https://alioth.debian.org/tracker/index.php?func=detailaid=311856group_id=30186atid=410366
 # which is obsolete since sane-backends-1.0.21 because it is fixed in the 
source.
-# Patch10 fixes undefined 'foo = ++foo modulo bar' operations in 
mustek_pp_ccd300.c
-# see https://bugzilla.novell.com/show_bug.cgi?id=498435
+# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo 
bar' operations
+# 

commit sane-backends for openSUSE:Factory

2012-03-22 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2012-03-22 13:36:54

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2012-02-10 17:19:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2012-03-22 13:36:55.0 +0100
@@ -1,0 +2,5 @@
+Tue Mar 20 15:44:31 UTC 2012 - jsl...@suse.de
+
+- re-add support for USB scanners
+
+---



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.ZprjdM/_old  2012-03-22 13:36:57.0 +0100
+++ /var/tmp/diff_new_pack.ZprjdM/_new  2012-03-22 13:36:57.0 +0100
@@ -15,22 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   sane-backends
-BuildRequires:  libgphoto2-devel libjpeg-devel libtool net-snmp-devel 
pkg-config texlive-latex
+BuildRequires:  libgphoto2-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtool
+BuildRequires:  libusb-compat-devel
+BuildRequires:  net-snmp-devel
+BuildRequires:  pkg-config
+BuildRequires:  texlive-latex
 %if 0%{?suse_version}  1130
 BuildRequires:  libieee1284-devel
 %else
 BuildRequires:  libieee1284
 %endif
+Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 License:GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
 Group:  Hardware/Scanner
-AutoReqProv:on
-Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 Version:1.0.22
-Release:3
+Release:0
 Url:http://www.sane-project.org/
 # URL for Source0: 
https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz
 # MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): 
be586a23633949cf2ecf0c9c6d769130
@@ -303,9 +306,9 @@
 This package contains the development files for sane-backends.
 
 %package autoconfig
+Summary:USB Scanner Autoconfiguration
 License:GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain
 Group:  Hardware/Scanner
-Summary:USB Scanner Autoconfiguration
 Requires:   sane-backends
 # When sane-backends is already installed, try to install also 
sane-backends-autoconfig if available:
 Supplements:sane-backends

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit sane-backends for openSUSE:Factory

2012-02-10 Thread h_root
Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory 
checked in at 2012-02-10 17:19:40

Comparing /work/SRC/openSUSE:Factory/sane-backends (Old)
 and  /work/SRC/openSUSE:Factory/.sane-backends.new (New)


Package is sane-backends, Maintainer is jsm...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes  
2011-11-21 15:50:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 
2012-02-10 17:19:44.0 +0100
@@ -1,0 +2,6 @@
+Sun Feb  5 20:18:31 UTC 2012 - lnus...@suse.de
+
+- add usb id for SCX4500W
+- fix usb device handling regression in xerox_mfp (bnc#745245)
+
+---

New:

  sane-backends-1.0.21-SCX4500W.patch
  sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch



Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.mg16AB/_old  2012-02-10 17:19:45.0 +0100
+++ /var/tmp/diff_new_pack.mg16AB/_new  2012-02-10 17:19:45.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -153,6 +153,10 @@
 # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
 Patch104:   no-descriptions-external-hpoj.patch
+# additional usb id
+Patch105:   sane-backends-1.0.21-SCX4500W.patch
+# fix usb device support in xerox_mfp (bnc#745245)
+Patch106:   sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
 # Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp 
changes
 # and is therefore removed since sane-backends-1.0.21 which contains those 
changes.
 # Install into this non-root directory (required when norootforbuild is used):
@@ -350,6 +354,8 @@
 # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
 # because it is intentionally removed from the sources in the prep section:
 %patch104
+%patch105 -p1
+%patch106 -p1
 # Source100... is SUSE specific stuff:
 # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
 # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is 
dropped.

++ sane-backends-1.0.21-SCX4500W.patch ++
From 0643804b4e76c0047df1d61ebee1adfe4696d9d4 Mon Sep 17 00:00:00 2001
From: Nils Philippsen n...@redhat.com
Date: Wed, 3 Nov 2010 17:54:24 +0100
Subject: [PATCH] patch: SCX4500W

Squashed commit of the following:

commit d3d53225c2a5ee271141bd058e628ffa66d0c065
Author: Nils Philippsen n...@redhat.com
Date:   Wed Nov 3 17:53:32 2010 +0100

add USB id for SCX-4500W
---
 doc/descriptions/xerox_mfp.desc |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index 406510f..6b8aa5f 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -48,6 +48,10 @@
 :usbid 0x04e8 0x3426
 :status :good
 
+:model SCX-4500W
+:interface USB
+:usbid 0x04e8 0x342b
+
 :model CLX-3170fn
 :interface USB
 :usbid 0x04e8 0x342a
-- 
1.7.3.2

++ sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch ++
From 9792fb4ac11443553771d4f311a985333b503594 Mon Sep 17 00:00:00 2001
From: Nils Philippsen n...@redhat.com
Date: Tue, 10 May 2011 10:22:02 +0200
Subject: [PATCH] patch: xerox_mfp-fix-usb-devices

Squashed commit of the following:

commit 962a5a657b750f99b274d58763667bd199f5cb5d
Author: Alex Belkin a...@telekom.ru
Date:   Tue Mar 8 17:57:19 2011 +0300

keep usb device by default (correct for bug introduced by tcp sub-backend
(cherry picked from commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7)
---
 backend/xerox_mfp.c |   27 +++
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
index e08b50f..d4672a7 100644
--- a/backend/xerox_mfp.c
+++ b/backend/xerox_mfp.c
@@ -37,10 +37,10 @@
 static const SANE_Device **devlist = NULL; /* sane_get_devices array */
 static struct device *devices_head = NULL; /* sane_get_devices list */
 
-transport available_transports[] = {
+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
+transport available_transports[TRANSPORTS_MAX] = {
 { usb, usb_dev_request, usb_dev_open, usb_dev_close, 
usb_configure_device },
 { tcp, tcp_dev_request, tcp_dev_open, tcp_dev_close, 
tcp_configure_device },
-{ 0 }
 };
 
 static int 

commit sane-backends for openSUSE:Factory

2011-05-02 Thread h_root

Hello community,

here is the log from the commit of package sane-backends for openSUSE:Factory
checked in at Mon May 2 13:09:10 CEST 2011.




--- sane-backends/sane-backends.changes 2011-02-20 11:43:27.0 +0100
+++ /mounts/work_src_done/STABLE/sane-backends/sane-backends.changes
2011-03-29 14:43:19.0 +0200
@@ -1,0 +2,19 @@
+Tue Mar 29 13:07:20 CEST 2011 - jsm...@suse.de
+
+- Fixed udev rules for SCSI scanners:
+  For SCSI scanners ATTRS is mandatory for every sysfs attribute
+  (in particular ATTRS{type}, ATTRS{vendor}, and ATTRS{model})
+  so that ATTRS is replaced by ATTR only for USB scanners
+  (see openSUSE/Novell Bugzilla bnc#681146).
+
+---
+Fri Mar 25 10:27:36 CET 2011 - jsm...@suse.de
+
+- Fixed udev rules for SCSI scanners:
+  Because of openSUSE/Novell Bugzilla bnc#436085
+  (see the entry below dated Tue Oct 21 13:12:42 CEST 2008)
+  SYSFS and ATTRS were replaced by ATTR everywhere in
+  libsane.rules but for SCSI scanners ATTRS{type} is mandatory
+  (see openSUSE/Novell Bugzilla bnc#681146).
+
+---

calling whatdependson for head-i586




Other differences:
--
++ sane-backends.spec ++
--- /var/tmp/diff_new_pack.5YObyM/_old  2011-05-02 13:04:58.0 +0200
+++ /var/tmp/diff_new_pack.5YObyM/_new  2011-05-02 13:04:58.0 +0200
@@ -30,7 +30,7 @@
 AutoReqProv:on
 Summary:SANE (Scanner Access Now Easy) Scanner Drivers
 Version:1.0.22
-Release:2
+Release:3
 Url:http://www.sane-project.org/
 # URL for Source0: 
https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz
 # MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): 
be586a23633949cf2ecf0c9c6d769130
@@ -165,7 +165,7 @@
 %endif
 # Up to SLE10 there was the package name 'sane' for 'sane-backends'.
 # Therefore this RPM provides 'sane' and it also obsoletes it.
-# The %{version} s needed in both Provides and Obsoletes
+# The %{version} is needed in both Provides and Obsoletes
 # to avoid a RPMLINT warning that the package obsoletes itself:
 Provides:   sane = %{version}
 Obsoletes:  sane  %{version}
@@ -522,10 +522,7 @@
 # Also the evil-hack init-script sane-dev is no longer provided.
 # Regarding udev:
 # Modify the generated tools/udev/libsane.rules file as follows:
-# All GROUP=scanner are replaced by GROUP=lp and
-# SUBSYSTEM==usb is added before the SUBSYSTEM==usb_device test
-# but the latter is kept for backward compatibility.
-# The reasons are:
+# All GROUP=scanner are replaced by GROUP=lp.
 # There is no group scanner in /etc/group for openSUSE.
 # For all-in-one devices (i.e. printer + scanner, e.g. EPSON Stylus devices)
 # the group must be lp so that the CUPS usb backend which runs
@@ -536,15 +533,17 @@
 # usually require physical user access (to get the printed paper or
 # to place a paper on the scanner) so that both kind of devices
 # should usually require the same kind of security.
+sed -i -e 's/GROUP=scanner/GROUP=lp/' tools/udev/libsane.rules
 # Regarding SUBSYSTEM==usb see the Novell/Suse Bugzilla bug
 # https://bugzilla.novell.com/show_bug.cgi?id=294161#c11
-# Regarding SYSFS{} or ATTRS{} versus ATTR{} see the Novell/Suse Bugzilla bug
+sed -i -e '/^SUBSYSTEM/s/usb_device/usb/' tools/udev/libsane.rules
+# Regarding ATTRS{} (formerly SYSFS{}) versus ATTR{} see the Novell/Suse 
Bugzilla bug
 # https://bugzilla.novell.com/show_bug.cgi?id=436085#c0
+# but for SCSI scanners ATTRS is mandatory see the Novell/Suse Bugzilla bug
+# https://bugzilla.novell.com/show_bug.cgi?id=681146#c20
+# so that ATTRS is replaced by ATTR only for USB scanners.
+sed -i -e 
'/^LABEL=libsane_usb_rules_begin/,/^LABEL=libsane_usb_rules_end/s/ATTRS/ATTR/g'
 tools/udev/libsane.rules
 # Disable all ENV{DEVTYPE} lines because we (Suse/Novell) do not need them.
-sed -i -e 's/GROUP=scanner/GROUP=lp/' tools/udev/libsane.rules
-sed -i -e '/^SUBSYSTEM/s/usb_device/usb/' tools/udev/libsane.rules
-sed -i -e 's/SYSFS/ATTR/g' tools/udev/libsane.rules
-sed -i -e 's/ATTRS/ATTR/g' tools/udev/libsane.rules
 sed -i -e 's/^ENV{DEVTYPE}/# ENV{DEVTYPE}/' tools/udev/libsane.rules
 # Disable entries for USB scanners which are unsupported
 # but keep the entries for models for which the support status






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org