commit: 202afe1fa72291680eeb1548d68981f9b049671b
parent 79ee6160fe37f048935ec80ed66309fb3e4fe288
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 23 Apr 2019 21:45:42 -0700
sshfs: Update to 3.5.2
Diffstat:
7 files changed, 75 insertions(+), 74 deletions(-)
diff --git a/pkg/sshfs/config.h b/pkg/sshfs/config.h
@@ -1,2 +1,2 @@
#define IDMAP_DEFAULT "none"
-#define PACKAGE_VERSION "3.5.1"
+#define PACKAGE_VERSION "3.5.2"
diff --git a/pkg/sshfs/patch/0002-Use-a-compact-array-and-free-list-for-requests.patch b/pkg/sshfs/patch/0002-Use-a-compact-array-and-free-list-for-requests.patch
@@ -1,14 +1,14 @@
-From 43d45856c8712f2700c6008de28b27272345460b Mon Sep 17 00:00:00 2001
+From 79ed189f6bdc16ff906095b7a84def50c88468d6 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 5 Jun 2016 17:25:36 -0700
Subject: [PATCH] Use a compact array and free list for requests
---
- sshfs.c | 125 ++++++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 80 insertions(+), 45 deletions(-)
+ sshfs.c | 126 +++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 80 insertions(+), 46 deletions(-)
diff --git a/sshfs.c b/sshfs.c
-index 6abd8ea..5b328e3 100644
+index 06a1ef3..d1280e8 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -171,6 +171,17 @@ struct request {
@@ -38,7 +38,7 @@ index 6abd8ea..5b328e3 100644
pthread_mutex_t lock;
pthread_mutex_t lock_write;
int processing_thread_started;
-@@ -1169,12 +1180,6 @@ static int do_write(struct iovec *iov, size_t count)
+@@ -1162,12 +1173,6 @@ static int do_write(struct iovec *iov, size_t count)
return 0;
}
@@ -51,7 +51,7 @@ index 6abd8ea..5b328e3 100644
static void buf_to_iov(const struct buffer *buf, struct iovec *iov)
{
iov->iov_base = buf->p;
-@@ -1267,6 +1272,43 @@ static void request_free(struct request *req)
+@@ -1260,6 +1265,43 @@ static void request_free(struct request *req)
g_free(req);
}
@@ -95,13 +95,14 @@ index 6abd8ea..5b328e3 100644
static void chunk_free(struct read_chunk *chunk)
{
while (!list_empty(&chunk->reqs)) {
-@@ -1296,21 +1338,6 @@ static void chunk_put_locked(struct read_chunk *chunk)
+@@ -1289,22 +1331,6 @@ static void chunk_put_locked(struct read_chunk *chunk)
pthread_mutex_unlock(&sshfs.lock);
}
--static int clean_req(void *key_, struct request *req)
+-static int clean_req(void *key_, struct request *req, gpointer user_data_)
-{
- (void) key_;
+- (void) user_data_;
-
- req->error = -EIO;
- if (req->want_reply)
@@ -117,7 +118,7 @@ index 6abd8ea..5b328e3 100644
static int process_one_request(void)
{
int res;
-@@ -1327,8 +1354,7 @@ static int process_one_request(void)
+@@ -1321,8 +1347,7 @@ static int process_one_request(void)
return -1;
pthread_mutex_lock(&sshfs.lock);
@@ -127,7 +128,7 @@ index 6abd8ea..5b328e3 100644
if (req == NULL)
fprintf(stderr, "request %i not found\n", id);
else {
-@@ -1340,7 +1366,7 @@ static int process_one_request(void)
+@@ -1334,7 +1359,7 @@ static int process_one_request(void)
sshfs.outstanding_len <= sshfs.max_outstanding_len) {
pthread_cond_broadcast(&sshfs.outstanding_cond);
}
@@ -136,7 +137,7 @@ index 6abd8ea..5b328e3 100644
}
pthread_mutex_unlock(&sshfs.lock);
if (req != NULL) {
-@@ -1401,6 +1427,9 @@ static void close_conn(void)
+@@ -1395,6 +1420,9 @@ static void close_conn(void)
static void *process_requests(void *data_)
{
@@ -146,7 +147,7 @@ index 6abd8ea..5b328e3 100644
(void) data_;
while (1) {
-@@ -1411,7 +1440,20 @@ static void *process_requests(void *data_)
+@@ -1405,7 +1433,20 @@ static void *process_requests(void *data_)
pthread_mutex_lock(&sshfs.lock);
sshfs.processing_thread_started = 0;
close_conn();
@@ -168,7 +169,7 @@ index 6abd8ea..5b328e3 100644
sshfs.connver ++;
sshfs.outstanding_len = 0;
pthread_cond_broadcast(&sshfs.outstanding_cond);
-@@ -1559,7 +1601,6 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1553,7 +1594,6 @@ static int sftp_error_to_errno(uint32_t error)
static void sftp_detect_uid()
{
int flags;
@@ -176,7 +177,7 @@ index 6abd8ea..5b328e3 100644
uint32_t replid;
uint8_t type;
struct buffer buf;
-@@ -1569,7 +1610,7 @@ static void sftp_detect_uid()
+@@ -1563,7 +1603,7 @@ static void sftp_detect_uid()
buf_init(&buf, 5);
buf_add_string(&buf, ".");
buf_to_iov(&buf, &iov[0]);
@@ -185,7 +186,7 @@ index 6abd8ea..5b328e3 100644
goto out;
buf_clear(&buf);
if (sftp_read(&type, &buf) == -1)
-@@ -1580,7 +1621,7 @@ static void sftp_detect_uid()
+@@ -1574,7 +1614,7 @@ static void sftp_detect_uid()
}
if (buf_get_uint32(&buf, &replid) == -1)
goto out;
@@ -194,7 +195,7 @@ index 6abd8ea..5b328e3 100644
fprintf(stderr, "bad reply ID\n");
goto out;
}
-@@ -1617,7 +1658,6 @@ out:
+@@ -1609,7 +1649,6 @@ out:
static int sftp_check_root(const char *base_path)
{
int flags;
@@ -202,7 +203,7 @@ index 6abd8ea..5b328e3 100644
uint32_t replid;
uint8_t type;
struct buffer buf;
-@@ -1629,7 +1669,7 @@ static int sftp_check_root(const char *base_path)
+@@ -1621,7 +1660,7 @@ static int sftp_check_root(const char *base_path)
buf_init(&buf, 0);
buf_add_string(&buf, remote_dir);
buf_to_iov(&buf, &iov[0]);
@@ -211,7 +212,7 @@ index 6abd8ea..5b328e3 100644
goto out;
buf_clear(&buf);
if (sftp_read(&type, &buf) == -1)
-@@ -1640,7 +1680,7 @@ static int sftp_check_root(const char *base_path)
+@@ -1632,7 +1671,7 @@ static int sftp_check_root(const char *base_path)
}
if (buf_get_uint32(&buf, &replid) == -1)
goto out;
@@ -220,7 +221,7 @@ index 6abd8ea..5b328e3 100644
fprintf(stderr, "bad reply ID\n");
goto out;
}
-@@ -1830,7 +1870,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1822,7 +1861,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
struct request **reqp)
{
int err;
@@ -228,7 +229,7 @@ index 6abd8ea..5b328e3 100644
struct request *req = g_new0(struct request, 1);
req->want_reply = want_reply;
-@@ -1841,8 +1880,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1833,8 +1871,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
pthread_mutex_lock(&sshfs.lock);
if (begin_func)
begin_func(req);
@@ -237,7 +238,7 @@ index 6abd8ea..5b328e3 100644
err = start_processing_thread();
if (err) {
pthread_mutex_unlock(&sshfs.lock);
-@@ -1853,21 +1890,24 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1845,21 +1881,24 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
while (sshfs.outstanding_len > sshfs.max_outstanding_len)
pthread_cond_wait(&sshfs.outstanding_cond, &sshfs.lock);
@@ -266,7 +267,7 @@ index 6abd8ea..5b328e3 100644
pthread_mutex_unlock(&sshfs.lock);
if (!rmed && !want_reply) {
-@@ -2040,7 +2080,7 @@ static int sftp_readdir_send(struct request **req, struct buffer *handle)
+@@ -2032,7 +2071,7 @@ static int sftp_readdir_send(struct request **req, struct buffer *handle)
static int sshfs_req_pending(struct request *req)
{
@@ -275,7 +276,7 @@ index 6abd8ea..5b328e3 100644
return 1;
else
return 0;
-@@ -3313,11 +3353,6 @@ static int processing_init(void)
+@@ -3300,11 +3339,6 @@ static int processing_init(void)
pthread_mutex_init(&sshfs.lock, NULL);
pthread_mutex_init(&sshfs.lock_write, NULL);
pthread_cond_init(&sshfs.outstanding_cond, NULL);
@@ -288,5 +289,5 @@ index 6abd8ea..5b328e3 100644
}
--
-2.19.2
+2.21.0
diff --git a/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch b/pkg/sshfs/patch/0003-Use-bool-instead-of-gboolean.patch
@@ -1,4 +1,4 @@
-From 5e41f6528f5793c37b988ca64f5dba42fe14e4da Mon Sep 17 00:00:00 2001
+From 6e76c7d8affb3911fcb2fb25052f20791476e179 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 5 Jun 2016 17:28:40 -0700
Subject: [PATCH] Use bool instead of gboolean
@@ -8,7 +8,7 @@ Subject: [PATCH] Use bool instead of gboolean
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sshfs.c b/sshfs.c
-index 5b328e3..a244e97 100644
+index d1280e8..e86bf96 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -18,6 +18,7 @@
@@ -19,7 +19,7 @@ index 5b328e3..a244e97 100644
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-@@ -1902,7 +1903,7 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1893,7 +1894,7 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
err = -EIO;
if (sftp_send_iov(type, req->id, iov, count) == -1) {
@@ -29,5 +29,5 @@ index 5b328e3..a244e97 100644
pthread_mutex_lock(&sshfs.lock);
rmed = !!request_table_lookup(&sshfs.reqtab, req->id);
--
-2.19.2
+2.21.0
diff --git a/pkg/sshfs/patch/0004-Use-struct-list_head-instead-of-GList.patch b/pkg/sshfs/patch/0004-Use-struct-list_head-instead-of-GList.patch
@@ -1,4 +1,4 @@
-From 856db868eade9967192bfd9e7a274bfa5b6c6d39 Mon Sep 17 00:00:00 2001
+From ea71f225b4e7e732f2e7b724fff26f72d5aa7c62 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 5 Jun 2016 17:30:20 -0700
Subject: [PATCH] Use struct list_head instead of GList
@@ -8,10 +8,10 @@ Subject: [PATCH] Use struct list_head instead of GList
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/sshfs.c b/sshfs.c
-index a244e97..28fcaf4 100644
+index e86bf96..3505777 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -2090,14 +2090,14 @@ static int sshfs_req_pending(struct request *req)
+@@ -2081,14 +2081,14 @@ static int sshfs_req_pending(struct request *req)
static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
fuse_fill_dir_t filler)
{
@@ -29,7 +29,7 @@ index a244e97..28fcaf4 100644
while (!done || outstanding) {
struct request *req;
struct buffer name;
-@@ -2112,16 +2112,14 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
+@@ -2103,16 +2103,14 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
break;
}
@@ -49,7 +49,7 @@ index a244e97..28fcaf4 100644
outstanding--;
if (done) {
-@@ -2160,7 +2158,7 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
+@@ -2151,7 +2149,7 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
}
}
}
@@ -59,5 +59,5 @@ index a244e97..28fcaf4 100644
return err;
}
--
-2.19.2
+2.21.0
diff --git a/pkg/sshfs/patch/0005-Use-standard-C-functions.patch b/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
@@ -1,4 +1,4 @@
-From 5de918738fc0f3ee81d9928d89d4e5d0171b0c71 Mon Sep 17 00:00:00 2001
+From 57c0228a88925225425674b34644b139e2560e64 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 5 Jun 2016 17:42:29 -0700
Subject: [PATCH] Use standard C functions
@@ -8,10 +8,10 @@ Subject: [PATCH] Use standard C functions
1 file changed, 55 insertions(+), 36 deletions(-)
diff --git a/sshfs.c b/sshfs.c
-index 28fcaf4..4650372 100644
+index 3505777..8f8d67b 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -667,25 +667,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
+@@ -665,25 +665,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
if (sshfs.base_path[0]) {
if (path[1]) {
if (sshfs.base_path[strlen(sshfs.base_path)-1] != '/') {
@@ -47,7 +47,7 @@ index 28fcaf4..4650372 100644
}
static int buf_check_get(struct buffer *buf, size_t len)
-@@ -1270,7 +1270,7 @@ static void request_free(struct request *req)
+@@ -1263,7 +1263,7 @@ static void request_free(struct request *req)
{
buf_free(&req->reply);
sem_destroy(&req->ready);
@@ -56,7 +56,7 @@ index 28fcaf4..4650372 100644
}
static int request_table_insert(struct request_table *reqtab, struct request *req)
-@@ -1318,9 +1318,9 @@ static void chunk_free(struct read_chunk *chunk)
+@@ -1311,9 +1311,9 @@ static void chunk_free(struct read_chunk *chunk)
rreq = list_entry(chunk->reqs.prev, struct read_req, list);
list_del(&rreq->list);
buf_free(&rreq->data);
@@ -68,7 +68,7 @@ index 28fcaf4..4650372 100644
}
static void chunk_put(struct read_chunk *chunk)
-@@ -1871,8 +1871,10 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1862,8 +1862,10 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
struct request **reqp)
{
int err;
@@ -80,7 +80,7 @@ index 28fcaf4..4650372 100644
req->want_reply = want_reply;
req->end_func = end_func;
req->data = data;
-@@ -2581,8 +2583,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2567,8 +2569,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
if (fi->flags & O_APPEND)
pflags |= SSH_FXF_APPEND;
@@ -93,7 +93,7 @@ index 28fcaf4..4650372 100644
list_init(&sf->write_reqs);
pthread_cond_init(&sf->write_finished, NULL);
/* Assume random read after open */
-@@ -2626,7 +2630,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2612,7 +2616,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
} else {
if (sshfs.dir_cache)
cache_invalidate(path);
@@ -102,7 +102,7 @@ index 28fcaf4..4650372 100644
}
buf_free(&buf);
return err;
-@@ -2693,7 +2697,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
+@@ -2679,7 +2683,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
{
sf->refs--;
if (!sf->refs)
@@ -111,7 +111,7 @@ index 28fcaf4..4650372 100644
}
static void sshfs_file_get(struct sshfs_file *sf)
-@@ -2763,9 +2767,11 @@ static void sshfs_read_begin(struct request *req)
+@@ -2749,9 +2753,11 @@ static void sshfs_read_begin(struct request *req)
static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
off_t offset)
{
@@ -124,7 +124,7 @@ index 28fcaf4..4650372 100644
pthread_cond_init(&chunk->sio.finished, NULL);
list_init(&chunk->reqs);
chunk->size = size;
-@@ -2779,7 +2785,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
+@@ -2765,7 +2771,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
struct read_req *rreq;
size_t bsize = size < sshfs.max_read ? size : sshfs.max_read;
@@ -135,7 +135,7 @@ index 28fcaf4..4650372 100644
rreq->sio = &chunk->sio;
rreq->size = bsize;
buf_init(&rreq->data, 0);
-@@ -2850,7 +2858,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
+@@ -2836,7 +2844,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
size -= rreq->res;
list_del(&rreq->list);
buf_free(&rreq->data);
@@ -144,7 +144,7 @@ index 28fcaf4..4650372 100644
}
}
-@@ -3473,9 +3481,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3459,9 +3467,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
switch (key) {
case FUSE_OPT_KEY_OPT:
if (is_ssh_opt(arg)) {
@@ -157,7 +157,7 @@ index 28fcaf4..4650372 100644
return 0;
}
/* Pass through */
-@@ -3532,9 +3541,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3530,9 +3539,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
case KEY_PORT:
@@ -170,7 +170,7 @@ index 28fcaf4..4650372 100644
return 0;
case KEY_COMPRESS:
-@@ -3542,9 +3552,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3540,9 +3550,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
return 0;
case KEY_CONFIGFILE:
@@ -183,7 +183,7 @@ index 28fcaf4..4650372 100644
return 0;
default:
-@@ -3700,17 +3711,19 @@ static char *find_base_path(void)
+@@ -3718,17 +3729,19 @@ static char *find_base_path(void)
static char *fsname_escape_commas(char *fsnameold)
{
@@ -205,7 +205,7 @@ index 28fcaf4..4650372 100644
return fsname;
}
-@@ -4047,15 +4060,20 @@ int main(int argc, char *argv[])
+@@ -4065,15 +4078,20 @@ int main(int argc, char *argv[])
else
sshfs.max_outstanding_len = ~0;
@@ -230,7 +230,7 @@ index 28fcaf4..4650372 100644
ssh_add_arg(sshfs.host);
if (sshfs.sftp_server)
sftp_server = sshfs.sftp_server;
-@@ -4082,10 +4100,11 @@ int main(int argc, char *argv[])
+@@ -4100,10 +4118,11 @@ int main(int argc, char *argv[])
sshfs.max_write = 65536;
fsname = fsname_escape_commas(fsname);
@@ -246,5 +246,5 @@ index 28fcaf4..4650372 100644
if(sshfs.dir_cache)
sshfs.op = cache_wrap(&sshfs_oper);
--
-2.19.2
+2.21.0
diff --git a/pkg/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch b/pkg/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch
@@ -1,4 +1,4 @@
-From 423bb82f581600d4b06d8be0773295a19cc8ec6c Mon Sep 17 00:00:00 2001
+From f84f7e6e19be3001a31c4505f5d5e6e8d887943a Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 5 Jun 2016 18:24:16 -0700
Subject: [PATCH] Disable uidmap and gidmap support
@@ -8,7 +8,7 @@ Subject: [PATCH] Disable uidmap and gidmap support
1 file changed, 16 insertions(+)
diff --git a/sshfs.c b/sshfs.c
-index a38791b..79da9c5 100644
+index 3cdf2e9..95589bf 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -248,10 +248,12 @@ struct sshfs {
@@ -24,7 +24,7 @@ index a38791b..79da9c5 100644
unsigned max_read;
unsigned max_write;
unsigned ssh_ver;
-@@ -384,7 +386,9 @@ enum {
+@@ -382,7 +384,9 @@ enum {
enum {
IDMAP_NONE,
IDMAP_USER,
@@ -34,7 +34,7 @@ index a38791b..79da9c5 100644
};
enum {
-@@ -405,7 +409,9 @@ static struct fuse_opt sshfs_opts[] = {
+@@ -403,7 +407,9 @@ static struct fuse_opt sshfs_opts[] = {
SSHFS_OPT("workaround=%s", workarounds, 0),
SSHFS_OPT("idmap=none", idmap, IDMAP_NONE),
SSHFS_OPT("idmap=user", idmap, IDMAP_USER),
@@ -44,7 +44,7 @@ index a38791b..79da9c5 100644
SSHFS_OPT("uidfile=%s", uid_file, 0),
SSHFS_OPT("gidfile=%s", gid_file, 0),
SSHFS_OPT("nomap=ignore", nomap, NOMAP_IGNORE),
-@@ -550,6 +556,7 @@ static int list_empty(const struct list_head *head)
+@@ -548,6 +554,7 @@ static int list_empty(const struct list_head *head)
return head->next == head;
}
@@ -52,7 +52,7 @@ index a38791b..79da9c5 100644
/* given a pointer to the uid/gid, and the mapping table, remap the
* uid/gid, if necessary */
static inline int translate_id(uint32_t *id, GHashTable *map)
-@@ -567,6 +574,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
+@@ -565,6 +572,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
abort();
}
}
@@ -60,10 +60,10 @@ index a38791b..79da9c5 100644
static inline void buf_init(struct buffer *buf, size_t size)
{
-@@ -814,12 +822,14 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
- if (sshfs.remote_uid_detected && uid == sshfs.remote_uid)
- uid = sshfs.local_uid;
- #endif /* __APPLE__ */
+@@ -807,12 +815,14 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
+ if (gid == sshfs.remote_gid)
+ gid = sshfs.local_gid;
+ }
+#if 0
if (sshfs.idmap == IDMAP_FILE && sshfs.uid_map)
if (translate_id(&uid, sshfs.uid_map) == -1)
@@ -75,10 +75,10 @@ index a38791b..79da9c5 100644
memset(stbuf, 0, sizeof(struct stat));
stbuf->st_mode = mode;
-@@ -2478,12 +2488,14 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid,
- if (sshfs.remote_uid_detected && uid == sshfs.local_uid)
- uid = sshfs.remote_uid;
- #endif /* __APPLE__ */
+@@ -2464,12 +2474,14 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid,
+ if (gid == sshfs.local_gid)
+ gid = sshfs.remote_gid;
+ }
+#if 0
if (sshfs.idmap == IDMAP_FILE && sshfs.r_uid_map)
if(translate_id(&uid, sshfs.r_uid_map) == -1)
@@ -90,7 +90,7 @@ index a38791b..79da9c5 100644
buf_init(&buf, 0);
if (sf == NULL)
-@@ -3750,6 +3762,7 @@ static int ssh_connect(void)
+@@ -3768,6 +3780,7 @@ static int ssh_connect(void)
return 0;
}
@@ -98,7 +98,7 @@ index a38791b..79da9c5 100644
/* number of ':' separated fields in a passwd/group file that we care
* about */
#define IDMAP_FIELDS 3
-@@ -3924,6 +3937,7 @@ static inline void load_gid_map(void)
+@@ -3942,6 +3955,7 @@ static inline void load_gid_map(void)
{
read_id_map(sshfs.gid_file, &groupname_to_gid, "gid", &sshfs.gid_map, &sshfs.r_gid_map);
}
@@ -106,7 +106,7 @@ index a38791b..79da9c5 100644
#ifdef __APPLE__
int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
-@@ -4016,6 +4030,7 @@ int main(int argc, char *argv[])
+@@ -4034,6 +4048,7 @@ int main(int argc, char *argv[])
if (sshfs.idmap == IDMAP_USER)
sshfs.detect_uid = 1;
@@ -114,7 +114,7 @@ index a38791b..79da9c5 100644
else if (sshfs.idmap == IDMAP_FILE) {
sshfs.uid_map = NULL;
sshfs.gid_map = NULL;
-@@ -4030,6 +4045,7 @@ int main(int argc, char *argv[])
+@@ -4048,6 +4063,7 @@ int main(int argc, char *argv[])
if (sshfs.gid_file)
load_gid_map();
}
@@ -123,5 +123,5 @@ index a38791b..79da9c5 100644
free(sshfs.gid_file);
--
-2.19.2
+2.21.0
diff --git a/pkg/sshfs/ver b/pkg/sshfs/ver
@@ -1 +1 @@
-3.5.1 r0
+3.5.2 r0
