Attachment 241450 Details for Bug 270806 – Patch

[patch] Patch

0001-sysutils-fusefs-smbnetfs-Update-to-0.6.3.patch (text/plain), 9.23 KB, created by Kevin Zheng on 2023-04-12 21:58:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2023-04-12 21:58:15 UTC

Size: 9.23 KB

patch

obsolete

>From 4f3930c1335fdafb19eec7e499a45450af199169 Mon Sep 17 00:00:00 2001
>From: Kevin Zheng <kevinz5000@gmail.com>
>Date: Wed, 12 Apr 2023 14:36:47 -0700
>Subject: [PATCH] sysutils/fusefs-smbnetfs: Update to 0.6.3
>
>---
> sysutils/fusefs-smbnetfs/Makefile             |   3 +-
> sysutils/fusefs-smbnetfs/distinfo             |   6 +-
> sysutils/fusefs-smbnetfs/files/patch-3        | 117 ------------------
> sysutils/fusefs-smbnetfs/files/patch-bug47    |  12 --
> .../files/patch-src_function.c                |  12 --
> .../fusefs-smbnetfs/files/patch-src_list.h    |  38 ------
> 6 files changed, 4 insertions(+), 184 deletions(-)
> delete mode 100644 sysutils/fusefs-smbnetfs/files/patch-3
> delete mode 100644 sysutils/fusefs-smbnetfs/files/patch-bug47
> delete mode 100644 sysutils/fusefs-smbnetfs/files/patch-src_function.c
> delete mode 100644 sysutils/fusefs-smbnetfs/files/patch-src_list.h
>
>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 <dirent.h>
>- #include <sys/statvfs.h>
>- #include <sys/types.h>
>-+#ifdef __linux__
>- #include <attr/xattr.h>
>-+#endif
>- #include <time.h>
>- #include <pthread.h>
>- #include <libsmbclient.h>
>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;
>-- 
>2.40.0
>

Actions: View | Diff

Attachments on bug 270806: 241450