From nobody Wed Sep 06 06:34:41 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgXfT3NDKz4s02k; Wed, 6 Sep 2023 06:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgXfT2xwvz4TPX; Wed, 6 Sep 2023 06:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693982081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ccvq2cH7mxLQaaqIWqsJE9kXk8tjR8AHPBmZi7Plpnc=; b=dbtSqEyGqGWapSiZ7YmMsZeQ2gqKM03jc5eMXvqtX3L31T0yDwsvH0dwmRziyAEwZ58oCn c+BTFTMO8hxZn1fAq7rr7o8IH496NDy27LCbSxU6Cda0ed5r6w2WAoVbKqlSp2E4rh5gd3 QlK62sPBIW4Ms8yHG2Fzfb8z6/5E0CT5iuPopCg4wrMXlgkSMNCnHnqRy+kM5+zeriewv6 giJFOajqzTivmSL67P9luF374LjhOxotpjgYhDAuYK0appzYQs5KYoTP4wg197VogJ4M9n 6vIGv8qQrmiQ1TdhIxJy3oFB3WIcP7IPYAjNrkhAWITnmns0asN6/uJ5b10cjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693982081; a=rsa-sha256; cv=none; b=ZYskg1PQygvDyVC175tRC7SmfmbOVpGCZnLjrp969W385htCK1Fs8S/7IxO9IcrF8Qnz0b v8VaJVNuMRyfEkdNc3mbfXImBPejc1V+9rS1VranM2J6yloqZeqdLKXkOoZgMWZusLzM4O SbNbFV5cp7OvM09oJAUWFbtXVnqtkWvTwIS1kklVObaY+FNz9nmBJ+LeK1UneGSf9IRKnp Oj2fsS/aJn+YCAXEdALNexnSs7v1sThXLZVbehPPzGNIKNZD1arqNS577GUirc7mBkkuJP PRpDT7A+skPPmP5wGZ/WYKfXR/7d7yX2c95fH8k9dic9oSnAI/XrCeUpNPK4+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693982081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ccvq2cH7mxLQaaqIWqsJE9kXk8tjR8AHPBmZi7Plpnc=; b=QDRR5+fikiRfHd9SVqvZyOiI8TViZ3J2cQlfkPYqQhKctgJdgVntgLzWYJOLsn6OPQbl8O vczJc8ejPskgZpwfph9YNKopz3EEkBYEc03d38y9/ow7Qet1Nwdp+RkuVfOn21iu9AA0QD +1c+zgflznkHgAmzpctrgCzKs/s1aX3p8/Baw7aO4elu/5ZKYHMJVwWn8ZIpsG/5uD5g0A seoBo33vk+K2vP37XD9wVuwnN5GYQmy9vcNyqPIjHartPhCsbI15HKqxGx5vkmjiuSIvDw /MzdJsexeho4QKW6n+m4Kd2YiZM16LTcRc1vUfPFSFP5jT+bpDWVPg0DcCy//g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RgXfT214Mz15FS; Wed, 6 Sep 2023 06:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3866YfTU089367; Wed, 6 Sep 2023 06:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3866Yf4c089364; Wed, 6 Sep 2023 06:34:41 GMT (envelope-from git) Date: Wed, 6 Sep 2023 06:34:41 GMT Message-Id: <202309060634.3866Yf4c089364@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emanuel Haupt Subject: git: cda87414cd25 - 2023Q3 - sysutils/fusefs-ext2: Allow default_permissions override List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: cda87414cd252a8938f8b044b29f685c5b89c008 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=cda87414cd252a8938f8b044b29f685c5b89c008 commit cda87414cd252a8938f8b044b29f685c5b89c008 Author: Alan Somers AuthorDate: 2023-09-06 06:30:49 +0000 Commit: Emanuel Haupt CommitDate: 2023-09-06 06:34:28 +0000 sysutils/fusefs-ext2: Allow default_permissions override The fuse-ext2 program always enables the default_permissions and allow_other options. This is wrong. The user should be able to override those. Since upstream appears to be unmaintained (no commits for 3 years), patch this bug locally. PR: 273586 (cherry picked from commit 90d93d75b9d18e66b76d0b30b9675e7928b93bc5) --- .../fusefs-ext2/files/patch-fuse-ext2_fuse-ext2.c | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/sysutils/fusefs-ext2/files/patch-fuse-ext2_fuse-ext2.c b/sysutils/fusefs-ext2/files/patch-fuse-ext2_fuse-ext2.c new file mode 100644 index 000000000000..6b12035108f4 --- /dev/null +++ b/sysutils/fusefs-ext2/files/patch-fuse-ext2_fuse-ext2.c @@ -0,0 +1,61 @@ +--- fuse-ext2/fuse-ext2.c.orig 2019-05-09 08:29:33 UTC ++++ fuse-ext2/fuse-ext2.c +@@ -18,15 +18,14 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + ++#include + #include "fuse-ext2.h" + + static const char *HOME = "http://github.com/alperakcan/fuse-ext2/"; + + #if __FreeBSD__ == 10 +-static char def_opts[] = "allow_other,default_permissions,local,"; + static char def_opts_rd[] = "noappledouble,"; + #else +-static char def_opts[] = "allow_other,default_permissions,"; + static char def_opts_rd[] = ""; + #endif + +@@ -171,8 +170,10 @@ static int parse_options (int argc, char *argv[], stru + static char * parse_mount_options (const char *orig_opts, struct extfs_data *opts) + { + char *options, *s, *opt, *val, *ret; ++ bool allow_other = true; ++ bool default_permissions = true; + +- ret = malloc(strlen(def_opts) + strlen(def_opts_rd) + strlen(orig_opts) + 256 + PATH_MAX); ++ ret = malloc(strlen(def_opts_rd) + strlen(orig_opts) + 256 + PATH_MAX); + if (!ret) { + return NULL; + } +@@ -231,6 +232,14 @@ static char * parse_mount_options (const char *orig_op + #if __FreeBSD__ == 10 + strcat(ret, "force,"); + #endif ++ } else if (!strcmp(opt, "noallow_other")) { ++ allow_other = false; ++ strcat(ret, opt); ++ strcat(ret, ","); ++ } else if (!strcmp(opt, "nodefault_permissions")) { ++ default_permissions = false; ++ strcat(ret, opt); ++ strcat(ret, ","); + } else { /* Probably FUSE option. */ + strcat(ret, opt); + if (val) { +@@ -246,7 +255,13 @@ static char * parse_mount_options (const char *orig_op + opts->readonly = 1; + } + +- strcat(ret, def_opts); ++ if (allow_other) ++ strcat(ret, "allow_other,"); ++ if (default_permissions) ++ strcat(ret, "default_permissions,"); ++#if __FreeBSD__ == 10 ++ strcat(ret, "local,"); ++#endif + if (opts->readonly == 1) { + strcat(ret, def_opts_rd); + strcat(ret, "ro,");