CVS commit: pkgsrc/graphics/sane-airscan

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Sep  5 14:42:18 UTC 2023

Modified Files:
        pkgsrc/graphics/sane-airscan: Makefile distinfo
        pkgsrc/graphics/sane-airscan/patches: patch-airscan-netif.c
            patch-airscan-os.c

Log Message:
sane-airscan: Update to 0.99.27

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


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/sane-airscan/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/sane-airscan/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c \
    pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.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-airscan/Makefile
diff -u pkgsrc/graphics/sane-airscan/Makefile:1.15 pkgsrc/graphics/sane-airscan/Makefile:1.16
--- pkgsrc/graphics/sane-airscan/Makefile:1.15  Mon Aug 14 05:24:36 2023
+++ pkgsrc/graphics/sane-airscan/Makefile       Tue Sep  5 14:42:17 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2023/08/14 05:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2023/09/05 14:42:17 ryoon Exp $
 
 GITHUB_PROJECT=        sane-airscan
-GITHUB_TAG=    0.99.21
-DISTNAME=      sane-airscan-0.99.21
-PKGREVISION=   12
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+DISTNAME=      sane-airscan-0.99.27
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=alexpevzner/}
 

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

Index: pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c
diff -u pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c:1.1 pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c:1.2
--- pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c:1.1      Wed Dec  9 12:05:58 2020
+++ pkgsrc/graphics/sane-airscan/patches/patch-airscan-netif.c  Tue Sep  5 14:42:18 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-airscan-netif.c,v 1.1 2020/12/09 12:05:58 ryoon Exp $
+$NetBSD: patch-airscan-netif.c,v 1.2 2023/09/05 14:42:18 ryoon Exp $
 
 * Support NetBSD.
 
---- airscan-netif.c.orig       2020-11-23 19:47:02.000000000 +0000
+--- airscan-netif.c.orig       2021-10-04 18:36:05.000000000 +0000
 +++ airscan-netif.c
-@@ -578,9 +578,14 @@ netif_init (void)
-         return SANE_STATUS_IO_ERROR;
+@@ -589,9 +589,14 @@ netif_init (void)
      }
  
+ #ifdef ROUTE_MSGFILTER
 +#if defined(__NetBSD__)
 +    unsigned char rtfilter[] = { RTM_NEWADDR, RTM_DELADDR };
 +    if (setsockopt(netif_rtnetlink_sock, AF_ROUTE, RO_MSGFILTER,
@@ -17,5 +17,5 @@ $NetBSD: patch-airscan-netif.c,v 1.1 202
      if (setsockopt(netif_rtnetlink_sock, AF_ROUTE, ROUTE_MSGFILTER,
 +#endif
                     &rtfilter, sizeof(rtfilter)) < 0) {
-         log_debug(NULL, "can't set ROUTE_MSGFILTER: %s", strerror(errno));
-         return SANE_STATUS_IO_ERROR;
+         /* Note, this error is not fatal for us, it is enough to
+          * log it and continue
Index: pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c
diff -u pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c:1.1 pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c:1.2
--- pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c:1.1 Wed Dec  9 12:05:58 2020
+++ pkgsrc/graphics/sane-airscan/patches/patch-airscan-os.c     Tue Sep  5 14:42:18 2023
@@ -1,22 +1,22 @@
-$NetBSD: patch-airscan-os.c,v 1.1 2020/12/09 12:05:58 ryoon Exp $
+$NetBSD: patch-airscan-os.c,v 1.2 2023/09/05 14:42:18 ryoon Exp $
 
 * Support NetBSD.
 
---- airscan-os.c.orig  2020-11-23 19:47:02.000000000 +0000
+--- airscan-os.c.orig  2021-10-04 18:36:05.000000000 +0000
 +++ airscan-os.c
 @@ -17,7 +17,7 @@
  #include <unistd.h>
  #include <sys/stat.h>
  
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
  #   include <sys/types.h>
  #   include <sys/sysctl.h>
  #endif
-@@ -92,6 +92,14 @@ os_progname_init (void)
-         return;
+@@ -101,6 +101,14 @@ os_progname_init (void)
+     if (rc < 0) {
+         os_progname_buf[0] = '\0'; /* Just a paranoia */
      }
-     memmove(os_progname_buf, kp.p_comm, KI_MAXCOMLEN);
 +#elif defined(__NetBSD__)
 +    struct kinfo_proc2 kp;
 +    int mib[] = {CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(kp), 1};