CVS commit: pkgsrc/graphics/sane-backends

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Jun 13 20:54:33 UTC 2020

Modified Files:
        pkgsrc/graphics/sane-backends: Makefile Makefile.common PLIST distinfo
Added Files:
        pkgsrc/graphics/sane-backends/patches:
            patch-backend_pixma_pixma__bjnp.c
Removed Files:
        pkgsrc/graphics/sane-backends/patches: patch-backend_epsonds.c

Log Message:
sane-backends: Update to 1.0.30

pkgsrc changes:
 - sane-backends seems now make jobs safe
 - Add dependency to c++11 for genesys backend
 - Remove no longer needed patch-backend_epsonds.c: now sys/time.h is included
 - Use BJNP_HOST_MAX instead of non-portable/POSIX HOST_NAME_MAX via
   patch-backend_pixma_pixma__bjnp.c
 - Update MASTER_SITES and remove it from Makefile.common: the current one is
   specific to sane-backends

Changes:
1.0.30
------
This release fixes several security related issues and a build issue.

### Backends
- `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()`

### Build
- fixes a build issue where linker flags would become link time
  dependencies (#239)

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 the `genesys` and `pixma` backends to a directory of their own

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
- fixes USB support detection on BeOS and OS/2 at `./configure` time
- 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`.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/graphics/sane-backends/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/sane-backends/Makefile.common \
    pkgsrc/graphics/sane-backends/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/sane-backends/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/sane-backends/patches/patch-backend_epsonds.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/sane-backends/Makefile
diff -u pkgsrc/graphics/sane-backends/Makefile:1.72 pkgsrc/graphics/sane-backends/Makefile:1.73
--- pkgsrc/graphics/sane-backends/Makefile:1.72 Sun May 31 17:19:49 2020
+++ pkgsrc/graphics/sane-backends/Makefile      Sat Jun 13 20:54:32 2020
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.72 2020/05/31 17:19:49 rillig Exp $
+# $NetBSD: Makefile,v 1.73 2020/06/13 20:54:32 leot Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
+MASTER_SITES=  https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/
 COMMENT=       API for access to scanners, digital cameras, frame grabbers, etc
 
 DISTNAME=      sane-backends-${SANE_VERSION}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
 
-# lib/Makefile.in builds .o files and then .a, but rules for shlibs,
-# while apparently independent, cause libtool to create .o again,
-# making it possible for the ar step of the .a build to fail to find
-# the .o
-MAKE_JOBS_SAFE=                NO
-
 USE_TOOLS+=            msgfmt msgmerge pkg-config
 USE_PKGLOCALEDIR=      YES
 
+# c++11 is needed for genesys backend
+USE_LANGUAGES=         c c++11
+
+# C++11
+GCC_REQD+=             4.8
+
 CONFIGURE_ARGS+=       --with-gphoto2=no
 CONFIGURE_ARGS+=       --without-snmp
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}

Index: pkgsrc/graphics/sane-backends/Makefile.common
diff -u pkgsrc/graphics/sane-backends/Makefile.common:1.34 pkgsrc/graphics/sane-backends/Makefile.common:1.35
--- pkgsrc/graphics/sane-backends/Makefile.common:1.34  Sat Mar 31 22:39:20 2018
+++ pkgsrc/graphics/sane-backends/Makefile.common       Sat Jun 13 20:54:32 2020
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile.common,v 1.34 2018/03/31 22:39:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.35 2020/06/13 20:54:32 leot Exp $
 # used by graphics/sane-frontends/Makefile
 
 CATEGORIES?=   graphics
-MASTER_SITES?= https://alioth.debian.org/frs/download.php/file/4224/
-# http://alioth.debian.org/frs/?group_id=30186
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE?=     http://www.sane-project.org/
@@ -11,7 +9,7 @@ LICENSE=       gnu-gpl-v2
 
 SANE_MAJOR?=   1
 SANE_MINOR?=   0
-SANE_MICRO?=   27
+SANE_MICRO?=   30
 SANE_VERSION=  ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=  SANE_MAJOR=${SANE_MAJOR:Q}
 PLIST_SUBST+=  SANE_MINOR=${SANE_MINOR:Q}
Index: pkgsrc/graphics/sane-backends/PLIST
diff -u pkgsrc/graphics/sane-backends/PLIST:1.34 pkgsrc/graphics/sane-backends/PLIST:1.35
--- pkgsrc/graphics/sane-backends/PLIST:1.34    Wed Aug  7 15:52:13 2019
+++ pkgsrc/graphics/sane-backends/PLIST Sat Jun 13 20:54:32 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2019/08/07 15:52:13 maya Exp $
+@comment $NetBSD: PLIST,v 1.35 2020/06/13 20:54:32 leot Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -7,28 +7,6 @@ bin/umax_pp
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.la
-${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo
-${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo
 lib/pkgconfig/sane-backends.pc
 lib/sane/libsane-abaton.la
 lib/sane/libsane-agfafocus.la
@@ -93,6 +71,7 @@ lib/sane/libsane-pixma.la
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek_pp.la
 lib/sane/libsane-ricoh.la
+lib/sane/libsane-ricoh2.la
 lib/sane/libsane-rts8891.la
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
@@ -179,6 +158,7 @@ man/man5/sane-pixma.5
 man/man5/sane-plustek.5
 man/man5/sane-plustek_pp.5
 man/man5/sane-ricoh.5
+man/man5/sane-ricoh2.5
 man/man5/sane-rts8891.5
 man/man5/sane-s9036.5
 man/man5/sane-sceptre.5
@@ -207,6 +187,34 @@ sbin/saned
 share/doc/sane-backends/AUTHORS
 share/doc/sane-backends/COPYING
 share/doc/sane-backends/ChangeLog
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.0
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.1
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.10
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.11
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.12
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.13
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.14
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.15
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.16
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.17
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.18
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.19
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.2
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.20
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.21
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.22
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.23
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.24
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.25
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.27
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.28
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.3
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.4
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.5
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.6
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.7
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.8
+share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.9
 share/doc/sane-backends/LICENSE
 share/doc/sane-backends/NEWS
 share/doc/sane-backends/PROBLEMS
@@ -361,6 +369,28 @@ share/examples/sane/umax.conf
 share/examples/sane/umax1220u.conf
 share/examples/sane/umax_pp.conf
 share/examples/sane/xerox_mfp.conf
+${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo
 @pkgdir share/sane/snapscan
 @pkgdir share/sane/gt68xx
 @pkgdir share/sane/epjitsu

Index: pkgsrc/graphics/sane-backends/distinfo
diff -u pkgsrc/graphics/sane-backends/distinfo:1.46 pkgsrc/graphics/sane-backends/distinfo:1.47
--- pkgsrc/graphics/sane-backends/distinfo:1.46 Sun Feb 25 21:22:07 2018
+++ pkgsrc/graphics/sane-backends/distinfo      Sat Jun 13 20:54:32 2020
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.46 2018/02/25 21:22:07 wiz Exp $
+$NetBSD: distinfo,v 1.47 2020/06/13 20:54:32 leot Exp $
 
-SHA1 (sane-backends-1.0.27.tar.gz) = 579ec4d6279c7f0f02014358a7e74056672a1e43
-RMD160 (sane-backends-1.0.27.tar.gz) = 09afbf4efee05759aef49de8d41c7d089a41ed05
-SHA512 (sane-backends-1.0.27.tar.gz) = c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-Size (sane-backends-1.0.27.tar.gz) = 6430188 bytes
+SHA1 (sane-backends-1.0.30.tar.gz) = 4f6a2e56d92d15a58dcabcba76a36929a2fd882f
+RMD160 (sane-backends-1.0.30.tar.gz) = 85c57e773d26e8c82304d3d6bce38dcda0f2b8c0
+SHA512 (sane-backends-1.0.30.tar.gz) = e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5
+Size (sane-backends-1.0.30.tar.gz) = 7204519 bytes
 SHA1 (patch-aa) = 91f5838b7c455dc160ba22d15659c1b19a222668
 SHA1 (patch-ab) = f6ec74b90f5499d07117559c7079ba2efccccf17
 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
-SHA1 (patch-backend_epsonds.c) = 2ecbb36431254b7059c3e35b5ac094c4b3f41374
+SHA1 (patch-backend_pixma_pixma__bjnp.c) = c48e929910cbe33b91c919de3f47badd2bf063f0
 SHA1 (patch-m4_byteorder.m4) = 23f4b0256fc9980d3472e77ab558b0e24a9495b4
 SHA1 (patch-tools_umax__pp.c) = debe660184a1380a894e8a5414983f5fdb19cded

Added files:

Index: pkgsrc/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c
diff -u /dev/null pkgsrc/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c:1.1
--- /dev/null   Sat Jun 13 20:54:33 2020
+++ pkgsrc/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c     Sat Jun 13 20:54:32 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-backend_pixma_pixma__bjnp.c,v 1.1 2020/06/13 20:54:32 leot Exp $
+
+Reuse BJNP_HOST_MAX instead of possible undefined HOST_NAME_MAX.
+
+scanner_host is populated via get_scanner_name() that is already
+limited by BJNP_HOST_MAX.
+
+--- backend/pixma/pixma_bjnp.c.orig    2020-05-17 11:54:18.000000000 +0000
++++ backend/pixma/pixma_bjnp.c
+@@ -1990,8 +1990,8 @@ sanei_bjnp_find_devices (const char **co
+   fd_set fdset;
+   fd_set active_fdset;
+   struct timeval timeout;
+-  char scanner_host[HOST_NAME_MAX];
+-  char uri[HOST_NAME_MAX + 32];
++  char scanner_host[BJNP_HOST_MAX];
++  char uri[BJNP_HOST_MAX + 32];
+   int dev_no;
+   int port;
+   int auto_detect = 1;