CVS commit: pkgsrc/filesystems/fuse-curlftpfs

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan  6 03:27:13 UTC 2022

Modified Files:
        pkgsrc/filesystems/fuse-curlftpfs: Makefile distinfo
Added Files:
        pkgsrc/filesystems/fuse-curlftpfs/patches: patch-ftpfs.c

Log Message:
Fix a segfault on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/filesystems/fuse-curlftpfs/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/filesystems/fuse-curlftpfs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse-curlftpfs/Makefile
diff -u pkgsrc/filesystems/fuse-curlftpfs/Makefile:1.38 pkgsrc/filesystems/fuse-curlftpfs/Makefile:1.39
--- pkgsrc/filesystems/fuse-curlftpfs/Makefile:1.38     Wed Dec  8 16:04:20 2021
+++ pkgsrc/filesystems/fuse-curlftpfs/Makefile  Thu Jan  6 03:27:13 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2021/12/08 16:04:20 adam Exp $
+# $NetBSD: Makefile,v 1.39 2022/01/06 03:27:13 pho Exp $
 #
 
 DISTNAME=      curlftpfs-0.9.2
 PKGNAME=       fuse-${DISTNAME}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=curlftpfs/}
 

Index: pkgsrc/filesystems/fuse-curlftpfs/distinfo
diff -u pkgsrc/filesystems/fuse-curlftpfs/distinfo:1.10 pkgsrc/filesystems/fuse-curlftpfs/distinfo:1.11
--- pkgsrc/filesystems/fuse-curlftpfs/distinfo:1.10     Tue Oct 26 10:25:27 2021
+++ pkgsrc/filesystems/fuse-curlftpfs/distinfo  Thu Jan  6 03:27:13 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:25:27 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/01/06 03:27:13 pho Exp $
 
 BLAKE2s (curlftpfs-0.9.2.tar.gz) = 52617dea8aa88fc52b96ed72b1ac2874f27b5a534a525085dcd6a8f9d0713ca5
 SHA512 (curlftpfs-0.9.2.tar.gz) = df07c418d175f766c89525017fc56e79726061eee0c3a6607ded0e1bf24f64f1475ba0e546157b65892194e3c4414c120822bf8fb175437e68366f82de216067
 Size (curlftpfs-0.9.2.tar.gz) = 365503 bytes
+SHA1 (patch-ftpfs.c) = dbf37d8dd42624a964bd6208662471972c8f2693
 SHA1 (patch-ftpfs.h) = e658fe0e9fffa47e69fe35c9f1a8f465aa5c45e6
 SHA1 (patch-tests_run__tests.sh) = 2b7b20f3490b8fc0026c148b2a9d7dbac2a33362

Added files:

Index: pkgsrc/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c
diff -u /dev/null pkgsrc/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c:1.1
--- /dev/null   Thu Jan  6 03:27:13 2022
+++ pkgsrc/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c     Thu Jan  6 03:27:13 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-ftpfs.c,v 1.1 2022/01/06 03:27:13 pho Exp $
+
+Destroying an uninitialized sem_t results in a segfault on
+NetBSD. Just don't do that.
+
+--- ftpfs.c.orig       2022-01-06 03:19:08.654567401 +0000
++++ ftpfs.c
+@@ -611,10 +611,6 @@ static void free_ftpfs_file(struct ftpfs
+     curl_easy_cleanup(fh->write_conn);
+   g_free(fh->full_path);
+   g_free(fh->open_path);
+-  sem_destroy(&fh->data_avail);
+-  sem_destroy(&fh->data_need);
+-  sem_destroy(&fh->data_written);
+-  sem_destroy(&fh->ready);
+   free(fh);
+ }
+