commit: 26621546fc1f0918b6ecaf71dc6efccf1940b521
parent 9a6793496f3053ac0f38dea323c2b7fb24fc3dd7
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 26 Oct 2017 00:33:48 -0700
sshfs: Update to 3.3.1
Diffstat:
6 files changed, 62 insertions(+), 62 deletions(-)
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 62e87ccce46212f06297e92b7dbe56427a80b864 Mon Sep 17 00:00:00 2001
+From 7a1afc816dbc1f7218feaae2ffd97d4a0f0343f9 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 50ec384..ac0b889 100644
+index 7fe9c6e..cb2f554 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -171,6 +171,17 @@ struct request {
@@ -38,7 +38,7 @@ index 50ec384..ac0b889 100644
pthread_mutex_t lock;
pthread_mutex_t lock_write;
int processing_thread_started;
-@@ -1156,12 +1167,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 50ec384..ac0b889 100644
static void buf_to_iov(const struct buffer *buf, struct iovec *iov)
{
iov->iov_base = buf->p;
-@@ -1254,6 +1259,43 @@ static void request_free(struct request *req)
+@@ -1260,6 +1265,43 @@ static void request_free(struct request *req)
g_free(req);
}
@@ -95,7 +95,7 @@ index 50ec384..ac0b889 100644
static void chunk_free(struct read_chunk *chunk)
{
while (!list_empty(&chunk->reqs)) {
-@@ -1283,21 +1325,6 @@ static void chunk_put_locked(struct read_chunk *chunk)
+@@ -1289,21 +1331,6 @@ static void chunk_put_locked(struct read_chunk *chunk)
pthread_mutex_unlock(&sshfs.lock);
}
@@ -117,7 +117,7 @@ index 50ec384..ac0b889 100644
static int process_one_request(void)
{
int res;
-@@ -1314,8 +1341,7 @@ static int process_one_request(void)
+@@ -1320,8 +1347,7 @@ static int process_one_request(void)
return -1;
pthread_mutex_lock(&sshfs.lock);
@@ -127,7 +127,7 @@ index 50ec384..ac0b889 100644
if (req == NULL)
fprintf(stderr, "request %i not found\n", id);
else {
-@@ -1327,7 +1353,7 @@ static int process_one_request(void)
+@@ -1333,7 +1359,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 50ec384..ac0b889 100644
}
pthread_mutex_unlock(&sshfs.lock);
if (req != NULL) {
-@@ -1388,6 +1414,9 @@ static void close_conn(void)
+@@ -1394,6 +1420,9 @@ static void close_conn(void)
static void *process_requests(void *data_)
{
@@ -146,7 +146,7 @@ index 50ec384..ac0b889 100644
(void) data_;
while (1) {
-@@ -1398,7 +1427,20 @@ static void *process_requests(void *data_)
+@@ -1404,7 +1433,20 @@ static void *process_requests(void *data_)
pthread_mutex_lock(&sshfs.lock);
sshfs.processing_thread_started = 0;
close_conn();
@@ -168,7 +168,7 @@ index 50ec384..ac0b889 100644
sshfs.connver ++;
sshfs.outstanding_len = 0;
pthread_cond_broadcast(&sshfs.outstanding_cond);
-@@ -1546,7 +1588,6 @@ static int sftp_error_to_errno(uint32_t error)
+@@ -1552,7 +1594,6 @@ static int sftp_error_to_errno(uint32_t error)
static void sftp_detect_uid()
{
int flags;
@@ -176,7 +176,7 @@ index 50ec384..ac0b889 100644
uint32_t replid;
uint8_t type;
struct buffer buf;
-@@ -1556,7 +1597,7 @@ static void sftp_detect_uid()
+@@ -1562,7 +1603,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 50ec384..ac0b889 100644
goto out;
buf_clear(&buf);
if (sftp_read(&type, &buf) == -1)
-@@ -1567,7 +1608,7 @@ static void sftp_detect_uid()
+@@ -1573,7 +1614,7 @@ static void sftp_detect_uid()
}
if (buf_get_uint32(&buf, &replid) == -1)
goto out;
@@ -194,7 +194,7 @@ index 50ec384..ac0b889 100644
fprintf(stderr, "bad reply ID\n");
goto out;
}
-@@ -1604,7 +1645,6 @@ out:
+@@ -1610,7 +1651,6 @@ out:
static int sftp_check_root(const char *base_path)
{
int flags;
@@ -202,7 +202,7 @@ index 50ec384..ac0b889 100644
uint32_t replid;
uint8_t type;
struct buffer buf;
-@@ -1616,7 +1656,7 @@ static int sftp_check_root(const char *base_path)
+@@ -1622,7 +1662,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 50ec384..ac0b889 100644
goto out;
buf_clear(&buf);
if (sftp_read(&type, &buf) == -1)
-@@ -1627,7 +1667,7 @@ static int sftp_check_root(const char *base_path)
+@@ -1633,7 +1673,7 @@ static int sftp_check_root(const char *base_path)
}
if (buf_get_uint32(&buf, &replid) == -1)
goto out;
@@ -220,7 +220,7 @@ index 50ec384..ac0b889 100644
fprintf(stderr, "bad reply ID\n");
goto out;
}
-@@ -1817,7 +1857,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1823,7 +1863,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 50ec384..ac0b889 100644
struct request *req = g_new0(struct request, 1);
req->want_reply = want_reply;
-@@ -1828,8 +1867,6 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1834,8 +1873,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 50ec384..ac0b889 100644
err = start_processing_thread();
if (err) {
pthread_mutex_unlock(&sshfs.lock);
-@@ -1840,21 +1877,24 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1846,21 +1883,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 50ec384..ac0b889 100644
pthread_mutex_unlock(&sshfs.lock);
if (!rmed && !want_reply) {
-@@ -2027,7 +2067,7 @@ static int sftp_readdir_send(struct request **req, struct buffer *handle)
+@@ -2033,7 +2073,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 50ec384..ac0b889 100644
return 1;
else
return 0;
-@@ -3286,11 +3326,6 @@ static int processing_init(void)
+@@ -3293,11 +3333,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 50ec384..ac0b889 100644
}
--
-2.14.1
+2.14.3
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 7005f705fb992abcd511465339b819ca93ec6f84 Mon Sep 17 00:00:00 2001
+From 7a4b76d02e265e4febca4052be1d71d16fc228d5 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 ac0b889..30013ab 100644
+index cb2f554..1433d4a 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -18,6 +18,7 @@
@@ -19,7 +19,7 @@ index ac0b889..30013ab 100644
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-@@ -1889,7 +1890,7 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1895,7 +1896,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 ac0b889..30013ab 100644
pthread_mutex_lock(&sshfs.lock);
rmed = !!request_table_lookup(&sshfs.reqtab, req->id);
--
-2.14.1
+2.14.3
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 4fb86974c0713baf526ad9a7ea2cf8a7666d9045 Mon Sep 17 00:00:00 2001
+From ede30c0e39ff3e535746a1ca85e4445e88cecbf2 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 30013ab..9cb3965 100644
+index 1433d4a..5ec1ee3 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -2077,14 +2077,14 @@ static int sshfs_req_pending(struct request *req)
+@@ -2083,14 +2083,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 30013ab..9cb3965 100644
while (!done || outstanding) {
struct request *req;
struct buffer name;
-@@ -2099,16 +2099,14 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
+@@ -2105,16 +2105,14 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
break;
}
@@ -49,7 +49,7 @@ index 30013ab..9cb3965 100644
outstanding--;
if (done) {
-@@ -2147,7 +2145,7 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
+@@ -2153,7 +2151,7 @@ static int sftp_readdir_async(struct buffer *handle, void *buf, off_t offset,
}
}
}
@@ -59,5 +59,5 @@ index 30013ab..9cb3965 100644
return err;
}
--
-2.14.1
+2.14.3
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 85a40a85e9847621bd808833997517e35ee42e26 Mon Sep 17 00:00:00 2001
+From 390b2fd5ff9cd01261b77974b8e8943d66d8ea8f 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 9cb3965..2087f71 100644
+index 5ec1ee3..4ad3bbc 100644
--- a/sshfs.c
+++ b/sshfs.c
-@@ -654,25 +654,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
+@@ -660,25 +660,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 9cb3965..2087f71 100644
}
static int buf_check_get(struct buffer *buf, size_t len)
-@@ -1257,7 +1257,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 9cb3965..2087f71 100644
}
static int request_table_insert(struct request_table *reqtab, struct request *req)
-@@ -1305,9 +1305,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 9cb3965..2087f71 100644
}
static void chunk_put(struct read_chunk *chunk)
-@@ -1858,8 +1858,10 @@ static int sftp_request_send(uint8_t type, struct iovec *iov, size_t count,
+@@ -1864,8 +1864,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 9cb3965..2087f71 100644
req->want_reply = want_reply;
req->end_func = end_func;
req->data = data;
-@@ -2557,8 +2559,10 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2564,8 +2566,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 9cb3965..2087f71 100644
list_init(&sf->write_reqs);
pthread_cond_init(&sf->write_finished, NULL);
/* Assume random read after open */
-@@ -2602,7 +2606,7 @@ static int sshfs_open_common(const char *path, mode_t mode,
+@@ -2609,7 +2613,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 9cb3965..2087f71 100644
}
buf_free(&buf);
return err;
-@@ -2669,7 +2673,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
+@@ -2676,7 +2680,7 @@ static void sshfs_file_put(struct sshfs_file *sf)
{
sf->refs--;
if (!sf->refs)
@@ -111,7 +111,7 @@ index 9cb3965..2087f71 100644
}
static void sshfs_file_get(struct sshfs_file *sf)
-@@ -2739,9 +2743,11 @@ static void sshfs_read_begin(struct request *req)
+@@ -2746,9 +2750,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 9cb3965..2087f71 100644
pthread_cond_init(&chunk->sio.finished, NULL);
list_init(&chunk->reqs);
chunk->size = size;
-@@ -2755,7 +2761,9 @@ static struct read_chunk *sshfs_send_read(struct sshfs_file *sf, size_t size,
+@@ -2762,7 +2768,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 9cb3965..2087f71 100644
rreq->sio = &chunk->sio;
rreq->size = bsize;
buf_init(&rreq->data, 0);
-@@ -2826,7 +2834,7 @@ static int wait_chunk(struct read_chunk *chunk, char *buf, size_t size)
+@@ -2833,7 +2841,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 9cb3965..2087f71 100644
}
}
-@@ -3444,9 +3452,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3451,9 +3459,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 9cb3965..2087f71 100644
return 0;
}
/* Pass through */
-@@ -3471,9 +3480,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3478,9 +3487,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
case KEY_PORT:
@@ -170,7 +170,7 @@ index 9cb3965..2087f71 100644
return 0;
case KEY_COMPRESS:
-@@ -3481,9 +3491,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3488,9 +3498,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
return 0;
case KEY_CONFIGFILE:
@@ -183,7 +183,7 @@ index 9cb3965..2087f71 100644
return 0;
default:
-@@ -3639,17 +3650,19 @@ static char *find_base_path(void)
+@@ -3646,17 +3657,19 @@ static char *find_base_path(void)
static char *fsname_escape_commas(char *fsnameold)
{
@@ -205,7 +205,7 @@ index 9cb3965..2087f71 100644
return fsname;
}
-@@ -3982,15 +3995,20 @@ int main(int argc, char *argv[])
+@@ -3989,15 +4002,20 @@ int main(int argc, char *argv[])
else
sshfs.max_outstanding_len = ~0;
@@ -230,7 +230,7 @@ index 9cb3965..2087f71 100644
ssh_add_arg(sshfs.host);
if (sshfs.sftp_server)
sftp_server = sshfs.sftp_server;
-@@ -4017,10 +4035,11 @@ int main(int argc, char *argv[])
+@@ -4024,10 +4042,11 @@ int main(int argc, char *argv[])
sshfs.max_write = 65536;
fsname = fsname_escape_commas(fsname);
@@ -246,5 +246,5 @@ index 9cb3965..2087f71 100644
if(sshfs.dir_cache)
sshfs.op = cache_wrap(&sshfs_oper);
--
-2.14.1
+2.14.3
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 6769e1407bf4a239501a8c401e9c3e38de66d4a9 Mon Sep 17 00:00:00 2001
+From 6898856f0630c183ad62856c27bd23bfdd3adf9d 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 5ab4ca9..f09164a 100644
+index 049fffb..7e2ff8e 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -246,10 +246,12 @@ struct sshfs {
@@ -44,7 +44,7 @@ index 5ab4ca9..f09164a 100644
SSHFS_OPT("uidfile=%s", uid_file, 0),
SSHFS_OPT("gidfile=%s", gid_file, 0),
SSHFS_OPT("nomap=ignore", nomap, NOMAP_IGNORE),
-@@ -537,6 +543,7 @@ static int list_empty(const struct list_head *head)
+@@ -543,6 +549,7 @@ static int list_empty(const struct list_head *head)
return head->next == head;
}
@@ -52,7 +52,7 @@ index 5ab4ca9..f09164a 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)
-@@ -554,6 +561,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
+@@ -560,6 +567,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
abort();
}
}
@@ -60,7 +60,7 @@ index 5ab4ca9..f09164a 100644
static inline void buf_init(struct buffer *buf, size_t size)
{
-@@ -801,12 +809,14 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
+@@ -807,12 +815,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 5ab4ca9..f09164a 100644
memset(stbuf, 0, sizeof(struct stat));
stbuf->st_mode = mode;
-@@ -2462,12 +2472,14 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid,
+@@ -2469,12 +2479,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 5ab4ca9..f09164a 100644
buf_init(&buf, 0);
if (sf == NULL)
-@@ -3689,6 +3701,7 @@ static int ssh_connect(void)
+@@ -3696,6 +3708,7 @@ static int ssh_connect(void)
return 0;
}
@@ -98,7 +98,7 @@ index 5ab4ca9..f09164a 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)
+@@ -3870,6 +3883,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 5ab4ca9..f09164a 100644
#ifdef __APPLE__
int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
-@@ -3951,6 +3965,7 @@ int main(int argc, char *argv[])
+@@ -3958,6 +3972,7 @@ int main(int argc, char *argv[])
if (sshfs.idmap == IDMAP_USER)
sshfs.detect_uid = 1;
@@ -114,7 +114,7 @@ index 5ab4ca9..f09164a 100644
else if (sshfs.idmap == IDMAP_FILE) {
sshfs.uid_map = NULL;
sshfs.gid_map = NULL;
-@@ -3965,6 +3980,7 @@ int main(int argc, char *argv[])
+@@ -3972,6 +3987,7 @@ int main(int argc, char *argv[])
if (sshfs.gid_file)
load_gid_map();
}
@@ -123,5 +123,5 @@ index 5ab4ca9..f09164a 100644
free(sshfs.gid_file);
--
-2.14.1
+2.14.3
diff --git a/pkg/sshfs/rev b/pkg/sshfs/rev
@@ -1 +1 @@
-6
+7
