Index: sysutils/fusefs-smbnetfs/Makefile =================================================================== --- sysutils/fusefs-smbnetfs/Makefile (revision 536609) +++ sysutils/fusefs-smbnetfs/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= smbnetfs -PORTVERSION= 0.6.1 -PORTREVISION= 3 +PORTVERSION= 0.6.2 CATEGORIES= sysutils net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION} PKGNAMEPREFIX= fusefs- Index: sysutils/fusefs-smbnetfs/distinfo =================================================================== --- sysutils/fusefs-smbnetfs/distinfo (revision 536609) +++ sysutils/fusefs-smbnetfs/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517243562 -SHA256 (smbnetfs-0.6.1.tar.bz2) = 848b8ee4c1b5cc4c83ee35736cb28e1ddcd5789cca948f060e8cb76baa95380a -SIZE (smbnetfs-0.6.1.tar.bz2) = 171032 +TIMESTAMP = 1590478609 +SHA256 (smbnetfs-0.6.2.tar.bz2) = 205b2d32a8b9d9f5093e82c9a4f9fc086baecf8457df4c8b51898334d149a9a7 +SIZE (smbnetfs-0.6.2.tar.bz2) = 174322 Index: sysutils/fusefs-smbnetfs/files/patch-3 =================================================================== --- sysutils/fusefs-smbnetfs/files/patch-3 (revision 536609) +++ sysutils/fusefs-smbnetfs/files/patch-3 (nonexistent) @@ -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, Property changes on: sysutils/fusefs-smbnetfs/files/patch-3 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: sysutils/fusefs-smbnetfs/files/patch-bug47 =================================================================== --- sysutils/fusefs-smbnetfs/files/patch-bug47 (revision 536609) +++ sysutils/fusefs-smbnetfs/files/patch-bug47 (nonexistent) @@ -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) Property changes on: sysutils/fusefs-smbnetfs/files/patch-bug47 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: sysutils/fusefs-smbnetfs/files/patch-src_function.c =================================================================== --- sysutils/fusefs-smbnetfs/files/patch-src_function.c (revision 536609) +++ sysutils/fusefs-smbnetfs/files/patch-src_function.c (nonexistent) @@ -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 Property changes on: sysutils/fusefs-smbnetfs/files/patch-src_function.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: sysutils/fusefs-smbnetfs/files/patch-src_list.h =================================================================== --- sysutils/fusefs-smbnetfs/files/patch-src_list.h (revision 536609) +++ sysutils/fusefs-smbnetfs/files/patch-src_list.h (nonexistent) @@ -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; Property changes on: sysutils/fusefs-smbnetfs/files/patch-src_list.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property