CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Apr 29 08:40:04 UTC 2024

Modified Files:
        pkgsrc/filesystems/fuse-sshfs: Makefile
        pkgsrc/mk/extract: extract

Log Message:
mk: Correctly engineer previous change.

Rather than breaking many of the 23 platforms that pkgsrc purports to support,
move the EXTRACT_OPTS_TAR logic into the individual package that needed it.
If there are other packages that need this they can easily copy the required
two lines.

It's worth noting here that only bsdtar has a problem with this, gtar extracts
the file fine (with warnings).


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/filesystems/fuse-sshfs/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mk/extract/extract

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

Modified files:

Index: pkgsrc/filesystems/fuse-sshfs/Makefile
diff -u pkgsrc/filesystems/fuse-sshfs/Makefile:1.12 pkgsrc/filesystems/fuse-sshfs/Makefile:1.13
--- pkgsrc/filesystems/fuse-sshfs/Makefile:1.12 Wed Nov 22 19:46:10 2023
+++ pkgsrc/filesystems/fuse-sshfs/Makefile      Mon Apr 29 08:40:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/11/22 19:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/04/29 08:40:04 jperkin Exp $
 
 DISTNAME=              sshfs-3.7.4a
 PKGNAME=               fuse-${DISTNAME}
@@ -8,12 +8,16 @@ MASTER_SITES=         ${MASTER_SITE_GITHUB:=dea
 GITHUB_PROJECT=                sshfs
 GITHUB_RELEASE=                ${DISTNAME}
 EXTRACT_SUFX=          .tar.xz
+EXTRACT_USING=         bsdtar
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/deadbeefsociety/sshfs/
 COMMENT=       File system client based on the SFTP protocol
 LICENSE=       gnu-gpl-v2
 
+# Cannot restore extended attributes: com.apple.provenance
+EXTRACT_OPTS_TAR.${DISTNAME}${EXTRACT_SUFX}=   --no-xattr
+
 USE_LANGUAGES= c
 USE_TOOLS=     pkg-config
 

Index: pkgsrc/mk/extract/extract
diff -u pkgsrc/mk/extract/extract:1.22 pkgsrc/mk/extract/extract:1.23
--- pkgsrc/mk/extract/extract:1.22      Sun Apr 28 18:07:33 2024
+++ pkgsrc/mk/extract/extract   Mon Apr 29 08:40:04 2024
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: extract,v 1.22 2024/04/28 18:07:33 wiz Exp $
+# $NetBSD: extract,v 1.23 2024/04/29 08:40:04 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -258,7 +258,7 @@ tar)
                        $paxprog ${EXTRACT_OPTS_PAX} $exclude_flag -O -r ${1+"$@"}
                ;;
        *tar)
-               : ${EXTRACT_OPTS_TAR=--no-xattrs}
+               : ${EXTRACT_OPTS_TAR=}
                case "$extract_using" in
                /*)     tarprog="$extract_using" ;;
                *)      tarprog="${TAR}" ;;