Tue Sep 5 14:42:18 2023 UTC ()
sane-airscan: Update to 0.99.27

* Changelog is not provided in concise form. Changes are mostly bugfix.


(ryoon)
diff -r1.15 -r1.16 pkgsrc/graphics/sane-airscan/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/sane-airscan/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c
diff -r1.1 -r1.2 pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c
cvs diff -r1.15 -r1.16 pkgsrc/graphics/sane-airscan/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/sane-airscan/Makefile 2023/08/14 05:24:36 1.15
+++ pkgsrc/graphics/sane-airscan/Makefile 2023/09/05 14:42:17 1.16
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2023/08/14 05:24:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2023/09/05 14:42:17 ryoon Exp $
2 2
3GITHUB_PROJECT= sane-airscan 3GITHUB_PROJECT= sane-airscan
4GITHUB_TAG= 0.99.21 4GITHUB_TAG= ${PKGVERSION_NOREV}
5DISTNAME= sane-airscan-0.99.21 5DISTNAME= sane-airscan-0.99.27
6PKGREVISION= 12 
7CATEGORIES= graphics 6CATEGORIES= graphics
8MASTER_SITES= ${MASTER_SITE_GITHUB:=alexpevzner/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=alexpevzner/}
9 8
10MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://github.com/alexpevzner/sane-airscan/ 10HOMEPAGE= https://github.com/alexpevzner/sane-airscan/
12COMMENT= SANE backend for Apple AirScan (eSCL) and WSD 11COMMENT= SANE backend for Apple AirScan (eSCL) and WSD
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
17 16
18EGDIR= ${PREFIX}/share/examples/sane.d 17EGDIR= ${PREFIX}/share/examples/sane.d
19MAKE_DIRS+= ${PKG_SYSCONFDIR}/sane.d/dll.d 18MAKE_DIRS+= ${PKG_SYSCONFDIR}/sane.d/dll.d
cvs diff -r1.4 -r1.5 pkgsrc/graphics/sane-airscan/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/sane-airscan/distinfo 2021/10/26 10:46:53 1.4
+++ pkgsrc/graphics/sane-airscan/distinfo 2023/09/05 14:42:17 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 10:46:53 nia Exp $ 1$NetBSD: distinfo,v 1.5 2023/09/05 14:42:17 ryoon Exp $
2 2
3BLAKE2s (sane-airscan-0.99.21.tar.gz) = ee6df2891e6baee9f9ccc8e0244215c3968d73bf618cb15a8bd0e674b4d80a2c 3BLAKE2s (sane-airscan-0.99.27.tar.gz) = 2ee783c4e59a8d6f49b22e521383b29488899a5617c70ca0a755473664e04bd2
4SHA512 (sane-airscan-0.99.21.tar.gz) = ab713995cfba6df4f627cf4bdf16222ddab64010c254d20b6a48f4aed22aef911c0b25c432983eee8ddf4b9d517224c62b032c02769943f2cca3dbdc6cf38010 4SHA512 (sane-airscan-0.99.27.tar.gz) = a35a92e26a4e3831f127e59bc520248abde8a7b304eb63ecf1d68092f51a8bc49bbc7503bead47ac84d0333d59ae0045d6d7a9f7b89d95f3ddfa2458f3781256
5Size (sane-airscan-0.99.21.tar.gz) = 191255 bytes 5Size (sane-airscan-0.99.27.tar.gz) = 198418 bytes
6SHA1 (patch-airscan-netif.c) = 3b06cf883514c8804e2854a5e00ccd9fae957b7c 6SHA1 (patch-airscan-netif.c) = 205be7f582ede767a4e0ee46b7943f666cd503cf
7SHA1 (patch-airscan-os.c) = 46e65e141d97356d2e6c7b16a4e78f53a83e9ec8 7SHA1 (patch-airscan-os.c) = 2ea106af5c7e9e6a7a03f8a1ea7fa85ac14aaf6a
8SHA1 (patch-meson.build) = 3348d065567db299b2cd8e2139b382ddbc3f53db 8SHA1 (patch-meson.build) = 3348d065567db299b2cd8e2139b382ddbc3f53db
cvs diff -r1.1 -r1.2 pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c (expand / switch to unified diff)

--- pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c 2020/12/09 12:05:58 1.1
+++ pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c 2023/09/05 14:42:18 1.2
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-airscan-netif.c,v 1.1 2020/12/09 12:05:58 ryoon Exp $ 1$NetBSD: patch-airscan-netif.c,v 1.2 2023/09/05 14:42:18 ryoon Exp $
2 2
3* Support NetBSD. 3* Support NetBSD.
4 4
5--- airscan-netif.c.orig 2020-11-23 19:47:02.000000000 +0000 5--- airscan-netif.c.orig 2021-10-04 18:36:05.000000000 +0000
6+++ airscan-netif.c 6+++ airscan-netif.c
7@@ -578,9 +578,14 @@ netif_init (void) 7@@ -589,9 +589,14 @@ netif_init (void)
8 return SANE_STATUS_IO_ERROR; 
9 } 8 }
10  9
 10 #ifdef ROUTE_MSGFILTER
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+ unsigned char rtfilter[] = { RTM_NEWADDR, RTM_DELADDR }; 12+ unsigned char rtfilter[] = { RTM_NEWADDR, RTM_DELADDR };
13+ if (setsockopt(netif_rtnetlink_sock, AF_ROUTE, RO_MSGFILTER, 13+ if (setsockopt(netif_rtnetlink_sock, AF_ROUTE, RO_MSGFILTER,
14+#else 14+#else
15 unsigned int rtfilter = 15 unsigned int rtfilter =
16 ROUTE_FILTER(RTM_NEWADDR) | ROUTE_FILTER(RTM_DELADDR); 16 ROUTE_FILTER(RTM_NEWADDR) | ROUTE_FILTER(RTM_DELADDR);
17 if (setsockopt(netif_rtnetlink_sock, AF_ROUTE, ROUTE_MSGFILTER, 17 if (setsockopt(netif_rtnetlink_sock, AF_ROUTE, ROUTE_MSGFILTER,
18+#endif 18+#endif
19 &rtfilter, sizeof(rtfilter)) < 0) { 19 &rtfilter, sizeof(rtfilter)) < 0) {
20 log_debug(NULL, "can't set ROUTE_MSGFILTER: %s", strerror(errno)); 20 /* Note, this error is not fatal for us, it is enough to
21 return SANE_STATUS_IO_ERROR; 21 * log it and continue
cvs diff -r1.1 -r1.2 pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c (expand / switch to unified diff)

--- pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c 2020/12/09 12:05:58 1.1
+++ pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c 2023/09/05 14:42:18 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-airscan-os.c,v 1.1 2020/12/09 12:05:58 ryoon Exp $ 1$NetBSD: patch-airscan-os.c,v 1.2 2023/09/05 14:42:18 ryoon Exp $
2 2
3* Support NetBSD. 3* Support NetBSD.
4 4
5--- airscan-os.c.orig 2020-11-23 19:47:02.000000000 +0000 5--- airscan-os.c.orig 2021-10-04 18:36:05.000000000 +0000
6+++ airscan-os.c 6+++ airscan-os.c
7@@ -17,7 +17,7 @@ 7@@ -17,7 +17,7 @@
8 #include <unistd.h> 8 #include <unistd.h>
9 #include <sys/stat.h> 9 #include <sys/stat.h>
10  10
11-#ifdef __OpenBSD__ 11-#if defined(__OpenBSD__) || defined(__FreeBSD__)
12+#if defined(__OpenBSD__) || defined(__NetBSD__) 12+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
13 # include <sys/types.h> 13 # include <sys/types.h>
14 # include <sys/sysctl.h> 14 # include <sys/sysctl.h>
15 #endif 15 #endif
16@@ -92,6 +92,14 @@ os_progname_init (void) 16@@ -101,6 +101,14 @@ os_progname_init (void)
17 return; 17 if (rc < 0) {
 18 os_progname_buf[0] = '\0'; /* Just a paranoia */
18 } 19 }
19 memmove(os_progname_buf, kp.p_comm, KI_MAXCOMLEN); 
20+#elif defined(__NetBSD__) 20+#elif defined(__NetBSD__)
21+ struct kinfo_proc2 kp; 21+ struct kinfo_proc2 kp;
22+ int mib[] = {CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(kp), 1}; 22+ int mib[] = {CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(kp), 1};
23+ size_t len = sizeof(kp); 23+ size_t len = sizeof(kp);
24+ int rc = sysctl(mib, 6, &kp, &len, NULL, 0); 24+ int rc = sysctl(mib, 6, &kp, &len, NULL, 0);
25+ if (rc == -1) { 25+ if (rc == -1) {
26+ return; 26+ return;
27+ } 27+ }
28 #else 28 #else
29 /* This is nice to have but not critical. The caller already has 29 /* This is nice to have but not critical. The caller already has
30 to handle os_progname returning NULL. The error is left as a 30 to handle os_progname returning NULL. The error is left as a