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.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2015-10-19 22:48:00.000000000 +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&aid=315198&group_id=30186&atid=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.000000000 +0200 +++ /var/tmp/diff_new_pack.lMXtbd/_new 2015-10-19 22:48:02.000000000 +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: ghostscript-x11 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.24 +Version: 1.0.25 Release: 0 Url: http://www.sane-project.org/ # How to get Source0: -# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz +# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/4146/sane-backends-1.0.25.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 +# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/4144/sane-backends-1.0.25.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 +# 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 # 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. # Source101 is the xinetd file for the saned: Source101: sane-port # Source102 is the OpenSLP registration file for the saned: Source102: sane.reg -# Since openSUSE 10.3 "Source103: hpoj.desc" is dropped because the package hp-officeJet is dropped. -# 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. -# 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. -# Source107 is obsolete since sane-backends-1.0.19 because it has udev and HAL support. -# Source108 is a script which outputs a HAL fdi file. -# Source108 is obsolete since sane-backends-1.0.19 because it has udev and HAL support. -# We create our hpaio.desc file directly from the models.dat file of HPLIP: -Source109: create_hpaio.desc_from_models.dat -Source110: models.dat +# Source110 creates our hpaio.desc file directly from the models.dat file of HPLIP: +Source110: create_hpaio.desc_from_models.dat +# Source111 is the models.dat file of HPLIP: +Source111: models.dat # Was initially just dumped in as Source1 to "package baselibs.conf" # (see the matching explanatory entry in the RPM changelog): Source190: baselibs.conf @@ -85,95 +67,17 @@ # 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 -# Patch1 does locale rename: no -> nb: -# Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'. -# 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. -# Patch4 disables hw_ink_remain which causes a buffer overflow in fujitsu.c: -# Patch4 is obsolete since sane-backends-1.0.19 because it is fixed in the source. -# Patch5 fixes uninitialized variables in avision.c: -# Patch5 is obsolete since sane-backends-1.0.20 because it is fixed in the source. -# Patch6 fixes an ambiguous post/pre increment in canon-sane.c: -# Patch6 is obsolete since sane-backends-1.0.19 because it is fixed in the source. -# Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices -# if the attach callback returns anything other than SANE_STATUS_GOOD: -# Patch7 is obsolete since sane-backends-1.0.20 because it is fixed in the source. -# 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=detail&aid=311856&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations -# in mustek_pp_ccd300.c see https://bugzilla.novell.com/show_bug.cgi?id=498435 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311857&group_id=30186&atid=410366 -# where the upstream maintainer did not understand what is wrong and closed it as "Wont Fix" -# so that we have to keep this patch: -Patch10: fix-mustek_pp_ccd300.c.patch -# Patch11 sane-desc_closedir.patch adds missing call to closedir to sane-desc.c -# see https://bugzilla.novell.com/show_bug.cgi?id=530313 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311880&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch12 fix-lexmark_low-memory-leak.patch adds a missing call to free in backend/lexmark_low.c -# in the sanei_lexmark_low_find_start_line function -# see https://bugzilla.novell.com/show_bug.cgi?id=542341 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311990&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch13 fix-hp3900_sane-string-option-sizes.diff fixes option sizes in backend/hp3900_sane.c -# because otherwise the frontend (e.g. xsane) may crash -# see https://bugzilla.novell.com/show_bug.cgi?id=535752 -# and https://alioth.debian.org/tracker/index.php?func=detail&aid=311991&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch14 is an upstream patch which adds two files required to build translations -# which are missing in the upstream sane-backends-1.0.21 source tar ball. -# URL for Patch14: https://alioth.debian.org/frs/download.php/3261/sane-backends-1.0.21-i18n.patch -# Patch14 is obsolete since sane-backends-1.0.22 because it is fixed in the source. -# Patch15 fix-genesys-create_range-type.patch lets in genesys.c the create_range function -# be of type 'SANE_Range *' to fix 'assignment makes pointer from integer' bugs -# wherever the create_range function is called -# see https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id=30186&atid=410366 -# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. -# Patch16 fix-xerox_mfp-color-mode.patch adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c -# to fix a regression in sane-backends-1.0.21 where the xerox_mfp works only in grayscale mode -# see https://bugzilla.novell.com/show_bug.cgi?id=658017 -# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. +# Patch1 dell1600n_net-fix-strncat.patch fixes the following build error: +# Statement might be overflowing a buffer in strncat. Common mistake: +# BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument +# GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1): +# see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 +Patch1: dell1600n_net-fix-strncat.patch # Patch100... is SUSE specific stuff: -# Patch100 canon-backend-autoprobing.patch lets the "canon" backend do scanner auto-recognition -# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. -# Patch102 builds libsane-* modules as libtool modules: -# SANE backends (i.e. driver modules) are regular shared libraries. -# Nothing is linked directly with a /usr/lib/sane/libsane-<driver>.so module. -# In particular scanning frontends (like scanimage, xscanimage, xsane, kooka) -# are linked with libsane.so.1 which is the dll meta-backend which dlopen()s the -# driver modules according to which drivers are activated in /etc/sane.d/dll.conf. -# One could "cp /usr/lib/sane/libsane-<driver>.so /usr/lib/libsane.so" -# and scanning would also work (but now one can use only this single driver). -# The libtool script used in sane-backends is slightly modified to support that. -# Patch102 was dropped because there is no reason to build them as libtool modules -# and it would make our package incompatible with the rest of the SANE world. -# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp which is built -# but not installed but it is needed to recover from a failed scan -# with scanners which use the umax_pp backend, see http://bugs.debian.org/496833 -Patch103: install-umax_pp-tool.patch -# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am +# 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: -Patch104: no-descriptions-external-hpoj.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. -# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W. -# Patch106 is obsolete since sane-backends-1.0.24 because it is fixed in the source. -# 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 -# https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366 -# Patch108 is obsolete since sane-backends-1.0.24 because it is fixed in the source. -# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner +Patch101: no-descriptions-external-hpoj.patch +# Patch102 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 @@ -183,15 +87,7 @@ # 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 -# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443 -# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=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 +Patch102: adapt_epkowa.desc_for_yast2-scanner.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -266,28 +162,19 @@ %prep %setup -q -# Apply upstream patches first of all: -# Then apply non-upstream patches: -# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: -%patch2 -# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: -%patch8 -# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: -%patch10 +# Patch1 dell1600n_net-fix-strncat.patch fixes the following build error: +# Statement might be overflowing a buffer in strncat. Common mistake: +# BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument +# GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) +# see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366 +%patch1 # Patch100... is SUSE specific stuff: -# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp: -%patch103 -# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am +# 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: -%patch104 -# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner +%patch101 +# Patch102 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 -# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443 -# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366 -%patch110 -%patch111 -%patch112 -p1 +%patch102 # 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. @@ -299,7 +186,7 @@ done # Create our hpaio.desc descriptions-external file # (use it as bash input because sources may be installed without execute permissions): -bash %{SOURCE109} <%{SOURCE110} >doc/descriptions-external/hpaio.desc +bash %{SOURCE110} <%{SOURCE111} >doc/descriptions-external/hpaio.desc # Copy the create_scanner_database script from the sources directory to the build directory # to avoid that the original source becomes modified later in the install section # and ends up in the source RPM, see https://bugzilla.novell.com/show_bug.cgi?id=463464#c11 @@ -325,6 +212,10 @@ # 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. # Disable locking because /var/lock/sane/ would be a world-writable directory. +# Disable 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 ./configure --prefix=/usr \ --exec-prefix=/usr \ --sysconfdir=%{_sysconfdir} \ @@ -336,7 +227,8 @@ --with-docdir=%{_defaultdocdir}/sane-backends \ --enable-pthread \ --enable-libusb_1_0 \ - --disable-locking + --disable-locking \ + --disable-latex # Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP) # because "99" is the group of the user who runs the build when norootforbuild is used # and set localstatedir to have the lock files in /var/lock/sane (see backend/Makefile.in). ++++++ adapt_epkowa.desc_for_yast2-scanner.patch ++++++ ++++ 1030 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/sane-backends/adapt_epkowa.desc_for_yast2-scanner.patch ++++ and /work/SRC/openSUSE:Factory/.sane-backends.new/adapt_epkowa.desc_for_yast2-scanner.patch ++++++ dell1600n_net-fix-strncat.patch ++++++ --- backend/dell1600n_net.c.orig 2013-02-23 03:00:56.000000000 +0100 +++ backend/dell1600n_net.c 2015-10-06 10:44:01.000000000 +0200 @@ -943,7 +943,7 @@ HexDump (int debugLevel, const unsigned sprintf (itemBuf, "%02x ", (const unsigned int) buf[i]); - strncat (lineBuf, itemBuf, sizeof (lineBuf)); + strncat (lineBuf, itemBuf, sizeof (lineBuf) - strlen (lineBuf) - 1); if ((i + 1) % 16) continue; @@ -960,7 +960,7 @@ HexDump (int debugLevel, const unsigned { sprintf (itemBuf, "."); } - strncat (lineBuf, itemBuf, sizeof (lineBuf)); + strncat (lineBuf, itemBuf, sizeof (lineBuf) - strlen (lineBuf) - 1); } /* for j */ @@ -974,7 +974,7 @@ HexDump (int debugLevel, const unsigned for (j = (i % 16); j < 16; ++j) { - strncat (lineBuf, " ", sizeof (lineBuf)); + strncat (lineBuf, " ", sizeof (lineBuf) - strlen (lineBuf) - 1); } for (j = 1 + i - ((i + 1) % 16); j < i; ++j) { @@ -986,7 +986,7 @@ HexDump (int debugLevel, const unsigned { strcpy (itemBuf, "."); } - strncat (lineBuf, itemBuf, sizeof (lineBuf)); + strncat (lineBuf, itemBuf, sizeof (lineBuf) - strlen (lineBuf) - 1); } DBG (debugLevel, "%s\n", lineBuf); } ++++++ sane-backends-1.0.24.tar.gz -> sane-backends-1.0.25.tar.gz ++++++ ++++ 108625 lines of diff (skipped)
