From nobody Fri Apr 21 07:11:24 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 4Q2m0X5pHHz461WH; Fri, 21 Apr 2023 07:11:24 +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 4Q2m0X5KZhz3hqY; Fri, 21 Apr 2023 07:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682061084; 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=+uzBsQiAPCUOLVj31u1OR/ov7svlBJ2gpXyj7WKpsvY=; b=OVXaURWDp3ldC4u2zqKtCnsRzT2XM+SIh/qiG5NINEJ4oJ96OUZPLdm8gij7CiKjLFTJNU pCv5na4KvoJ4NwwEpCQazE57vwd0RhjMjVCgsD5TUqea8cajJ35soJ3HC247JBByf0J74h aX0/Yr46/j5mHxygpJRJRujbM7pFYw1Dz/A3/FhlWwYUjAZmVmXKoSzcet22xrvn5ktYcl qVPaC2vbICbCl4YkuiQrG6uK9lbU219u7ThiT7iDKpveBSWbav6AIUsWImo3IiOFcw9e5n KIZNxUmY82zGwRvU2v3GZkR13QHRLbKpAwIhJXJak/RlOiBdfvzh7j2A/Rmg3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682061084; 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=+uzBsQiAPCUOLVj31u1OR/ov7svlBJ2gpXyj7WKpsvY=; b=Y0Fzttb1iHIsnza1HqlsMFa263HwG7JIUxznZxfprjQI3Yi/kNYlrTFwDd2IjBSYGJ70og Yo4KFbF8Ne/nPdNquDwA5AVZgoVKN7azvjTqX20nAOAlAL++a2DyPDc2d2qxMgbA8EpxXk 4MX4eQI4ztvKJ6Bs3wy5tmUJYnlQHYszcTqRhX1RrTdctflzIXiQGps+aVF/bObrTrTg6L pG8I0zjkXyZY6QXjrHmt34Ig5Lwb0skdu0fyQXNP1sAbVA6tGKbtRRt8eDL71jlxAXkIG2 URAPrXj79kuwsIMUfKG2k1ip3SxmRRshzMgCOPd360EAoJN1A/nkNfI2UAZJdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682061084; a=rsa-sha256; cv=none; b=f4qHKTqkN8zubox4vJ/ZbwkIA0Vv4UnA0mh4kRyTlZU1h3rn9g2L+Ks84M9eTcq2cIFVb7 3LKK6vk70BSqL0LI0OX93JQ7v6ALZVFPMUy8TBWfEm6g1KQC1vYVTsLY3jS9uKpPtAQvT5 YfG/G4ozTkWHZS4z/0ruq8jKybSdD4fcjuy2BWqPTc7/eZljjRADq9D5lQ0a6h95SU408e sONwXKCqobb6LAZYpWQdxLCIAB/LUKJFqLNRWoouo4X4L5ihqPCLvsVX8+hNqbtp+h9eee us8CiQe4WfmiK9gGj3R8hqZBIs3Cw1JqXIllNqnWN0iQ15iFtovnFqXsty+Jug== 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 4Q2m0X4RC5z19rs; Fri, 21 Apr 2023 07:11:24 +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 33L7BO9x026573; Fri, 21 Apr 2023 07:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33L7BOqP026572; Fri, 21 Apr 2023 07:11:24 GMT (envelope-from git) Date: Fri, 21 Apr 2023 07:11:24 GMT Message-Id: <202304210711.33L7BOqP026572@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 63920b7a18f3 - main - sysutils/fusefs-smbnetfs: Update to 0.6.3 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63920b7a18f3db7d75da1b5641421bb2439c5b13 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=63920b7a18f3db7d75da1b5641421bb2439c5b13 commit 63920b7a18f3db7d75da1b5641421bb2439c5b13 Author: Kevin Zheng AuthorDate: 2023-04-13 09:53:30 +0000 Commit: Fernando Apesteguía CommitDate: 2023-04-21 07:06:30 +0000 sysutils/fusefs-smbnetfs: Update to 0.6.3 * fix opening a file with O_CREAT * fix wrong subsecond value in times * add noexec option support * it's now possible to disable libsecret * minor cleanup PR: 270806 Reported by: kevinz5000@gmail.com Approved by: mi@ALDAN.algebra.com (maintainer, timeout > 2 weeks) --- sysutils/fusefs-smbnetfs/Makefile | 3 +- sysutils/fusefs-smbnetfs/distinfo | 6 +- sysutils/fusefs-smbnetfs/files/patch-3 | 117 --------------------- sysutils/fusefs-smbnetfs/files/patch-bug47 | 12 --- .../fusefs-smbnetfs/files/patch-src_function.c | 12 --- sysutils/fusefs-smbnetfs/files/patch-src_list.h | 38 ------- 6 files changed, 4 insertions(+), 184 deletions(-) diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile index 0736c1f59b38..12a2d8080513 100644 --- a/sysutils/fusefs-smbnetfs/Makefile +++ b/sysutils/fusefs-smbnetfs/Makefile @@ -1,6 +1,5 @@ PORTNAME= smbnetfs -PORTVERSION= 0.6.1 -PORTREVISION= 4 +PORTVERSION= 0.6.3 CATEGORIES= sysutils net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION} PKGNAMEPREFIX= fusefs- diff --git a/sysutils/fusefs-smbnetfs/distinfo b/sysutils/fusefs-smbnetfs/distinfo index 2a24f88335be..3e27f3e6cd71 100644 --- a/sysutils/fusefs-smbnetfs/distinfo +++ b/sysutils/fusefs-smbnetfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517243562 -SHA256 (smbnetfs-0.6.1.tar.bz2) = 848b8ee4c1b5cc4c83ee35736cb28e1ddcd5789cca948f060e8cb76baa95380a -SIZE (smbnetfs-0.6.1.tar.bz2) = 171032 +TIMESTAMP = 1681329971 +SHA256 (smbnetfs-0.6.3.tar.bz2) = eac37b9769fbe9c3f4baf3eb64c61a6b59ad4f2aa05dfddcba5a1ac4adf4d560 +SIZE (smbnetfs-0.6.3.tar.bz2) = 187460 diff --git a/sysutils/fusefs-smbnetfs/files/patch-3 b/sysutils/fusefs-smbnetfs/files/patch-3 deleted file mode 100644 index 4e609697a053..000000000000 --- a/sysutils/fusefs-smbnetfs/files/patch-3 +++ /dev/null @@ -1,117 +0,0 @@ -Part of the: - - https://sourceforge.net/p/smbnetfs/patches/3/ - ---- src/samba.h 2018-01-04 20:59:38.000000000 +0000 -+++ src/samba.h 2018-01-31 14:48:19.375119000 +0000 -@@ -16,6 +16,6 @@ - samba_fd samba_open (const char *url, int flags, mode_t mode); - samba_fd samba_creat (const char *url, mode_t mode); --ssize_t samba_read (samba_fd fd, off_t offset, void *buf, size_t bufsize); --ssize_t samba_write (samba_fd fd, off_t offset, void *buf, size_t bufsize); -+ssize_t samba_read (samba_fd fd, off_t offset, char *buf, size_t bufsize); -+ssize_t samba_write (samba_fd fd, off_t offset, const char *buf, size_t bufsize); - int samba_close (samba_fd fd); - int samba_unlink (const char *url); ---- src/samba.c 2018-01-04 20:59:38.000000000 +0000 -+++ src/samba.c 2018-01-31 14:49:26.546183000 +0000 -@@ -255,5 +255,5 @@ - } - --ssize_t samba_read(samba_fd fd, off_t offset, void *buf, size_t bufsize){ -+ssize_t samba_read(samba_fd fd, off_t offset, char *buf, size_t bufsize){ - ssize_t result = 0; - -@@ -278,5 +278,5 @@ - } - --ssize_t samba_write(samba_fd fd, off_t offset, void *buf, size_t bufsize){ -+ssize_t samba_write(samba_fd fd, off_t offset, const char *buf, size_t bufsize){ - ssize_t result = 0; - -Constify the writing and reduce the number of calls to time(). - - -mi - ---- src/smb_conn.h 2018-01-04 20:59:38 -+++ src/smb_conn.h 2018-01-31 14:55:24 -@@ -46,5 +46,5 @@ - ssize_t smb_conn_write(struct smb_conn_ctx *ctx, - smb_conn_fd fd, off_t offset, -- void *buf, size_t bufsize); -+ const void *buf, size_t bufsize); - int smb_conn_close(struct smb_conn_ctx *ctx, - smb_conn_fd fd); ---- src/smb_conn.c 2018-01-04 20:59:38 -+++ src/smb_conn.c 2018-01-31 14:54:37 -@@ -630,6 +630,5 @@ - - pthread_mutex_lock(&ctx->mutex); -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - error = smb_conn_process_query( - ctx, OPEN, -@@ -676,6 +675,5 @@ - - pthread_mutex_lock(&ctx->mutex); -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - error = smb_conn_process_query( - ctx, CREAT, -@@ -719,6 +717,5 @@ - pthread_mutex_lock(&ctx->mutex); - if ((file->reopen_cmd == OPEN) && (file->ctx == ctx)){ -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - error = smb_conn_process_fd_query( - ctx, READ, file, -@@ -740,5 +737,5 @@ - ssize_t smb_conn_write(struct smb_conn_ctx *ctx, - smb_conn_fd fd, off_t offset, -- void *buf, size_t bufsize){ -+ const void *buf, size_t bufsize){ - - int error; -@@ -762,6 +759,5 @@ - pthread_mutex_lock(&ctx->mutex); - if ((file->reopen_cmd == OPEN) && (file->ctx == ctx)){ -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - memcpy(ctx->shmem_ptr, buf, bufsize); - msync(ctx->shmem_ptr, bufsize, MS_SYNC); -@@ -886,6 +882,5 @@ - - pthread_mutex_lock(&ctx->mutex); -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - error = smb_conn_process_query( - ctx, OPENDIR, -@@ -964,6 +959,5 @@ - pthread_mutex_lock(&ctx->mutex); - if ((file->reopen_cmd == OPENDIR) && (file->ctx == ctx)){ -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - - /* we cant reopen directory with non-zero offset, so use */ -@@ -1104,6 +1098,5 @@ - pthread_mutex_lock(&ctx->mutex); - if ((file->reopen_cmd == OPEN) && (file->ctx == ctx)){ -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - error = smb_conn_process_fd_query( - ctx, FSTAT, file, -@@ -1141,6 +1134,5 @@ - pthread_mutex_lock(&ctx->mutex); - if ((file->reopen_cmd == OPEN) && (file->ctx == ctx)){ -- ctx->access_time = time(NULL); -- file->access_time = time(NULL); -+ ctx->access_time = file->access_time = time(NULL); - error = smb_conn_process_fd_query( - ctx, FTRUNCATE, file, diff --git a/sysutils/fusefs-smbnetfs/files/patch-bug47 b/sysutils/fusefs-smbnetfs/files/patch-bug47 deleted file mode 100644 index 73c1ec3ed5b8..000000000000 --- a/sysutils/fusefs-smbnetfs/files/patch-bug47 +++ /dev/null @@ -1,12 +0,0 @@ -See: - https://sourceforge.net/p/smbnetfs/git/ci/fc721fecd9ea47a671cfa3acc4d2d0127bfdfc8c/ - ---- src/reconfigure.c 2018-01-04 15:59:38.000000000 -0500 -+++ src/reconfigure.c 2019-10-03 09:25:22.227842000 -0400 -@@ -295,5 +295,5 @@ - #ifdef HAVE_LIBSECRET - /* auth-libsecret.h */ -- if (strcasecmp(option, "use_libsecter") == 0) -+ if (strcasecmp(option, "use_libsecret") == 0) - return reconfigure_set_boolean(value, libsecret_enable); - if (strcasecmp(option, "libsecret_timeout") == 0) diff --git a/sysutils/fusefs-smbnetfs/files/patch-src_function.c b/sysutils/fusefs-smbnetfs/files/patch-src_function.c deleted file mode 100644 index a4ce99b32485..000000000000 --- a/sysutils/fusefs-smbnetfs/files/patch-src_function.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/function.c 2018-01-04 20:59:38 UTC -+++ src/function.c -@@ -8,7 +8,9 @@ - #include - #include - #include -+#ifdef __linux__ - #include -+#endif - #include - #include - #include diff --git a/sysutils/fusefs-smbnetfs/files/patch-src_list.h b/sysutils/fusefs-smbnetfs/files/patch-src_list.h deleted file mode 100644 index a58d33c28366..000000000000 --- a/sysutils/fusefs-smbnetfs/files/patch-src_list.h +++ /dev/null @@ -1,38 +0,0 @@ ---- src/list.h 2018-01-04 20:59:38 UTC -+++ src/list.h -@@ -23,7 +23,7 @@ static inline LIST* last_list_elem(LIST - - static inline void add_to_list(LIST *list, LIST *elem){ - /* Yes, i want SIGSEGV for debug */ -- if ((elem->next != NULL) || (elem->prev != NULL)) *((char*)NULL) = '\0'; -+ if ((elem->next != NULL) || (elem->prev != NULL)) __builtin_trap(); - - elem->next = list->next; - elem->prev = list; -@@ -33,7 +33,7 @@ static inline void add_to_list(LIST *lis - - static inline void add_to_list_back(LIST *list, LIST *elem){ - /* Yes, i want SIGSEGV for debug */ -- if ((elem->next != NULL) || (elem->prev != NULL)) *((char*)NULL) = '\0'; -+ if ((elem->next != NULL) || (elem->prev != NULL)) __builtin_trap(); - - elem->next = list; - elem->prev = list->prev; -@@ -45,7 +45,7 @@ static inline void insert_to_list_after( - (void)list; - - /* Yes, i want SIGSEGV for debug */ -- if ((new_elem->next != NULL) || (new_elem->prev != NULL)) *((char*)NULL) = '\0'; -+ if ((new_elem->next != NULL) || (new_elem->prev != NULL)) __builtin_trap(); - - new_elem->next = elem->next; - new_elem->prev = elem; -@@ -57,7 +57,7 @@ static inline void insert_to_list_before - (void)list; - - /* Yes, i want SIGSEGV for debug */ -- if ((new_elem->next != NULL) || (new_elem->prev != NULL)) *((char*)NULL) = '\0'; -+ if ((new_elem->next != NULL) || (new_elem->prev != NULL)) __builtin_trap(); - - new_elem->next = elem; - new_elem->prev = elem->prev;