commit: 15876a42c27ab666d36e2f73cd116a3b26199729
parent 8bb86237036b5dabaebd7c7039131bc0022b6481
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 10 Aug 2017 20:13:38 -0700
sshfs: Update to 3.2.0
Diffstat:
7 files changed, 73 insertions(+), 71 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.1.0"
+#define PACKAGE_VERSION "3.2.0"
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,4 +1,4 @@
-From 7b709a968b3505ac0e55a0fdea8c54791ed718d6 Mon Sep 17 00:00:00 2001
+From bc0f086e2d95b79c6061ea8894c57a5b5350bd4d 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Use a compact array and free list for requests
1 file changed, 80 insertions(+), 45 deletions(-)
diff --git a/sshfs.c b/sshfs.c
-index 3c4f242..c5ed603 100644
+index a76ae8a..7078618 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -171,6 +171,17 @@ struct request {
@@ -29,7 +29,7 @@ index 3c4f242..c5ed603 100644
struct sshfs_io {
int num_reqs;
pthread_cond_t finished;
-@@ -249,7 +260,7 @@ struct sshfs {
+@@ -250,7 +261,7 @@ struct sshfs {
int slave;
char *host;
char *base_path;
@@ -38,7 +38,7 @@ index 3c4f242..c5ed603 100644
pthread_mutex_t lock;
pthread_mutex_t lock_write;
int processing_thread_started;
-@@ -1154,12 +1165,6 @@ static int do_write(struct iovec *iov, size_t count)
+@@ -1156,12 +1167,6 @@ static int do_write(struct iovec *iov, size_t count)
return 0;
}
@@ -51,7 +51,7 @@ index 3c4f242..c5ed603 100644
static void buf_to_iov(const struct buffer *buf, struct iovec *iov)
{
iov->iov_base = buf->p;
-@@ -1252,6 +1257,43 @@ static void request_free(struct request *req)
+@@ -1254,6 +1259,43 @@ static void request_free(struct request *req)
g_free(req);
}
@@ -95,7 +95,7 @@ index 3c4f242..c5ed603 100644
static void chunk_free(struct read_chunk *chunk)
{
while (!list_empty(&chunk->reqs)) {
-@@ -1281,21 +1323,6 @@ static void chunk_put_locked(struct read_chunk *chunk)
+@@ -1283,21 +1325,6 @@ static void chunk_put_locked(struct read_chunk *chunk)
pthread_mutex_unlock(&sshfs.lock);
}
@@ -117,7 +117,7 @@ index 3c4f242..c5ed603 100644
static int process_one_request(void)
{
int res;
-@@ -1312,8 +1339,7 @@ static int process_one_request(void)
+@@ -1314,8 +1341,7 @@ static int process_one_request(void)
return -1;
pthread_mutex_lock(&sshfs.lock);
@@ -127,7 +127,7 @@ index 3c4f242..c5ed603 100644
if (req == NULL)
fprintf(stderr, "request %i not found\n", id);
else {
-@@ -1325,7 +1351,7 @@ static int process_one_request(void)
+@@ -1327,7 +1353,7 @@ static int process_one_request(void)
sshfs.outstanding_len <= sshfs.max_outstanding_len) {
pthread_cond_broadcast(&sshfs.outstanding_cond);
}
@@ -136,7 +136,7 @@ index 3c4f242..c5ed603 100644
}
pthread_mutex_unlock(&sshfs.lock);
if (req != NULL) {
-@@ -1386,6 +1412,9 @@ static void close_conn(void)
+@@ -1388,6 +1414,9 @@ static void close_conn(void)
static void *process_requests(void *data_)
{
@@ -146,7 +146,7 @@ index 3c4f242..c5ed603 100644
(void) data_;
while (1) {
-@@ -1396,7 +1425,20 @@ static void *process_requests(void *data_)
+@@ -1398,7 +1427,20 @@ static void *process_requests(void *data_)
pthread_mutex_lock(&sshfs.lock);
sshfs.processing_thread_started = 0;
close_conn();
@@ -168,7 +168,7 @@ index 3c4f242..c5ed603 100644
sshfs.connver ++;
sshfs.outstanding_len = 0;
pthread_cond_broadcast(&sshfs.outstanding_cond);
-@@ -1544,7 +1586,6 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1546,7 +1588,6 @@ static int sftp_error_to_errno(uint32_t error)
static void sftp_detect_uid()
{
int flags;
@@ -176,7 +176,7 @@ index 3c4f242..c5ed603 100644
uint32_t replid;
uint8_t type;
struct buffer buf;
-@@ -1554,7 +1595,7 @@ static void sftp_detect_uid()
+@@ -1556,7 +1597,7 @@ static void sftp_detect_uid()
buf_init(&buf, 5);
buf_add_string(&buf, ".");
buf_to_iov(&buf, &iov[0]);
@@ -185,7 +185,7 @@ index 3c4f242..c5ed603 100644
goto out;
buf_clear(&buf);
if (sftp_read(&type, &buf) == -1)
-@@ -1565,7 +1606,7 @@ static void sftp_detect_uid()
+@@ -1567,7 +1608,7 @@ static void sftp_detect_uid()
}
if (buf_get_uint32(&buf, &replid) == -1)
goto out;
@@ -194,7 +194,7 @@ index 3c4f242..c5ed603 100644
fprintf(stderr, "bad reply ID\n");
goto out;
}
-@@ -1602,7 +1643,6 @@ out:
+@@ -1604,7 +1645,6 @@ out:
static int sftp_check_root(const char *base_path)
{
int flags;
@@ -202,7 +202,7 @@ index 3c4f242..c5ed603 100644
uint32_t replid;
uint8_t type;
struct buffer buf;
-@@ -1614,7 +1654,7 @@ static int sftp_check_root(const char *base_path)
+@@ -1616,7 +1656,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 +211,7 @@ index 3c4f242..c5ed603 100644
goto out;
buf_clear(&buf);
if (sftp_read(&type, &buf) == -1)
-@@ -1625,7 +1665,7 @@ static int sftp_check_root(const char *base_path)
+@@ -1627,7 +1667,7 @@ static int sftp_check_root(const char *base_path)
}
if (buf_get_uint32(&buf, &replid) == -1)
goto out;
@@ -220,7 +220,7 @@ index 3c4f242..c5ed603 100644
fprintf(stderr, "bad reply ID\n");
goto out;
}
-@@ -1819,7 +1859,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1821,7 +1861,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
struct request **reqp)
{
int err;
@@ -228,7 +228,7 @@ index 3c4f242..c5ed603 100644
struct request *req = g_new0(struct request, 1);
req->want_reply = want_reply;
-@@ -1830,8 +1869,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1832,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 +237,7 @@ index 3c4f242..c5ed603 100644
err = start_processing_thread();
if (err) {
pthread_mutex_unlock(&sshfs.lock);
-@@ -1842,21 +1879,24 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1844,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 +266,7 @@ index 3c4f242..c5ed603 100644
pthread_mutex_unlock(&sshfs.lock);
if (!rmed && !want_reply) {
-@@ -2029,7 +2069,7 @@ static int sftp_readdir_send(struct request **req, struct buffer *handle)
+@@ -2031,7 +2071,7 @@ static int sftp_readdir_send(struct request **req, struct buffer *handle)
static int sshfs_req_pending(struct request *req)
{
@@ -275,7 +275,7 @@ index 3c4f242..c5ed603 100644
return 1;
else
return 0;
-@@ -3285,11 +3325,6 @@ static int processing_init(void)
+@@ -3308,11 +3348,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 +288,5 @@ index 3c4f242..c5ed603 100644
}
--
-2.14.0
+2.14.1
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 99b77e751af9ae7f0a1395f93aae8b885706c859 Mon Sep 17 00:00:00 2001
+From 57729cac91c4ccccec2a98c7589bdacc6220f232 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 5adb290..6c4272b 100644
+index 7078618..9e86ec0 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -18,6 +18,7 @@
@@ -19,7 +19,7 @@ index 5adb290..6c4272b 100644
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-@@ -1891,7 +1892,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 5adb290..6c4272b 100644
pthread_mutex_lock(&sshfs.lock);
rmed = !!request_table_lookup(&sshfs.reqtab, req->id);
--
-2.13.2
+2.14.1
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 decf2655c5c0a32d4efc5d33ceb9515ccbc87020 Mon Sep 17 00:00:00 2001
+From c9574c7ceb8195007bd3dde81dc06438beaf4f69 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 1c13b23..19ef6b2 100644
+index 9e86ec0..4a01e4b 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -2079,14 +2079,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 1c13b23..19ef6b2 100644
while (!done || outstanding) {
struct request *req;
struct buffer name;
-@@ -2101,16 +2101,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 1c13b23..19ef6b2 100644
outstanding--;
if (done) {
-@@ -2149,7 +2147,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 1c13b23..19ef6b2 100644
return err;
}
--
-2.14.0
+2.14.1
diff --git a/pkg/sshfs/patch/0005-Use-standard-C-functions.patch b/pkg/sshfs/patch/0005-Use-standard-C-functions.patch
@@ -1,17 +1,17 @@
-From 3935747a1d4c3d22db567c9bc84d3abda85cc8a8 Mon Sep 17 00:00:00 2001
+From 088c5b6b0fa85da8fdb8490f8a587631967488ad 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
---
- sshfs.c | 89 +++++++++++++++++++++++++++++++++++++++--------------------------
- 1 file changed, 54 insertions(+), 35 deletions(-)
+ sshfs.c | 91 +++++++++++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 55 insertions(+), 36 deletions(-)
diff --git a/sshfs.c b/sshfs.c
-index 19ef6b2..2882058 100644
+index 4a01e4b..3f03640 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -652,25 +652,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
+@@ -654,25 +654,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 19ef6b2..2882058 100644
}
static int buf_check_get(struct buffer *buf, size_t len)
-@@ -1255,7 +1255,7 @@ static void request_free(struct request *req)
+@@ -1257,7 +1257,7 @@ static void request_free(struct request *req)
{
buf_free(&req->reply);
sem_destroy(&req->ready);
@@ -56,7 +56,7 @@ index 19ef6b2..2882058 100644
}
static int request_table_insert(struct request_table *reqtab, struct request *req)
-@@ -1303,9 +1303,9 @@ static void chunk_free(struct read_chunk *chunk)
+@@ -1305,9 +1305,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 19ef6b2..2882058 100644
}
static void chunk_put(struct read_chunk *chunk)
-@@ -1860,8 +1860,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,18 +80,20 @@ index 19ef6b2..2882058 100644
req->want_reply = want_reply;
req->end_func = end_func;
req->data = data;
-@@ -2557,7 +2559,9 @@ static int sshfs_open_common(const char *path, mode_t mode,
- if (fi->flags & O_TRUNC)
- pflags |= SSH_FXF_TRUNC;
+@@ -2579,8 +2581,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
+ if (fi->flags & O_APPEND)
+ pflags |= SSH_FXF_APPEND;
+-
- sf = g_new0(struct sshfs_file, 1);
++
+ sf = calloc(1, sizeof(struct sshfs_file));
+ if (!sf)
+ return -ENOMEM;
list_init(&sf->write_reqs);
pthread_cond_init(&sf->write_finished, NULL);
/* Assume random read after open */
-@@ -2601,7 +2605,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2624,7 +2628,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
} else {
if (sshfs.dir_cache)
cache_invalidate(path);
@@ -100,7 +102,7 @@ index 19ef6b2..2882058 100644
}
buf_free(&buf);
return err;
-@@ -2668,7 +2672,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
+@@ -2691,7 +2695,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
{
sf->refs--;
if (!sf->refs)
@@ -109,7 +111,7 @@ index 19ef6b2..2882058 100644
}
static void sshfs_file_get(struct sshfs_file *sf)
-@@ -2738,9 +2742,11 @@ static void sshfs_read_begin(struct request *req)
+@@ -2761,9 +2765,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)
{
@@ -122,7 +124,7 @@ index 19ef6b2..2882058 100644
pthread_cond_init(&chunk->sio.finished, NULL);
list_init(&chunk->reqs);
chunk->size = size;
-@@ -2754,7 +2760,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
+@@ -2777,7 +2783,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;
@@ -133,7 +135,7 @@ index 19ef6b2..2882058 100644
rreq->sio = &chunk->sio;
rreq->size = bsize;
buf_init(&rreq->data, 0);
-@@ -2825,7 +2833,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
+@@ -2848,7 +2856,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);
@@ -142,7 +144,7 @@ index 19ef6b2..2882058 100644
}
}
-@@ -3444,9 +3452,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3468,9 +3476,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)) {
@@ -155,7 +157,7 @@ index 19ef6b2..2882058 100644
return 0;
}
/* Pass through */
-@@ -3471,9 +3480,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3495,9 +3504,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
case KEY_PORT:
@@ -168,7 +170,7 @@ index 19ef6b2..2882058 100644
return 0;
case KEY_COMPRESS:
-@@ -3481,9 +3491,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3505,9 +3515,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
return 0;
case KEY_CONFIGFILE:
@@ -181,7 +183,7 @@ index 19ef6b2..2882058 100644
return 0;
default:
-@@ -3639,17 +3650,19 @@ static char *find_base_path(void)
+@@ -3663,17 +3674,19 @@ static char *find_base_path(void)
static char *fsname_escape_commas(char *fsnameold)
{
@@ -203,7 +205,7 @@ index 19ef6b2..2882058 100644
return fsname;
}
-@@ -3987,15 +4000,20 @@ int main(int argc, char *argv[])
+@@ -4008,15 +4021,20 @@ int main(int argc, char *argv[])
else
sshfs.max_outstanding_len = ~0;
@@ -228,7 +230,7 @@ index 19ef6b2..2882058 100644
ssh_add_arg(sshfs.host);
if (sshfs.sftp_server)
sftp_server = sshfs.sftp_server;
-@@ -4022,10 +4040,11 @@ int main(int argc, char *argv[])
+@@ -4043,10 +4061,11 @@ int main(int argc, char *argv[])
sshfs.max_write = 65536;
fsname = fsname_escape_commas(fsname);
@@ -244,5 +246,5 @@ index 19ef6b2..2882058 100644
if(sshfs.dir_cache)
sshfs.op = cache_wrap(&sshfs_oper);
--
-2.14.0
+2.14.1
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 28e5307aac095886980afe80f8fa5730c0333f5d Mon Sep 17 00:00:00 2001
+From dd4e958a1aedb579c7ebbc4fae78849c3db42d9f 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,10 +8,10 @@ Subject: [PATCH] Disable uidmap and gidmap support
1 file changed, 16 insertions(+)
diff --git a/sshfs.c b/sshfs.c
-index 567c3fa..ace6e8e 100644
+index 58cf1ff..b7effca 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -246,10 +246,12 @@ struct sshfs {
+@@ -247,10 +247,12 @@ struct sshfs {
char *mountpoint;
char *uid_file;
char *gid_file;
@@ -24,7 +24,7 @@ index 567c3fa..ace6e8e 100644
unsigned max_read;
unsigned max_write;
unsigned ssh_ver;
-@@ -381,7 +383,9 @@ enum {
+@@ -382,7 +384,9 @@ enum {
enum {
IDMAP_NONE,
IDMAP_USER,
@@ -34,7 +34,7 @@ index 567c3fa..ace6e8e 100644
};
enum {
-@@ -402,7 +406,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 567c3fa..ace6e8e 100644
SSHFS_OPT("uidfile=%s", uid_file, 0),
SSHFS_OPT("gidfile=%s", gid_file, 0),
SSHFS_OPT("nomap=ignore", nomap, NOMAP_IGNORE),
-@@ -535,6 +541,7 @@ static int list_empty(const struct list_head *head)
+@@ -537,6 +543,7 @@ static int list_empty(const struct list_head *head)
return head->next == head;
}
@@ -52,7 +52,7 @@ index 567c3fa..ace6e8e 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)
-@@ -552,6 +559,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
+@@ -554,6 +561,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
abort();
}
}
@@ -60,7 +60,7 @@ index 567c3fa..ace6e8e 100644
static inline void buf_init(struct buffer *buf, size_t size)
{
-@@ -799,12 +807,14 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
+@@ -801,12 +809,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__ */
@@ -75,7 +75,7 @@ index 567c3fa..ace6e8e 100644
memset(stbuf, 0, sizeof(struct stat));
stbuf->st_mode = mode;
-@@ -2464,12 +2474,14 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid,
+@@ -2466,12 +2476,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__ */
@@ -90,7 +90,7 @@ index 567c3fa..ace6e8e 100644
buf_init(&buf, 0);
if (sf == NULL)
-@@ -3689,6 +3701,7 @@ static int ssh_connect(void)
+@@ -3713,6 +3725,7 @@ static int ssh_connect(void)
return 0;
}
@@ -98,7 +98,7 @@ index 567c3fa..ace6e8e 100644
/* number of ':' separated fields in a passwd/group file that we care
* about */
#define IDMAP_FIELDS 3
-@@ -3863,6 +3876,7 @@ static inline void load_gid_map(void)
+@@ -3887,6 +3900,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 567c3fa..ace6e8e 100644
#ifdef __APPLE__
int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
-@@ -3956,6 +3970,7 @@ int main(int argc, char *argv[])
+@@ -3977,6 +3991,7 @@ int main(int argc, char *argv[])
if (sshfs.idmap == IDMAP_USER)
sshfs.detect_uid = 1;
@@ -114,7 +114,7 @@ index 567c3fa..ace6e8e 100644
else if (sshfs.idmap == IDMAP_FILE) {
sshfs.uid_map = NULL;
sshfs.gid_map = NULL;
-@@ -3970,6 +3985,7 @@ int main(int argc, char *argv[])
+@@ -3991,6 +4006,7 @@ int main(int argc, char *argv[])
if (sshfs.gid_file)
load_gid_map();
}
@@ -123,5 +123,5 @@ index 567c3fa..ace6e8e 100644
free(sshfs.gid_file);
--
-2.14.0
+2.14.1
diff --git a/pkg/sshfs/rev b/pkg/sshfs/rev
@@ -1 +1 @@
-4
+5
