CVS commit: pkgsrc/sysutils/restic

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jul 11 19:09:13 UTC 2025

Modified Files:
        pkgsrc/sysutils/restic: Makefile distinfo
Added Files:
        pkgsrc/sysutils/restic/patches: patch-internal_fs_node__xattr.go

Log Message:
sysutils/restic: Apply an upstream patch to fix errors on filesystems that doesn't support xattrs on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/sysutils/restic/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/restic/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/restic/patches/patch-internal_fs_node__xattr.go

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

Modified files:

Index: pkgsrc/sysutils/restic/Makefile
diff -u pkgsrc/sysutils/restic/Makefile:1.62 pkgsrc/sysutils/restic/Makefile:1.63
--- pkgsrc/sysutils/restic/Makefile:1.62        Fri Jun  6 14:01:39 2025
+++ pkgsrc/sysutils/restic/Makefile     Fri Jul 11 19:09:13 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2025/06/06 14:01:39 bsiegert Exp $
+# $NetBSD: Makefile,v 1.63 2025/07/11 19:09:13 pho Exp $
 
 DISTNAME=      restic-0.18.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=restic/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/sysutils/restic/distinfo
diff -u pkgsrc/sysutils/restic/distinfo:1.17 pkgsrc/sysutils/restic/distinfo:1.18
--- pkgsrc/sysutils/restic/distinfo:1.17        Tue Apr  1 08:26:48 2025
+++ pkgsrc/sysutils/restic/distinfo     Fri Jul 11 19:09:13 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2025/04/01 08:26:48 adam Exp $
+$NetBSD: distinfo,v 1.18 2025/07/11 19:09:13 pho Exp $
 
 BLAKE2s (cel.dev_expr_@v_v0.19.2.mod) = 9fbd8f75efe0ea449f272307df3537390d8c9d60ddf006e1a9deaec0584ce09c
 SHA512 (cel.dev_expr_@v_v0.19.2.mod) = 2fbf9e5422fe7c8f3da9ea07c6fb16d6d35a0d884c8f48432833a92cadee27cba9100da13f68722b61daac49357d3227d6df2f2e65ed256b8ca3ac8d02605683
@@ -951,3 +951,4 @@ Size (gopkg.in_yaml.v3_@v_v3.0.1.zip) = 
 BLAKE2s (restic-0.18.0.tar.gz) = c4f1a2765ab3b8b83685e5145ece59e6c0b0e027640a20ca4a17c9cb4e4efc94
 SHA512 (restic-0.18.0.tar.gz) = 964422cd52abd68e2a860eb18ce277da7b0093657244deb56849f656e9c7f0f29de5478b0124644a7b5aceb39fa83feab0686f9634a5f48ac38614f1d73d02f4
 Size (restic-0.18.0.tar.gz) = 24095281 bytes
+SHA1 (patch-internal_fs_node__xattr.go) = bb5a942c005d170717d91f0cd467995b0c7c4035

Added files:

Index: pkgsrc/sysutils/restic/patches/patch-internal_fs_node__xattr.go
diff -u /dev/null pkgsrc/sysutils/restic/patches/patch-internal_fs_node__xattr.go:1.1
--- /dev/null   Fri Jul 11 19:09:13 2025
+++ pkgsrc/sysutils/restic/patches/patch-internal_fs_node__xattr.go     Fri Jul 11 19:09:13 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-internal_fs_node__xattr.go,v 1.1 2025/07/11 19:09:13 pho Exp $
+
+Ignore EOPNOTSUPP that is returned if the filesystem does not support
+xattrs on NetBSD:
+https://github.com/restic/restic/pull/5344
+
+--- internal/fs/node_xattr.go.orig     2025-07-11 18:57:45.520857611 +0000
++++ internal/fs/node_xattr.go
+@@ -53,9 +53,10 @@ func handleXattrErr(err error) error {
+ 
+       case *xattr.Error:
+               // On Linux, xattr calls on files in an SMB/CIFS mount can return
+-              // ENOATTR instead of ENOTSUP.
++              // ENOATTR instead of ENOTSUP.  Ignore "Operation not supported"
++              // as well.
+               switch e.Err {
+-              case syscall.ENOTSUP, xattr.ENOATTR:
++              case syscall.ENOTSUP, syscall.EOPNOTSUPP, xattr.ENOATTR:
+                       return nil
+               }
+               return errors.WithStack(e)