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 CF5AA1A9239 for ; Thu, 27 Jan 2022 04:15:46 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3C1B884E90; Thu, 27 Jan 2022 04:15:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7723084E74 for ; Thu, 27 Jan 2022 04:15:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0uY_vR95ZQ9h for ; Thu, 27 Jan 2022 04:15:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EB99A84E64 for ; Thu, 27 Jan 2022 04:15:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E540EFB24; Thu, 27 Jan 2022 04:15:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1643256944144010" MIME-Version: 1.0 Date: Thu, 27 Jan 2022 04:15:44 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/filesystems/fuse-wdfs To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20220127041544.E540EFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1643256944144010 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:15:44 UTC 2022 Modified Files: pkgsrc/filesystems/fuse-wdfs: distinfo pkgsrc/filesystems/fuse-wdfs/patches: patch-aa Log Message: Fix build on NetBSD 9 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/fuse-wdfs/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/fuse-wdfs/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1643256944144010 Content-Disposition: inline Content-Length: 1904 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/filesystems/fuse-wdfs/distinfo diff -u pkgsrc/filesystems/fuse-wdfs/distinfo:1.8 pkgsrc/filesystems/fuse-wdfs/distinfo:1.9 --- pkgsrc/filesystems/fuse-wdfs/distinfo:1.8 Sat Jan 22 18:50:23 2022 +++ pkgsrc/filesystems/fuse-wdfs/distinfo Thu Jan 27 04:15:44 2022 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2022/01/22 18:50:23 pho Exp $ +$NetBSD: distinfo,v 1.9 2022/01/27 04:15:44 pho Exp $ BLAKE2s (wdfs-1.4.2.tar.gz) = 8048713564688dc8e4529a93d31612638065d346fdcec98e2329600cf6d2bb75 SHA512 (wdfs-1.4.2.tar.gz) = da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004 Size (wdfs-1.4.2.tar.gz) = 109315 bytes -SHA1 (patch-aa) = 1acb91eea14670c048eba39f48deb88a6c52d8cf +SHA1 (patch-aa) = af1963fab0b0334286d6ec497af41930d065e08a SHA1 (patch-ab) = 1237cdd4baf150899b4d9ea1073d399ffe925a64 Index: pkgsrc/filesystems/fuse-wdfs/patches/patch-aa diff -u pkgsrc/filesystems/fuse-wdfs/patches/patch-aa:1.4 pkgsrc/filesystems/fuse-wdfs/patches/patch-aa:1.5 --- pkgsrc/filesystems/fuse-wdfs/patches/patch-aa:1.4 Sat Jan 22 18:50:23 2022 +++ pkgsrc/filesystems/fuse-wdfs/patches/patch-aa Thu Jan 27 04:15:44 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2022/01/22 18:50:23 pho Exp $ +$NetBSD: patch-aa,v 1.5 2022/01/27 04:15:44 pho Exp $ refuse(3) used to not support -ho in option_list. Already fixed in HEAD. @@ -20,3 +20,12 @@ HEAD. exit(1); case KEY_VERSION: +@@ -1308,7 +1314,7 @@ static void print_help() + /* just a simple wrapper for fuse_main(), because the interface changed... */ + static int call_fuse_main(struct fuse_args *args) + { +-#if FUSE_VERSION >= 26 ++#if (!defined(__NetBSD__) || FUSE_H_ >= 20211204) && FUSE_VERSION >= 26 + return fuse_main(args->argc, args->argv, &wdfs_operations, NULL); + #else + return fuse_main(args->argc, args->argv, &wdfs_operations); --_----------=_1643256944144010--