cifsd-tools: update to git (2019-11-25)

* cifsd-tools: fix Assignment of a signed value which has type 'long'
* init: convert hide_dot_files to yes/no option
* 'read only = no' seems bugged for cifsd/smb.conf, so fix via 'writeable = yes'

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

diff --git a/net/cifsd-tools/Makefile b/net/cifsd-tools/Makefile
index cb795d20a553851c4a842194d7f16ff95cc67812..2990eeeed4237c75485f324e18d55a1c848538b6 100644 (file)
--- a/net/cifsd-tools/Makefile
+++ b/net/cifsd-tools/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cifsd-team/cifsd-tools.git
-PKG_SOURCE_DATE:=2019-11-13
-PKG_SOURCE_VERSION:=0e17afffe8725fabe6e9209e34d8c7c2759353e4
-PKG_MIRROR_HASH:=8ecf590047d30913488d9d2026448131e151df44159623c0aa69c910b74fd646
+PKG_SOURCE_DATE:=2019-11-25
+PKG_SOURCE_VERSION:=49d0c40129fe22161999ffb7e059b90089f23078
+PKG_MIRROR_HASH:=cd3702f1387ab643233200dcf5c244989b6d6efa196c69e842791e434eb3eea7
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/net/cifsd-tools/files/cifsd.init b/net/cifsd-tools/files/cifsd.init
index c676159e0fa417fbc57d4d813e75b2c1861a3f21..c06e19284b5bf5fb15f3427386c5a6a58042c53e 100644 (file)
--- a/net/cifsd-tools/files/cifsd.init
+++ b/net/cifsd-tools/files/cifsd.init
@@ -74,10 +74,10 @@ smb_add_share()
        config_get read_only $1 read_only
        config_get writeable $1 writeable
        config_get guest_ok $1 guest_ok
-       config_get_bool force_root      $1 force_root   0
+       config_get_bool force_root $1 force_root 0
        config_get write_list $1 write_list
        config_get read_list $1 read_list
-       config_get_bool hide_dot_files  $1 hide_dot_files       0
+       config_get hide_dot_files $1 hide_dot_files
        config_get veto_files $1 veto_files
        config_get inherit_owner $1 inherit_owner
        config_get force_create_mode $1 force_create_mode
@@ -103,14 +103,19 @@ smb_add_share()
 
                [ -n "$browseable" ] && printf "\tbrowseable = %s\n" "$browseable"
                [ -n "$read_only" ] && printf "\tread only = %s\n" "$read_only"
-               [ -n "$writeable" ] && printf "\twriteable = %s\n" "$writeable"
+               # possible upstream bug?
+               if [ "$read_only" = "no" ]; then
+                       printf "\twriteable = yes\n"
+               else
+                       [ -n "$writeable" ] && printf "\twriteable = %s\n" "$writeable"
+               fi
                [ -n "$guest_ok" ] && printf "\tguest ok = %s\n" "$guest_ok"
                [ -n "$inherit_owner" ] && printf "\tinherit owner = %s\n" "$inherit_owner"
 
                [ -n "$write_list" ] && printf "\twrite list = %s\n" "$write_list"
                [ -n "$read_list" ] && printf "\tread list = %s\n" "$read_list"
 
-               [ "$hide_dot_files" -eq 1 ] && printf "\thide dot files = %s\n" "yes"
+               [ -n "$hide_dot_files" ] && printf "\thide dot files = %s\n" "$hide_dot_files"
                [ -n "$veto_files" ] && printf "\tveto files = %s\n" "$veto_files"
        } >> /var/etc/cifs/smb.conf
 }