summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpho <pho@pkgsrc.org>2022-01-06 03:27:13 +0000
committerpho <pho@pkgsrc.org>2022-01-06 03:27:13 +0000
commitd4420639f9635f28c33a118d92107b13339d692d (patch)
treec41b05fe11cde83b4d2547682b4c5f07cd28bbbf
parentbcf795abb0dacef8bcbce90fe80dcc343d66e5e5 (diff)
downloadpkgsrc-d4420639f9635f28c33a118d92107b13339d692d.tar.gz
Fix a segfault on NetBSD
-rw-r--r--filesystems/fuse-curlftpfs/Makefile4
-rw-r--r--filesystems/fuse-curlftpfs/distinfo3
-rw-r--r--filesystems/fuse-curlftpfs/patches/patch-ftpfs.c18
3 files changed, 22 insertions, 3 deletions
diff --git a/filesystems/fuse-curlftpfs/Makefile b/filesystems/fuse-curlftpfs/Makefile
index b78ad4c3b31..b26661fb5f4 100644
--- a/filesystems/fuse-curlftpfs/Makefile
+++ b/filesystems/fuse-curlftpfs/Makefile
@@ -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/}
diff --git a/filesystems/fuse-curlftpfs/distinfo b/filesystems/fuse-curlftpfs/distinfo
index b7166b9b523..f11535cf9f3 100644
--- a/filesystems/fuse-curlftpfs/distinfo
+++ b/filesystems/fuse-curlftpfs/distinfo
@@ -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
diff --git a/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c b/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c
new file mode 100644
index 00000000000..d3dbc810664
--- /dev/null
+++ b/filesystems/fuse-curlftpfs/patches/patch-ftpfs.c
@@ -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);
+ }
+