Sat Jun 13 20:54:33 2020 UTC ()
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`.


(leot)
diff -r1.72 -r1.73 pkgsrc/graphics/sane-backends/Makefile
diff -r1.34 -r1.35 pkgsrc/graphics/sane-backends/Makefile.common
diff -r1.34 -r1.35 pkgsrc/graphics/sane-backends/PLIST
diff -r1.46 -r1.47 pkgsrc/graphics/sane-backends/distinfo
diff -r1.1 -r0 pkgsrc/graphics/sane-backends/patches/patch-backend_epsonds.c
diff -r0 -r1.1 pkgsrc/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c

cvs diff -r1.72 -r1.73 pkgsrc/graphics/sane-backends/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/Makefile 2020/05/31 17:19:49 1.72
+++ pkgsrc/graphics/sane-backends/Makefile 2020/06/13 20:54:32 1.73
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.72 2020/05/31 17:19:49 rillig Exp $ 1# $NetBSD: Makefile,v 1.73 2020/06/13 20:54:32 leot Exp $
2 2
3PKGREVISION= 1 
4.include "Makefile.common" 3.include "Makefile.common"
 4MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/
5COMMENT= API for access to scanners, digital cameras, frame grabbers, etc 5COMMENT= API for access to scanners, digital cameras, frame grabbers, etc
6 6
7DISTNAME= sane-backends-${SANE_VERSION} 7DISTNAME= sane-backends-${SANE_VERSION}
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 9
10# lib/Makefile.in builds .o files and then .a, but rules for shlibs, 
11# while apparently independent, cause libtool to create .o again, 
12# making it possible for the ar step of the .a build to fail to find 
13# the .o 
14MAKE_JOBS_SAFE= NO 
15 
16USE_TOOLS+= msgfmt msgmerge pkg-config 10USE_TOOLS+= msgfmt msgmerge pkg-config
17USE_PKGLOCALEDIR= YES 11USE_PKGLOCALEDIR= YES
18 12
 13# c++11 is needed for genesys backend
 14USE_LANGUAGES= c c++11
 15
 16# C++11
 17GCC_REQD+= 4.8
 18
19CONFIGURE_ARGS+= --with-gphoto2=no 19CONFIGURE_ARGS+= --with-gphoto2=no
20CONFIGURE_ARGS+= --without-snmp 20CONFIGURE_ARGS+= --without-snmp
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
22 22
23CONFIGURE_ENV.SunOS+= ac_cv_func_inet_ntop=yes 23CONFIGURE_ENV.SunOS+= ac_cv_func_inet_ntop=yes
24CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pton=yes 24CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pton=yes
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28PLIST_VARS+= mustek pint sm3600 kvs40xx 28PLIST_VARS+= mustek pint sm3600 kvs40xx
29 29
30.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") || (${OPSYS} == "FreeBSD") 30.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") || (${OPSYS} == "FreeBSD")
31PLIST.sm3600= yes 31PLIST.sm3600= yes

cvs diff -r1.34 -r1.35 pkgsrc/graphics/sane-backends/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/Makefile.common 2018/03/31 22:39:20 1.34
+++ pkgsrc/graphics/sane-backends/Makefile.common 2020/06/13 20:54:32 1.35
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile.common,v 1.34 2018/03/31 22:39:20 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.35 2020/06/13 20:54:32 leot Exp $
2# used by graphics/sane-frontends/Makefile 2# used by graphics/sane-frontends/Makefile
3 3
4CATEGORIES?= graphics 4CATEGORIES?= graphics
5MASTER_SITES?= https://alioth.debian.org/frs/download.php/file/4224/ 
6# http://alioth.debian.org/frs/?group_id=30186 
7 5
8MAINTAINER?= pkgsrc-users@NetBSD.org 6MAINTAINER?= pkgsrc-users@NetBSD.org
9HOMEPAGE?= http://www.sane-project.org/ 7HOMEPAGE?= http://www.sane-project.org/
10LICENSE= gnu-gpl-v2 8LICENSE= gnu-gpl-v2
11 9
12SANE_MAJOR?= 1 10SANE_MAJOR?= 1
13SANE_MINOR?= 0 11SANE_MINOR?= 0
14SANE_MICRO?= 27 12SANE_MICRO?= 30
15SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO} 13SANE_VERSION= ${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
16PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR:Q} 14PLIST_SUBST+= SANE_MAJOR=${SANE_MAJOR:Q}
17PLIST_SUBST+= SANE_MINOR=${SANE_MINOR:Q} 15PLIST_SUBST+= SANE_MINOR=${SANE_MINOR:Q}
18PLIST_SUBST+= SANE_MICRO=${SANE_MICRO:Q} 16PLIST_SUBST+= SANE_MICRO=${SANE_MICRO:Q}
19PLIST_SUBST+= SANE_VERSION=${SANE_VERSION:Q} 17PLIST_SUBST+= SANE_VERSION=${SANE_VERSION:Q}
20 18
21CONFLICTS+= sane<=1.0.3 19CONFLICTS+= sane<=1.0.3
22 20
23GNU_CONFIGURE= YES 21GNU_CONFIGURE= YES
24USE_TOOLS+= gmake 22USE_TOOLS+= gmake
25USE_LIBTOOL= YES 23USE_LIBTOOL= YES
26CONFIGURE_ENV+= ac_cv_path_MAKEINDEX="no" 24CONFIGURE_ENV+= ac_cv_path_MAKEINDEX="no"

cvs diff -r1.34 -r1.35 pkgsrc/graphics/sane-backends/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/PLIST 2019/08/07 15:52:13 1.34
+++ pkgsrc/graphics/sane-backends/PLIST 2020/06/13 20:54:32 1.35
@@ -1,44 +1,22 @@ @@ -1,44 +1,22 @@
1@comment $NetBSD: PLIST,v 1.34 2019/08/07 15:52:13 maya Exp $ 1@comment $NetBSD: PLIST,v 1.35 2020/06/13 20:54:32 leot Exp $
2bin/gamma4scanimage 2bin/gamma4scanimage
3bin/sane-config 3bin/sane-config
4bin/sane-find-scanner 4bin/sane-find-scanner
5bin/scanimage 5bin/scanimage
6bin/umax_pp 6bin/umax_pp
7include/sane/sane.h 7include/sane/sane.h
8include/sane/saneopts.h 8include/sane/saneopts.h
9lib/libsane.la 9lib/libsane.la
10${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo 
11${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo 
12${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo 
13${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo 
14${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo 
15${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo 
16${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo 
17${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo 
18${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo 
19${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo 
20${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo 
21${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo 
22${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo 
23${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo 
24${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo 
25${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo 
26${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo 
27${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo 
28${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo 
29${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo 
30${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo 
31${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo 
32lib/pkgconfig/sane-backends.pc 10lib/pkgconfig/sane-backends.pc
33lib/sane/libsane-abaton.la 11lib/sane/libsane-abaton.la
34lib/sane/libsane-agfafocus.la 12lib/sane/libsane-agfafocus.la
35lib/sane/libsane-apple.la 13lib/sane/libsane-apple.la
36lib/sane/libsane-artec.la 14lib/sane/libsane-artec.la
37lib/sane/libsane-artec_eplus48u.la 15lib/sane/libsane-artec_eplus48u.la
38lib/sane/libsane-as6e.la 16lib/sane/libsane-as6e.la
39lib/sane/libsane-avision.la 17lib/sane/libsane-avision.la
40lib/sane/libsane-bh.la 18lib/sane/libsane-bh.la
41lib/sane/libsane-canon.la 19lib/sane/libsane-canon.la
42lib/sane/libsane-canon630u.la 20lib/sane/libsane-canon630u.la
43lib/sane/libsane-canon_dr.la 21lib/sane/libsane-canon_dr.la
44lib/sane/libsane-cardscan.la 22lib/sane/libsane-cardscan.la
@@ -83,26 +61,27 @@ lib/sane/libsane-mustek.la @@ -83,26 +61,27 @@ lib/sane/libsane-mustek.la
83lib/sane/libsane-mustek_usb.la 61lib/sane/libsane-mustek_usb.la
84${PLIST.mustek}lib/sane/libsane-mustek_usb2.la 62${PLIST.mustek}lib/sane/libsane-mustek_usb2.la
85lib/sane/libsane-nec.la 63lib/sane/libsane-nec.la
86lib/sane/libsane-net.la 64lib/sane/libsane-net.la
87lib/sane/libsane-niash.la 65lib/sane/libsane-niash.la
88lib/sane/libsane-p5.la 66lib/sane/libsane-p5.la
89lib/sane/libsane-pie.la 67lib/sane/libsane-pie.la
90lib/sane/libsane-pieusb.la 68lib/sane/libsane-pieusb.la
91${PLIST.pint}lib/sane/libsane-pint.la 69${PLIST.pint}lib/sane/libsane-pint.la
92lib/sane/libsane-pixma.la 70lib/sane/libsane-pixma.la
93lib/sane/libsane-plustek.la 71lib/sane/libsane-plustek.la
94lib/sane/libsane-plustek_pp.la 72lib/sane/libsane-plustek_pp.la
95lib/sane/libsane-ricoh.la 73lib/sane/libsane-ricoh.la
 74lib/sane/libsane-ricoh2.la
96lib/sane/libsane-rts8891.la 75lib/sane/libsane-rts8891.la
97lib/sane/libsane-s9036.la 76lib/sane/libsane-s9036.la
98lib/sane/libsane-sceptre.la 77lib/sane/libsane-sceptre.la
99lib/sane/libsane-sharp.la 78lib/sane/libsane-sharp.la
100${PLIST.sm3600}lib/sane/libsane-sm3600.la 79${PLIST.sm3600}lib/sane/libsane-sm3600.la
101lib/sane/libsane-sm3840.la 80lib/sane/libsane-sm3840.la
102lib/sane/libsane-snapscan.la 81lib/sane/libsane-snapscan.la
103lib/sane/libsane-sp15c.la 82lib/sane/libsane-sp15c.la
104lib/sane/libsane-st400.la 83lib/sane/libsane-st400.la
105lib/sane/libsane-stv680.la 84lib/sane/libsane-stv680.la
106lib/sane/libsane-tamarack.la 85lib/sane/libsane-tamarack.la
107lib/sane/libsane-teco1.la 86lib/sane/libsane-teco1.la
108lib/sane/libsane-teco2.la 87lib/sane/libsane-teco2.la
@@ -169,26 +148,27 @@ man/man5/sane-mustek.5 @@ -169,26 +148,27 @@ man/man5/sane-mustek.5
169man/man5/sane-mustek_usb.5 148man/man5/sane-mustek_usb.5
170${PLIST.mustek}man/man5/sane-mustek_usb2.5 149${PLIST.mustek}man/man5/sane-mustek_usb2.5
171man/man5/sane-nec.5 150man/man5/sane-nec.5
172man/man5/sane-net.5 151man/man5/sane-net.5
173man/man5/sane-niash.5 152man/man5/sane-niash.5
174man/man5/sane-p5.5 153man/man5/sane-p5.5
175man/man5/sane-pie.5 154man/man5/sane-pie.5
176man/man5/sane-pieusb.5 155man/man5/sane-pieusb.5
177${PLIST.pint}man/man5/sane-pint.5 156${PLIST.pint}man/man5/sane-pint.5
178man/man5/sane-pixma.5 157man/man5/sane-pixma.5
179man/man5/sane-plustek.5 158man/man5/sane-plustek.5
180man/man5/sane-plustek_pp.5 159man/man5/sane-plustek_pp.5
181man/man5/sane-ricoh.5 160man/man5/sane-ricoh.5
 161man/man5/sane-ricoh2.5
182man/man5/sane-rts8891.5 162man/man5/sane-rts8891.5
183man/man5/sane-s9036.5 163man/man5/sane-s9036.5
184man/man5/sane-sceptre.5 164man/man5/sane-sceptre.5
185man/man5/sane-scsi.5 165man/man5/sane-scsi.5
186man/man5/sane-sharp.5 166man/man5/sane-sharp.5
187${PLIST.sm3600}man/man5/sane-sm3600.5 167${PLIST.sm3600}man/man5/sane-sm3600.5
188man/man5/sane-sm3840.5 168man/man5/sane-sm3840.5
189man/man5/sane-snapscan.5 169man/man5/sane-snapscan.5
190man/man5/sane-sp15c.5 170man/man5/sane-sp15c.5
191man/man5/sane-st400.5 171man/man5/sane-st400.5
192man/man5/sane-stv680.5 172man/man5/sane-stv680.5
193man/man5/sane-tamarack.5 173man/man5/sane-tamarack.5
194man/man5/sane-teco1.5 174man/man5/sane-teco1.5
@@ -197,26 +177,54 @@ man/man5/sane-teco3.5 @@ -197,26 +177,54 @@ man/man5/sane-teco3.5
197man/man5/sane-test.5 177man/man5/sane-test.5
198man/man5/sane-u12.5 178man/man5/sane-u12.5
199man/man5/sane-umax.5 179man/man5/sane-umax.5
200man/man5/sane-umax1220u.5 180man/man5/sane-umax1220u.5
201man/man5/sane-umax_pp.5 181man/man5/sane-umax_pp.5
202man/man5/sane-usb.5 182man/man5/sane-usb.5
203man/man5/sane-xerox_mfp.5 183man/man5/sane-xerox_mfp.5
204man/man7/sane.7 184man/man7/sane.7
205man/man8/saned.8 185man/man8/saned.8
206sbin/saned 186sbin/saned
207share/doc/sane-backends/AUTHORS 187share/doc/sane-backends/AUTHORS
208share/doc/sane-backends/COPYING 188share/doc/sane-backends/COPYING
209share/doc/sane-backends/ChangeLog 189share/doc/sane-backends/ChangeLog
 190share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.0
 191share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.1
 192share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.10
 193share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.11
 194share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.12
 195share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.13
 196share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.14
 197share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.15
 198share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.16
 199share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.17
 200share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.18
 201share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.19
 202share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.2
 203share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.20
 204share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.21
 205share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.22
 206share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.23
 207share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.24
 208share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.25
 209share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.27
 210share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.28
 211share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.3
 212share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.4
 213share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.5
 214share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.6
 215share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.7
 216share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.8
 217share/doc/sane-backends/ChangeLogs/ChangeLog-1.0.9
210share/doc/sane-backends/LICENSE 218share/doc/sane-backends/LICENSE
211share/doc/sane-backends/NEWS 219share/doc/sane-backends/NEWS
212share/doc/sane-backends/PROBLEMS 220share/doc/sane-backends/PROBLEMS
213share/doc/sane-backends/PROJECTS 221share/doc/sane-backends/PROJECTS
214share/doc/sane-backends/README 222share/doc/sane-backends/README
215share/doc/sane-backends/README.aix 223share/doc/sane-backends/README.aix
216share/doc/sane-backends/README.beos 224share/doc/sane-backends/README.beos
217share/doc/sane-backends/README.darwin 225share/doc/sane-backends/README.darwin
218share/doc/sane-backends/README.djpeg 226share/doc/sane-backends/README.djpeg
219share/doc/sane-backends/README.freebsd 227share/doc/sane-backends/README.freebsd
220share/doc/sane-backends/README.hp-ux 228share/doc/sane-backends/README.hp-ux
221share/doc/sane-backends/README.linux 229share/doc/sane-backends/README.linux
222share/doc/sane-backends/README.netbsd 230share/doc/sane-backends/README.netbsd
@@ -351,18 +359,40 @@ share/examples/sane/snapscan.conf @@ -351,18 +359,40 @@ share/examples/sane/snapscan.conf
351share/examples/sane/sp15c.conf 359share/examples/sane/sp15c.conf
352share/examples/sane/st400.conf 360share/examples/sane/st400.conf
353share/examples/sane/stv680.conf 361share/examples/sane/stv680.conf
354share/examples/sane/tamarack.conf 362share/examples/sane/tamarack.conf
355share/examples/sane/teco1.conf 363share/examples/sane/teco1.conf
356share/examples/sane/teco2.conf 364share/examples/sane/teco2.conf
357share/examples/sane/teco3.conf 365share/examples/sane/teco3.conf
358share/examples/sane/test.conf 366share/examples/sane/test.conf
359share/examples/sane/u12.conf 367share/examples/sane/u12.conf
360share/examples/sane/umax.conf 368share/examples/sane/umax.conf
361share/examples/sane/umax1220u.conf 369share/examples/sane/umax1220u.conf
362share/examples/sane/umax_pp.conf 370share/examples/sane/umax_pp.conf
363share/examples/sane/xerox_mfp.conf 371share/examples/sane/xerox_mfp.conf
 372${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo
 373${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo
 374${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo
 375${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo
 376${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
 377${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo
 378${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo
 379${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo
 380${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo
 381${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo
 382${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo
 383${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo
 384${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo
 385${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo
 386${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo
 387${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo
 388${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo
 389${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo
 390${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo
 391${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo
 392${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo
 393${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo
364@pkgdir share/sane/snapscan 394@pkgdir share/sane/snapscan
365@pkgdir share/sane/gt68xx 395@pkgdir share/sane/gt68xx
366@pkgdir share/sane/epjitsu 396@pkgdir share/sane/epjitsu
367@pkgdir share/sane/artec_eplus48u 397@pkgdir share/sane/artec_eplus48u
368@pkgdir share/examples/sane/dll.d 398@pkgdir share/examples/sane/dll.d

cvs diff -r1.46 -r1.47 pkgsrc/graphics/sane-backends/distinfo (expand / switch to unified diff)

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

File Deleted: pkgsrc/graphics/sane-backends/patches/Attic/patch-backend_epsonds.c

File Added: pkgsrc/graphics/sane-backends/patches/patch-backend_pixma_pixma__bjnp.c
$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;