From nobody Mon Jun 05 18:45:43 2023 X-Original-To: dev-commits-ports-main@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 4QZjGv5GxVz4ZtFL; Mon, 5 Jun 2023 18:45:43 +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 4QZjGv4QyCz3pyh; Mon, 5 Jun 2023 18:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685990743; 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=DQWshcW3FFX69FIT+DONd4XO/0GReYDhQtOcqfyaD8s=; b=dkavzea5os2KoYljQwaY661SZx6J038wQf2UopTanZ3C94RtWhPIb7WtBCRoKfQCPKZeH9 Lp/hP6B8HX8woP7XSYkVgQSKrX2v+iYU7xX931xHjhUey7wgX56/uEalu8eHrqM/aQZxl3 8/71wVUC9hSdkGMkHwH0tjvpW/QK9NCTGPuYFVRE6MEVfTOiaFDj2ZnCSsU/xcovRe+UjJ f+p14qYJxOXCJGHmERgZIEYbXrcRWEfGxZWNpneazb1xQsp0MMRNsn5dyKwwQRoqbcqLuv utb/oQeLtIFomRsMCnJR3YrZD2KBnz2SuFGwkWM9Kg7xn4wQz9xX2PKtOQ9r9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685990743; 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=DQWshcW3FFX69FIT+DONd4XO/0GReYDhQtOcqfyaD8s=; b=jPB6ebfLr8gsSqhhbB4oy+DfFryZUfFP7PgfETEhd1TKFSAlgTQn2VFrzpnAdG1Iwea5uT ++YBHQeU/GbpSrcA7JDKN1SA8E9aWwX9meoltopnsNtCsJtDJKKw6fEdjFxNlexAdb9zJd gE0V6tXdWE5FjF7C7qSIlMA7LclPwkN24BS+ZXbbkSGWymVPossh4ny4h4Tt6f/jNpo55c ThbrGKJ7Oq4QHwzgLdKAcUsxIRffE+AheDyOQ6kp9KtdxPurm0DGYcfvw3GH/jtIqD6tGG 4hYH8LMzpH+XTTRTEQbr7d2scTla088qbn2oiox1HpQPYEkO6to/7qWONWuxXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685990743; a=rsa-sha256; cv=none; b=Rt/PpEkCWf5d8WavTe/KP7ePtZ89jg45kyjOZ+BYfOrVPnmrFNNkFBXivb/WFmLWdNlmSU FHKhP/1VtgC3fCNT94WKq3rntQOng4PHGN1Winb48eJqRM1bvK8wPQoqvL3oyRvOacVmDh TRPPaKob8yq4hw8lWHMnYykC2YmSki7ldjOzKntmtw9EHiXz+eynQqX6B/lE+M3nI9QHAz HuUmL+X4JIsxDGKhWn248dzEYaV5uMHgMRyYmBEv22l67oEB5iY4LYrrPfd3T0gzSJsfyE zu01RlwMub+dLKiSfJQwAW1RuAihvWFXwmFYWqTO/DwRYoyRhqP7NNzbOzeRUg== 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 4QZjGv3Vq5zydP; Mon, 5 Jun 2023 18:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 355Ijh3P032548; Mon, 5 Jun 2023 18:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355IjhY3032547; Mon, 5 Jun 2023 18:45:43 GMT (envelope-from git) Date: Mon, 5 Jun 2023 18:45:43 GMT Message-Id: <202306051845.355IjhY3032547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: 463b5fbc591b - main - sysutils/fusefs-exfat: update to 1.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 463b5fbc591b49446e1f8c07567a3d1372194d5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=463b5fbc591b49446e1f8c07567a3d1372194d5b commit 463b5fbc591b49446e1f8c07567a3d1372194d5b Author: Oleksii Samorukov AuthorDate: 2023-06-05 18:43:11 +0000 Commit: Oleksii Samorukov CommitDate: 2023-06-05 18:45:37 +0000 sysutils/fusefs-exfat: update to 1.4.0 ChangeLog: https://github.com/relan/exfat/blob/master/ChangeLog --- sysutils/fusefs-exfat/Makefile | 3 +- sysutils/fusefs-exfat/distinfo | 6 ++-- sysutils/fusefs-exfat/files/patch-fuse_main.c | 25 ------------- sysutils/fusefs-exfat/files/patch-libexfat_exfat.h | 10 ------ sysutils/fusefs-exfat/files/patch-libexfat_mount.c | 42 ---------------------- sysutils/fusefs-exfat/files/patch-libexfat_utils.c | 18 ---------- 6 files changed, 4 insertions(+), 100 deletions(-) diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile index ce63b317f659..10e39dafb8ae 100644 --- a/sysutils/fusefs-exfat/Makefile +++ b/sysutils/fusefs-exfat/Makefile @@ -1,7 +1,6 @@ PORTNAME= exfat DISTVERSIONPREFIX= v -DISTVERSION= 1.3.0 -PORTREVISION= 1 +DISTVERSION= 1.4.0 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- diff --git a/sysutils/fusefs-exfat/distinfo b/sysutils/fusefs-exfat/distinfo index 9cca7d02e16b..3d2567e5d62d 100644 --- a/sysutils/fusefs-exfat/distinfo +++ b/sysutils/fusefs-exfat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566155165 -SHA256 (relan-exfat-v1.3.0_GH0.tar.gz) = 689bcb4a639acd2d45e6fa0ff455f7f18edb2421d4f4f42909943775adc0e375 -SIZE (relan-exfat-v1.3.0_GH0.tar.gz) = 57846 +TIMESTAMP = 1685988699 +SHA256 (relan-exfat-v1.4.0_GH0.tar.gz) = af560659f55dca0270f94809530f359d6bdad5d313133c68b458fb0a8eeab1c8 +SIZE (relan-exfat-v1.4.0_GH0.tar.gz) = 62390 diff --git a/sysutils/fusefs-exfat/files/patch-fuse_main.c b/sysutils/fusefs-exfat/files/patch-fuse_main.c deleted file mode 100644 index aa2e853d16dd..000000000000 --- a/sysutils/fusefs-exfat/files/patch-fuse_main.c +++ /dev/null @@ -1,25 +0,0 @@ ---- fuse/main.c.orig 2021-11-24 20:45:02 UTC -+++ fuse/main.c -@@ -451,7 +451,7 @@ static char* add_ro_option(char* options, bool ro) - return ro ? add_option(options, "ro", NULL) : options; - } - --#if defined(__linux__) || defined(__FreeBSD__) -+#if defined(__linux__) - static char* add_user_option(char* options) - { - struct passwd* pw; -@@ -492,12 +492,10 @@ static char* add_fuse_options(char* options, const cha - options = add_ro_option(options, ro); - if (options == NULL) - return NULL; --#if defined(__linux__) || defined(__FreeBSD__) -+#if defined(__linux__) - options = add_user_option(options); - if (options == NULL) - return NULL; --#endif --#if defined(__linux__) - options = add_blksize_option(options, CLUSTER_SIZE(*ef.sb)); - if (options == NULL) - return NULL; diff --git a/sysutils/fusefs-exfat/files/patch-libexfat_exfat.h b/sysutils/fusefs-exfat/files/patch-libexfat_exfat.h deleted file mode 100644 index 2b5d7cf8473e..000000000000 --- a/sysutils/fusefs-exfat/files/patch-libexfat_exfat.h +++ /dev/null @@ -1,10 +0,0 @@ ---- libexfat/exfat.h.orig 2018-09-15 05:03:24 UTC -+++ libexfat/exfat.h -@@ -201,6 +201,7 @@ le16_t exfat_calc_name_hash(const struct exfat* ef, co - void exfat_humanize_bytes(uint64_t value, struct exfat_human_bytes* hb); - void exfat_print_info(const struct exfat_super_block* sb, - uint32_t free_clusters); -+bool exfat_match_option(const char* options, const char* option_name); - - int utf16_to_utf8(char* output, const le16_t* input, size_t outsize, - size_t insize); diff --git a/sysutils/fusefs-exfat/files/patch-libexfat_mount.c b/sysutils/fusefs-exfat/files/patch-libexfat_mount.c deleted file mode 100644 index 66d6096e3131..000000000000 --- a/sysutils/fusefs-exfat/files/patch-libexfat_mount.c +++ /dev/null @@ -1,42 +0,0 @@ ---- libexfat/mount.c.orig 2018-09-15 05:03:24 UTC -+++ libexfat/mount.c -@@ -79,18 +79,6 @@ static int get_int_option(const char* options, const c - return strtol(p, NULL, base); - } - --static bool match_option(const char* options, const char* option_name) --{ -- const char* p; -- size_t length = strlen(option_name); -- -- for (p = strstr(options, option_name); p; p = strstr(p + 1, option_name)) -- if ((p == options || p[-1] == ',') && -- (p[length] == ',' || p[length] == '\0')) -- return true; -- return false; --} -- - static void parse_options(struct exfat* ef, const char* options) - { - int opt_umask; -@@ -102,7 +90,7 @@ static void parse_options(struct exfat* ef, const char - ef->uid = get_int_option(options, "uid", 10, geteuid()); - ef->gid = get_int_option(options, "gid", 10, getegid()); - -- ef->noatime = match_option(options, "noatime"); -+ ef->noatime = exfat_match_option(options, "noatime"); - - switch (get_int_option(options, "repair", 10, 0)) - { -@@ -205,9 +193,9 @@ int exfat_mount(struct exfat* ef, const char* spec, co - - parse_options(ef, options); - -- if (match_option(options, "ro")) -+ if (exfat_match_option(options, "ro")) - mode = EXFAT_MODE_RO; -- else if (match_option(options, "ro_fallback")) -+ else if (exfat_match_option(options, "ro_fallback")) - mode = EXFAT_MODE_ANY; - else - mode = EXFAT_MODE_RW; diff --git a/sysutils/fusefs-exfat/files/patch-libexfat_utils.c b/sysutils/fusefs-exfat/files/patch-libexfat_utils.c deleted file mode 100644 index 0bb23430d4a9..000000000000 --- a/sysutils/fusefs-exfat/files/patch-libexfat_utils.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libexfat/utils.c.orig 2018-09-15 05:03:24 UTC -+++ libexfat/utils.c -@@ -178,3 +178,15 @@ void exfat_print_info(const struct exfat_super_block* - exfat_humanize_bytes(avail_space, &hb); - printf("Available space %10"PRIu64" %s\n", hb.value, hb.unit); - } -+ -+bool exfat_match_option(const char* options, const char* option_name) -+{ -+ const char* p; -+ size_t length = strlen(option_name); -+ -+ for (p = strstr(options, option_name); p; p = strstr(p + 1, option_name)) -+ if ((p == options || p[-1] == ',') && -+ (p[length] == ',' || p[length] == '\0')) -+ return true; -+ return false; -+}