Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19612
Modified Files:
sshfs.info sshfs.patch
Log Message:
Welcome to sshfs 2.2
Index: sshfs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/sshfs.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sshfs.info 20 May 2008 06:14:19 -0000 1.7
+++ sshfs.info 18 Dec 2008 01:47:25 -0000 1.8
@@ -1,10 +1,10 @@
Package: sshfs
-Version: 1.9
+Version: 2.2
Revision: 1
Source: mirror:sourceforge:fuse/%n-fuse-%v.tar.gz
-Source-MD5: 05c3da4fa0f673f7ce5f480b3023af61
+Source-MD5: 26e9206eb5169e87e6f95f54bc005a4f
PatchFile: %n.patch
-PatchFile-MD5: 195a7c8268b8deb3151c8b1015f3b602
+PatchFile-MD5: 08330f4c10e25052b3a5c26d180e4752
BuildDepends: fuse-dev, glib2-dev, pkgconfig, libgettext3-dev, fink (>=
0.24.12)
Depends: fuse-shlibs, glib2-shlibs, libgettext3-shlibs
Index: sshfs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/sshfs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sshfs.patch 20 May 2008 06:14:19 -0000 1.5
+++ sshfs.patch 18 Dec 2008 01:47:25 -0000 1.6
@@ -1,7 +1,7 @@
diff -Naur old/Makefile.in new/Makefile.in
---- old/Makefile.in 2007-12-17 06:45:48.000000000 -0800
-+++ new/Makefile.in 2008-01-10 04:04:28.000000000 -0800
-@@ -608,7 +608,11 @@
+--- old/Makefile.in 2008-10-20 05:15:44.000000000 -0700
++++ new/Makefile.in 2008-10-21 15:46:00.000000000 -0700
+@@ -660,7 +660,11 @@
@SSH_NODELAY_SO_TRUE@ rm -f "$(DESTDIR)$(libdir)/sshnodelay.so"
@ssh_nodelay_so_t...@sshnodelay.so:
@@ -15,7 +15,7 @@
.NOEXPORT:
diff -Naur old/README.MacFUSE new/README.MacFUSE
--- old/README.MacFUSE 1969-12-31 16:00:00.000000000 -0800
-+++ new/README.MacFUSE 2008-01-10 04:01:39.000000000 -0800
++++ new/README.MacFUSE 2008-10-21 15:46:00.000000000 -0700
@@ -0,0 +1,9 @@
+MacFUSE Project Page:
+
@@ -24,12 +24,12 @@
+Making a Universal build of sshfs:
+
+0. Make sure dependencies (glib, MacFUSE) are installed
-+1. Run ./configure_for_macfuse.sh
++1. Run macfuse_buildtool.sh -t swconfigure
+2. Run make
diff -Naur old/cache.c new/cache.c
---- old/cache.c 2007-12-11 14:23:24.000000000 -0800
-+++ new/cache.c 2008-01-10 04:01:39.000000000 -0800
-@@ -527,6 +527,9 @@
+--- old/cache.c 2008-10-20 05:10:08.000000000 -0700
++++ new/cache.c 2008-10-21 15:46:00.000000000 -0700
+@@ -559,6 +559,9 @@
cache.next_oper = oper;
cache_unity_fill(oper, &cache_oper);
@@ -39,7 +39,7 @@
if (cache.on) {
cache_fill(oper, &cache_oper);
pthread_mutex_init(&cache.lock, NULL);
-@@ -561,3 +564,7 @@
+@@ -593,3 +596,7 @@
return fuse_opt_parse(args, &cache, cache_opts, NULL);
}
@@ -48,33 +48,33 @@
+int cache_enabled;
+#endif
diff -Naur old/cache.h new/cache.h
---- old/cache.h 2006-02-20 03:43:23.000000000 -0800
-+++ new/cache.h 2008-01-10 04:01:39.000000000 -0800
-@@ -26,3 +26,7 @@
- int cache_parse_options(struct fuse_args *args);
- void cache_add_attr(const char *path, const struct stat *stbuf);
+--- old/cache.h 2008-07-11 04:00:33.000000000 -0700
++++ new/cache.h 2008-10-21 15:46:00.000000000 -0700
+@@ -27,3 +27,7 @@
+ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t
wrctr);
void cache_invalidate(const char *path);
+ uint64_t cache_get_write_ctr(void);
+
+#if (__FreeBSD__ >= 10)
+extern int cache_enabled;
+#endif
diff -Naur old/sshfs.c new/sshfs.c
---- old/sshfs.c 2007-12-11 14:23:29.000000000 -0800
-+++ new/sshfs.c 2008-01-10 04:01:39.000000000 -0800
-@@ -18,7 +18,12 @@
+--- old/sshfs.c 2008-10-20 05:10:09.000000000 -0700
++++ new/sshfs.c 2008-10-21 15:48:09.000000000 -0700
+@@ -19,7 +19,12 @@
#include <string.h>
#include <stdint.h>
#include <errno.h>
+#if !(__FreeBSD__ >= 10)
#include <semaphore.h>
+#else
-+#define MACFUSE_SSHFS_VERSION "1.3.0"
++#define MACFUSE_SSHFS_VERSION "2.2.0"
+#include "fuse_darwin.h"
+#endif
#include <pthread.h>
#include <netdb.h>
#include <signal.h>
-@@ -30,6 +35,10 @@
+@@ -34,6 +39,10 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <glib.h>
@@ -85,7 +85,7 @@
#include "cache.h"
-@@ -100,6 +109,16 @@
+@@ -120,6 +129,16 @@
#define SSHNODELAY_SO "sshnodelay.so"
@@ -102,7 +102,7 @@
struct buffer {
uint8_t *p;
size_t len;
-@@ -149,6 +168,9 @@
+@@ -169,6 +188,9 @@
int connver;
int modifver;
int refs;
@@ -112,7 +112,7 @@
};
struct sshfs {
-@@ -184,6 +206,10 @@
+@@ -208,6 +230,10 @@
int server_version;
unsigned remote_uid;
unsigned local_uid;
@@ -123,7 +123,7 @@
int remote_uid_detected;
unsigned blksize;
char *progname;
-@@ -589,8 +615,17 @@
+@@ -641,8 +667,17 @@
}
}
@@ -141,7 +141,7 @@
memset(stbuf, 0, sizeof(struct stat));
stbuf->st_mode = mode;
-@@ -651,11 +686,33 @@
+@@ -745,11 +780,33 @@
#ifdef SSH_NODELAY_WORKAROUND
static int do_ssh_nodelay_workaround(void)
{
@@ -175,7 +175,7 @@
snprintf(sopath, sizeof(sopath), "%s/%s", LIBDIR, SSHNODELAY_SO);
res = access(sopath, R_OK);
if (res == -1) {
-@@ -680,16 +737,24 @@
+@@ -774,16 +831,24 @@
return -1;
}
}
@@ -200,7 +200,7 @@
g_free(newpreload);
return 0;
}
-@@ -1188,6 +1253,10 @@
+@@ -1476,6 +1541,10 @@
sshfs.remote_uid = stbuf.st_uid;
sshfs.local_uid = getuid();
@@ -211,7 +211,7 @@
sshfs.remote_uid_detected = 1;
DEBUG("remote_uid = %i\n", sshfs.remote_uid);
-@@ -1758,6 +1827,14 @@
+@@ -2070,6 +2139,14 @@
buf_init(&buf, 0);
buf_add_path(&buf, path);
buf_add_uint32(&buf, SSH_FILEXFER_ATTR_UIDGID);
@@ -226,7 +226,7 @@
buf_add_uint32(&buf, uid);
buf_add_uint32(&buf, gid);
err = sftp_request(SSH_FXP_SETSTAT, &buf, SSH_FXP_STATUS, NULL);
-@@ -1840,6 +1917,9 @@
+@@ -2153,6 +2230,9 @@
sf = g_new0(struct sshfs_file, 1);
list_init(&sf->write_reqs);
pthread_cond_init(&sf->write_finished, NULL);
@@ -236,15 +236,15 @@
/* Assume random read after open */
sf->is_seq = 0;
sf->refs = 1;
-@@ -1873,11 +1953,21 @@
+@@ -2186,11 +2266,21 @@
}
if (!err) {
+#if (__FreeBSD__ >= 10)
+ if (cache_enabled)
-+ cache_add_attr(path, &stbuf);
++ cache_add_attr(path, &stbuf, wrctr);
+#else
- cache_add_attr(path, &stbuf);
+ cache_add_attr(path, &stbuf, wrctr);
+#endif
buf_finish(&sf->handle);
fi->fh = (unsigned long) sf;
@@ -258,7 +258,7 @@
g_free(sf);
}
buf_free(&buf);
-@@ -1932,14 +2022,32 @@
+@@ -2245,14 +2335,32 @@
static void sshfs_file_put(struct sshfs_file *sf)
{
@@ -291,7 +291,7 @@
}
static int sshfs_release(const char *path, struct fuse_file_info *fi)
-@@ -2583,7 +2691,12 @@
+@@ -2942,7 +3050,12 @@
exit(1);
case KEY_VERSION:
@@ -304,9 +304,25 @@
#if FUSE_VERSION >= 25
fuse_opt_add_arg(outargs, "--version");
sshfs_fuse_main(outargs);
-@@ -2650,8 +2763,17 @@
- fuse_opt_insert_arg(args, 1, "-olarge_read");
+@@ -3026,6 +3139,15 @@
+ perror("Failed to allocate locked page for password");
+ return -1;
+ }
++#if (__FreeBSD__ >= 10)
++ if (mlock(sshfs.password, size) != 0) {
++ memset(sshfs.password, 0, size);
++ munmap(sshfs.password, size);
++ sshfs.password = NULL;
++ perror("Failed to allocate locked page for password");
++ return -1;
++ }
++#endif /* __FreeBSD__ >= 10 */
+
+ /* Don't use fgets() because password might stay in memory */
+ for (n = 0; n < max_password; n++) {
+@@ -3157,8 +3279,17 @@
}
+ #endif
+#if (__FreeBSD__ >= 10)
+int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
@@ -322,29 +338,30 @@
int res;
struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
char *tmp;
-@@ -2660,13 +2782,21 @@
+@@ -3167,6 +3298,10 @@
const char *sftp_server;
int libver;
+#if (__FreeBSD__ >= 10)
+ /* Until this gets fixed somewhere else. */
+ g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, TRUE);
-+#endif
++#endif /* __FreeBSD__ >= 10 */
g_thread_init(NULL);
sshfs.blksize = 4096;
- sshfs.max_read = 65536;
+@@ -3174,7 +3309,11 @@
+ sshfs.max_write = 65536;
sshfs.nodelay_workaround = 1;
sshfs.nodelaysrv_workaround = 0;
+#if (__FreeBSD__ >= 10)
+ sshfs.rename_workaround = 1;
+#else
sshfs.rename_workaround = 0;
-+#endif
++#endif /* __FreeBSD__ >= 10 */
sshfs.truncate_workaround = 0;
sshfs.buflimit_workaround = 1;
sshfs.ssh_ver = 2;
-@@ -2676,6 +2806,10 @@
+@@ -3187,6 +3326,10 @@
ssh_add_arg("-a");
ssh_add_arg("-oClearAllForwardings=yes");
@@ -357,7 +374,7 @@
exit(1);
diff -Naur old/sshnodelay.c new/sshnodelay.c
--- old/sshnodelay.c 2007-12-11 14:23:29.000000000 -0800
-+++ new/sshnodelay.c 2008-01-10 04:01:39.000000000 -0800
++++ new/sshnodelay.c 2008-10-21 15:46:00.000000000 -0700
@@ -5,6 +5,32 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
