Merge pull request #8943 from Andy2244/samba4-update-4-9-7
samba4: update to 4.9.7
This commit is contained in:
commit
f9f9ac01d0
2 changed files with 11 additions and 4 deletions
|
@ -2,8 +2,8 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=samba
|
PKG_NAME:=samba
|
||||||
PKG_VERSION:=4.9.6
|
PKG_VERSION:=4.9.7
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
|
PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
|
||||||
PKG_LICENSE:=GPL-3.0-only
|
PKG_LICENSE:=GPL-3.0-only
|
||||||
|
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://ftp.heanet.ie/mirrors/ftp.samba.org/stable/ \
|
||||||
http://samba.mirror.bit.nl/samba/ftp/stable/ \
|
http://samba.mirror.bit.nl/samba/ftp/stable/ \
|
||||||
https://download.samba.org/pub/samba/stable/
|
https://download.samba.org/pub/samba/stable/
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_HASH:=c9205a651a83d69e200fec9dd65e9fa360f0c75ab3275b3dcb74e5cbaec60807
|
PKG_HASH:=44e5bc58dcae6d86ca8d5f269fa927f20ff91bce97cde86fe4e83addcb89c001
|
||||||
|
|
||||||
# samba4=(asn1_compile) e2fsprogs=(compile_et) nfs-kernel-server=(rpcgen)
|
# samba4=(asn1_compile) e2fsprogs=(compile_et) nfs-kernel-server=(rpcgen)
|
||||||
HOST_BUILD_DEPENDS:=nfs-kernel-server/host e2fsprogs/host
|
HOST_BUILD_DEPENDS:=nfs-kernel-server/host e2fsprogs/host
|
||||||
|
|
|
@ -82,6 +82,8 @@ smb_add_share() {
|
||||||
local timemachine
|
local timemachine
|
||||||
local timemachine_maxsize
|
local timemachine_maxsize
|
||||||
local force_root
|
local force_root
|
||||||
|
local write_list
|
||||||
|
local read_list
|
||||||
|
|
||||||
config_get name $1 name
|
config_get name $1 name
|
||||||
config_get path $1 path
|
config_get path $1 path
|
||||||
|
@ -97,6 +99,8 @@ smb_add_share() {
|
||||||
config_get_bool timemachine $1 timemachine 0
|
config_get_bool timemachine $1 timemachine 0
|
||||||
config_get timemachine_maxsize $1 timemachine_maxsize
|
config_get timemachine_maxsize $1 timemachine_maxsize
|
||||||
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
|
||||||
|
|
||||||
[ -z "$name" -o -z "$path" ] && return
|
[ -z "$name" -o -z "$path" ] && return
|
||||||
|
|
||||||
|
@ -118,6 +122,9 @@ smb_add_share() {
|
||||||
[ -n "$guest_only" ] && echo -e "\tguest only = $guest_only" >> /var/etc/smb.conf
|
[ -n "$guest_only" ] && echo -e "\tguest only = $guest_only" >> /var/etc/smb.conf
|
||||||
[ -n "$inherit_owner" ] && echo -e "\tinherit owner = $inherit_owner" >> /var/etc/smb.conf
|
[ -n "$inherit_owner" ] && echo -e "\tinherit owner = $inherit_owner" >> /var/etc/smb.conf
|
||||||
|
|
||||||
|
[ -n "$write_list" ] && echo -e "\twrite list = $write_list" >> /var/etc/smb.conf
|
||||||
|
[ -n "$read_list" ] && echo -e "\tread list = $read_list" >> /var/etc/smb.conf
|
||||||
|
|
||||||
if [ "$MACOS" -eq 1 ]; then
|
if [ "$MACOS" -eq 1 ]; then
|
||||||
vfs_objects="catia fruit streams_xattr $vfs_objects"
|
vfs_objects="catia fruit streams_xattr $vfs_objects"
|
||||||
echo -e "\tfruit:encoding = native" >> /var/etc/smb.conf
|
echo -e "\tfruit:encoding = native" >> /var/etc/smb.conf
|
||||||
|
|
Loading…
Reference in a new issue