[bollin] r5499 committed - smbnetfs_0.6.0-1

[bol...@googlecode.com]

Revision: 5499
Author: Mikhail.Kshevetskiy
Date: Sun Jan 11 13:16:15 2015 UTC
Log: smbnetfs_0.6.0-1

https://code.google.com/p/bollin/source/detail?r=5499

Added:
/smbnetfs/trunk/debian/patches/help-fixes.diff
Modified:
/smbnetfs/trunk/debian/changelog
/smbnetfs/trunk/debian/control
/smbnetfs/trunk/debian/patches/series
/smbnetfs/trunk/debian/smbnetfs.1

=======================================
--- /dev/null
+++ /smbnetfs/trunk/debian/patches/help-fixes.diff Sun Jan 11 13:16:15 2015
UTC
@@ -0,0 +1,22 @@
+diff --git a/src/reconfigure.c b/src/reconfigure.c
+index cbc765b..2b3a1fb 100644
+--- a/src/reconfigure.c
++++ b/src/reconfigure.c
+@@ -54,7 +54,7 @@ const char *smbnetfs_option_list =
+ " -o smb_tree_scan_period=T Period of scanning samba network tree
(300s)\n"
+ " -o smb_tree_elements_ttl=T TTL of scanned elements in samba tree
(900s)\n"
+ " -o smb_query_browsers=BOOL Enable/disable scanning of samba tree
(on)\n"
+- " -o smb_timeout Samba reply timeout (20000ms)\n"
++ " -o smb_timeout=T Samba reply timeout (20000ms)\n"
+ " -o show_$_shares=BOOL Enable/disable showing of hidden
shares (off)\n"
+ " -o show_hidden_hosts=BOOL See in documentation (off)\n"
+ " -o free_space_size=N Free space size in pages (0)\n"
+@@ -65,7 +65,7 @@ const char *smbnetfs_option_list =
+ " -o time_step=T Scheduler sleep interval (10s)\n"
+ " -o config_update_period=T Configuration update interval (300s)\n"
+ " -o max_ctx_count=N Maximum number of childs (15)\n"
+- " -o max_retry_count=N Number of retries before fail (3)\n"
++ " -o max_retry_count=N Number of retries before fail (2)\n"
+ " -o listen_timeout=T Child process inactivity timeout
(300s)\n"
+ " -o reply_timeout=T Child process reply timeout (30s)\n"
+ " -o max_passwd_query_count=N See in documentation (10)\n";
=======================================
--- /smbnetfs/trunk/debian/changelog Fri Dec 27 08:13:22 2013 UTC
+++ /smbnetfs/trunk/debian/changelog Sun Jan 11 13:16:15 2015 UTC
@@ -1,3 +1,14 @@
+smbnetfs (0.6.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #737233)
+ * debian/control:
+ + Bump up Standards-Version to 3.9.6 (fix lintian warning)
+ + add libglib2.0-dev >= 2.30 to build depends
+ * debian/smbnetfs.1: update man page
+ * add patch help-fixes.diff: fix help printing
+
+ -- Mikhail Kshevetskiy <mikhail.k...@gmail.com> Sun, 11 Jan 2015
14:54:31 +0400
+
smbnetfs (0.5.3b-1) unstable; urgency=low

* New upstream release (Closes: #728632, fix building with samba >= 4.0)
=======================================
--- /smbnetfs/trunk/debian/control Fri Dec 27 08:12:47 2013 UTC
+++ /smbnetfs/trunk/debian/control Sun Jan 11 13:16:15 2015 UTC
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Mikhail Kshevetskiy <mikhail.k...@gmail.com>
Uploaders: Varun Hiremath <va...@debian.org>
-Build-Depends: debhelper (>= 9), cdbs, quilt, pkg-config, libsmbclient-dev
(>= 3.2), libfuse-dev (>= 2.6), libgnome-keyring-dev (>= 2.28)
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), cdbs, quilt, pkg-config, libsmbclient-dev
(>= 3.2), libfuse-dev (>= 2.6), libglib2.0-dev (>= 2.30),
libgnome-keyring-dev (>= 2.28)
+Standards-Version: 3.9.6
Homepage: http://sourceforge.net/projects/smbnetfs
Vcs-Svn: https://bollin.googlecode.com/svn/smbnetfs/
Vcs-Browser: http://bollin.googlecode.com/svn/smbnetfs/
=======================================
--- /smbnetfs/trunk/debian/patches/series Mon Dec 23 21:27:27 2013 UTC
+++ /smbnetfs/trunk/debian/patches/series Sun Jan 11 13:16:15 2015 UTC
@@ -1,2 +1,3 @@
datadir.diff
warning.diff
+help-fixes.diff
=======================================
--- /smbnetfs/trunk/debian/smbnetfs.1 Thu Aug 5 23:16:31 2010 UTC
+++ /smbnetfs/trunk/debian/smbnetfs.1 Sun Jan 11 13:16:15 2015 UTC
@@ -1,4 +1,4 @@
-.TH smbnetfs 1 "August 06, 2010"
+.TH smbnetfs 1 "January 11, 2015"
.SH NAME
smbnetfs \- User-space filesystem for SMB/NMB (Windows) network servers
and shares
.SH DESCRIPTION
@@ -51,6 +51,9 @@
\fB\-o\fR smb_query_browsers=BOOL
Enable/disable scanning of samba tree (on)
.TP
+\fB\-o\fR smb_timeout=T
+Samba reply timeout (20000ms))
+.TP
\fB\-o\fR show_$_shares=BOOL
Enable/disable showing of hidden shares (off)
.TP
@@ -63,8 +66,14 @@
\fB\-o\fR quiet_flag=BOOL
Do not fail on chown/chgroup (on)
.TP
+\fB\-o\fR neg_cache=BOOL
+Enable/disable negative cache (on)
+.TP
+\fB\-o\fR neg_cache_timeout=T
+Negative cache records expiration time (3000ms)
+.TP
\fB\-o\fR stat_workaround_depth=N
-konquerror and gnome termal hack (3)
+konquerror and gnome terminal hack (3)
.TP
\fB\-o\fR time_step=T
Scheduler sleep interval (10s)
@@ -76,7 +85,7 @@
Maximum number of childs (15)
.TP
\fB\-o\fR max_retry_count=N
-Number of retries before fail (3)
+Number of retries before fail (2)
.TP
\fB\-o\fR listen_timeout=T
Child process inactivity timeout (300s)
@@ -103,14 +112,21 @@
\fB\-o\fR allow_root
allow access to root
.TP
+\fB\-o\fR auto_unmount
+auto unmount on process termination
+.TP
\fB\-o\fR nonempty
allow mounts over non\-empty file/dir
-.HP
-\fB\-o\fR default_permissions enable permission checking by kernel
+.TP
+\fB\-o\fR default_permissions
+enable permission checking by kernel
.TP
\fB\-o\fR fsname=NAME
set filesystem name
.TP
+\fB\-o\fR subtype=NAME
+set filesystem type
+.TP
\fB\-o\fR large_read
issue large read requests (2.4 only)
.TP
@@ -132,6 +148,9 @@
\fB\-o\fR kernel_cache
cache files in kernel
.TP
+\fB\-o\fR [no]auto_cache
+enable caching based on modification times (off)
+.TP
\fB\-o\fR umask=M
set file permissions (octal)
.TP
@@ -149,6 +168,84 @@
.TP
\fB\-o\fR attr_timeout=T
cache timeout for attributes (1.0s)
+.TP
+\fB\-o\fR ac_attr_timeout=T
+auto cache timeout for attributes (attr_timeout)
+.TP
+\fB\-o\fR noforget
+never forget cached inodes
+.TP
+\fB\-o\fR remember=T
+remember cached inodes for T seconds (0s)
+.TP
+\fB\-o\fR nopath
+don't supply path if not necessary
+.TP
+\fB\-o\fR intr
+allow requests to be interrupted
+.TP
+\fB\-o\fR intr_signal=NUM
+signal to send on interrupt (10)
+.TP
+\fB\-o\fR modules=M1[:M2...]
+names of modules to push onto filesystem stack
+.TP
+\fB\-o\fR max_write=N
+set maximum size of write requests
+.TP
+\fB\-o\fR max_readahead=N
+set maximum readahead
+.TP
+\fB\-o\fR max_background=N
+set number of maximum background requests
+.TP
+\fB\-o\fR congestion_threshold=N
+set kernel's congestion threshold
+.TP
+\fB\-o\fR async_read
+perform reads asynchronously (default)
+.TP
+\fB\-o\fR sync_read
+perform reads synchronously
+.TP
+\fB\-o\fR atomic_o_trunc
+enable atomic open+truncate support
+.TP
+\fB\-o\fR big_writes
+enable larger than 4kB writes
+.TP
+\fB\-o\fR no_remote_lock
+disable remote file locking
+.TP
+\fB\-o\fR no_remote_flock
+disable remote file locking (BSD)
+.TP
+\fB\-o\fR no_remote_posix_lock
+disable remove file locking (POSIX)
+.TP
+\fB\-o\fR [no_]splice_write
+use splice to write to the fuse device
+.TP
+\fB\-o\fR [no_]splice_move
+move data while splicing to the fuse device
+.TP
+\fB\-o\fR [no_]splice_read
+use splice to read from the fuse device
+.SS "Module options:"
+.SS "[iconv]"
+.TP
+\fB\-o\fR from_code=CHARSET
+original encoding of file names (default: UTF-8)
+.TP
+\fB\-o\fR to_code=CHARSET
+new encoding of the file names (default: UTF-8)
+.SS "[subdir]"
+.TP
+\fB\-o\fR subdir=DIR
+prepend this directory to all paths (mandatory)
+.TP
+\fB\-o\fR [no]rellinks
+transform absolute symlinks to relative
.SH FILES
Please create configuration directory ~/.smb. This
directory should contain at least two files: smb.conf and
@@ -156,5 +253,6 @@
directory. You can find a sample of smbnetfs.conf in the
/etc directory.
.SH AUTHOR
-This manual page was written by Varun Hiremath <varunh...@gmail.com>,
+This manual page was written by Varun Hiremath <varunh...@gmail.com>
+and lately updated by Mikhail Kshevetskiy <mikhail.k...@gmail.com>,
for the Debian project (but may be used by others).