oasis

commit: ebbed02d1ab0b0e564301b1ebc78348982b648ea
parent a29353f16adf4cb44551c280f51cf613b533ce2a
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 28 Aug 2018 15:17:37 -0700

sshfs: Update to 3.5.0

Diffstat:
M
pkg/sshfs/config.h
2
+-
M
pkg/sshfs/patch/0005-Use-standard-C-functions.patch
14
+++++++-------
M
pkg/sshfs/patch/0007-Disable-uidmap-and-gidmap-support.patch
12
++++++------
M
pkg/sshfs/rev
2
+-

4 files changed, 15 insertions(+), 15 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.4.0"
+#define PACKAGE_VERSION "3.5.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 b0de64fc18f9e26491cfc5a69358741d90fc744f Mon Sep 17 00:00:00 2001
+From 4c05a5809a7c3bcda3c8a932c54b7e5f8afa1619 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,7 +8,7 @@ Subject: [PATCH] Use standard C functions
  1 file changed, 55 insertions(+), 36 deletions(-)
 
 diff --git a/sshfs.c b/sshfs.c
-index a9dde7c..2c3a4db 100644
+index d33a7c9..d8f2461 100644
 --- a/sshfs.c
 +++ b/sshfs.c
 @@ -666,25 +666,25 @@ static inline void buf_add_path(struct buffer *buf, const char *path)
@@ -157,7 +157,7 @@ index a9dde7c..2c3a4db 100644
  			return 0;
  		}
  		/* Pass through */
-@@ -3499,9 +3508,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3531,9 +3540,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  
  
  	case KEY_PORT:
@@ -170,7 +170,7 @@ index a9dde7c..2c3a4db 100644
  		return 0;
  
  	case KEY_COMPRESS:
-@@ -3509,9 +3519,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
+@@ -3541,9 +3551,10 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
  		return 0;
  
  	case KEY_CONFIGFILE:
@@ -183,7 +183,7 @@ index a9dde7c..2c3a4db 100644
  		return 0;
  
  	default:
-@@ -3667,17 +3678,19 @@ static char *find_base_path(void)
+@@ -3699,17 +3710,19 @@ static char *find_base_path(void)
  
  static char *fsname_escape_commas(char *fsnameold)
  {
@@ -205,7 +205,7 @@ index a9dde7c..2c3a4db 100644
  
  	return fsname;
  }
-@@ -4012,15 +4025,20 @@ int main(int argc, char *argv[])
+@@ -4046,15 +4059,20 @@ int main(int argc, char *argv[])
  	else
  		sshfs.max_outstanding_len = ~0;
  
@@ -230,7 +230,7 @@ index a9dde7c..2c3a4db 100644
  	ssh_add_arg(sshfs.host);
  	if (sshfs.sftp_server)
  		sftp_server = sshfs.sftp_server;
-@@ -4047,10 +4065,11 @@ int main(int argc, char *argv[])
+@@ -4081,10 +4099,11 @@ int main(int argc, char *argv[])
  		sshfs.max_write = 65536;
  
          fsname = fsname_escape_commas(fsname);
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 db5b9efcfb8d2910ae2bd13f699f446783a4d443 Mon Sep 17 00:00:00 2001
+From 627abd981f6bdf770dd20caafcc72bfef802feac 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 26341f8..ebfc02e 100644
+index 00e1115..ad21d56 100644
 --- a/sshfs.c
 +++ b/sshfs.c
 @@ -248,10 +248,12 @@ struct sshfs {
@@ -90,7 +90,7 @@ index 26341f8..ebfc02e 100644
  
  	buf_init(&buf, 0);
  	if (sf == NULL)
-@@ -3717,6 +3729,7 @@ static int ssh_connect(void)
+@@ -3749,6 +3761,7 @@ static int ssh_connect(void)
  	return 0;
  }
  
@@ -98,7 +98,7 @@ index 26341f8..ebfc02e 100644
  /* number of ':' separated fields in a passwd/group file that we care
   * about */
  #define IDMAP_FIELDS 3
-@@ -3891,6 +3904,7 @@ static inline void load_gid_map(void)
+@@ -3923,6 +3936,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 26341f8..ebfc02e 100644
  
  #ifdef __APPLE__
  int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
-@@ -3981,6 +3995,7 @@ int main(int argc, char *argv[])
+@@ -4015,6 +4029,7 @@ int main(int argc, char *argv[])
  
  	if (sshfs.idmap == IDMAP_USER)
  		sshfs.detect_uid = 1;
@@ -114,7 +114,7 @@ index 26341f8..ebfc02e 100644
  	else if (sshfs.idmap == IDMAP_FILE) {
  		sshfs.uid_map = NULL;
  		sshfs.gid_map = NULL;
-@@ -3995,6 +4010,7 @@ int main(int argc, char *argv[])
+@@ -4029,6 +4044,7 @@ int main(int argc, char *argv[])
  		if (sshfs.gid_file)
  			load_gid_map();
  	}
diff --git a/pkg/sshfs/rev b/pkg/sshfs/rev
@@ -1 +1 @@
-9
+10