Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 47C9B1A9239 for ; Thu, 27 Jan 2022 04:06:23 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5FF2984E63; Thu, 27 Jan 2022 04:06:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 99BB784D25 for ; Thu, 27 Jan 2022 04:06:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id rrcp9ol-BAXe for ; Thu, 27 Jan 2022 04:06:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 188F484CE7 for ; Thu, 27 Jan 2022 04:06:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 12369FB24; Thu, 27 Jan 2022 04:06:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1643256381175870" MIME-Version: 1.0 Date: Thu, 27 Jan 2022 04:06:21 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/filesystems/fuse-sshfs To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220127040621.12369FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1643256381175870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Thu Jan 27 04:06:20 UTC 2022 Modified Files: pkgsrc/filesystems/fuse-sshfs: distinfo Added Files: pkgsrc/filesystems/fuse-sshfs/patches: patch-meson.build Log Message: Fix build on NetBSD 9 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/filesystems/fuse-sshfs/distinfo cvs rdiff -u -r0 -r1.3 \ pkgsrc/filesystems/fuse-sshfs/patches/patch-meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1643256381175870 Content-Disposition: inline Content-Length: 1934 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/filesystems/fuse-sshfs/distinfo diff -u pkgsrc/filesystems/fuse-sshfs/distinfo:1.6 pkgsrc/filesystems/fuse-sshfs/distinfo:1.7 --- pkgsrc/filesystems/fuse-sshfs/distinfo:1.6 Sat Jan 22 18:48:04 2022 +++ pkgsrc/filesystems/fuse-sshfs/distinfo Thu Jan 27 04:06:20 2022 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.6 2022/01/22 18:48:04 pho Exp $ +$NetBSD: distinfo,v 1.7 2022/01/27 04:06:20 pho Exp $ BLAKE2s (sshfs-3.7.2.tar.xz) = a770780be6c0d5b26ebb9b7b43c35c8a689e226a619f03cdaee847598c81d025 SHA512 (sshfs-3.7.2.tar.xz) = 1612d515869a8b38c0bc3d79eaf80e8b4da1a9710c9668e6ec23e6b77313063ae0bee66ab9e9e0f70d98eaa1334425b2087dd93cc4618af3ac6ac191acf7f838 Size (sshfs-3.7.2.tar.xz) = 53160 bytes SHA1 (patch-cache.c) = 570525d7cae09055537b00e3eeadb639c6f1fa5b +SHA1 (patch-meson.build) = 2d10515de44239d6fad0fd5f512140d86f4dff7a SHA1 (patch-sshfs.c) = 95e0b5bf01c36b803d1ea0c3b71b8740be98506b SHA1 (patch-utils_install__helper.sh) = 7e31f031ecf40731acb4a96b0c23543b7015c290 Added files: Index: pkgsrc/filesystems/fuse-sshfs/patches/patch-meson.build diff -u /dev/null pkgsrc/filesystems/fuse-sshfs/patches/patch-meson.build:1.3 --- /dev/null Thu Jan 27 04:06:21 2022 +++ pkgsrc/filesystems/fuse-sshfs/patches/patch-meson.build Thu Jan 27 04:06:20 2022 @@ -0,0 +1,17 @@ +$NetBSD: patch-meson.build,v 1.3 2022/01/27 04:06:20 pho Exp $ + +Workaround for old librefuse. This patch can go away when NetBSD 9 reaches its +EOL. + +--- meson.build.orig 2022-01-27 04:02:43.383365139 +0000 ++++ meson.build +@@ -44,7 +44,8 @@ endif + configure_file(output: 'config.h', + configuration : cfg) + +-sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0'), ++sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0', required: false), ++ dependency('fuse' , version: '>= 2.6' , required: false), + dependency('glib-2.0'), + dependency('gthread-2.0') ] + --_----------=_1643256381175870--