samba4: bump to 4.9.11

package/lean/luci-app-samba4/po/es/samba4.po

@@ -1,17 +1,17 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:41+0200\n"
-"PO-Revision-Date: 2012-08-22 17:45+0200\n"
+"PO-Revision-Date: 2019-03-01 18:06-0300\n"
 "Last-Translator: José Vicente <josevteg@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Poedit 2.2.1\n"
+"Language-Team: \n"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:78
 msgid "Allow guests"
@@ -20,8 +20,8 @@ msgstr "Permitir invitados"
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:15
 msgid "Allow system users to reach their home directories via network shares"
 msgstr ""
-"Permitir a los usuarios acceder a sus directorios de inicio vía "
-"comparticiones de red"
+"Permitir que los usuarios del sistema lleguen a sus carpetas personales a "
+"través de Samba"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:75
 msgid "Allowed users"
@@ -29,11 +29,11 @@ msgstr "Usuarios permitidos"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:106
 msgid "Apple Time-machine share"
-msgstr ""
+msgstr "Compartir como Apple Time-Machine"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:63
 msgid "Browse-able"
-msgstr ""
+msgstr "Navegable"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:93
 msgid "Create mask"
@@ -45,19 +45,19 @@ msgstr "Descripción"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:98
 msgid "Directory mask"
-msgstr "Máscara de directorio"
+msgstr "Máscara de carpeta"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:27
 msgid "Disable Active Directory Domain Controller"
-msgstr ""
+msgstr "Deshabilitar el controlador de dominio de carpeta activa"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:24
 msgid "Disable Netbios"
-msgstr ""
+msgstr "Deshabilitar Netbios"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:30
 msgid "Disable Winbind"
-msgstr ""
+msgstr "Deshabilitar Winbind"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:9
 msgid "Edit Template"
@@ -69,33 +69,35 @@ msgstr "Editar la plantilla usada para generar la configuración de samba."
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:19
 msgid "Enable macOS compatible shares"
-msgstr ""
+msgstr "Habilitar compatibilidad de Samba con macOS"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:20
 msgid ""
 "Enables Apple's AAPL extension globally and adds macOS compatibility options "
 "to all shares."
 msgstr ""
+"Habilita la extensión AAPL de Apple globalmente y agrega opciones de "
+"compatibilidad de macOS a todos los recursos compartidos."
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:73
 msgid "Force Root"
-msgstr ""
+msgstr "Forzar Root"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:8
 msgid "General Settings"
-msgstr "Configuración general"
+msgstr "Ajustes generales"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:83
 msgid "Guests only"
-msgstr ""
+msgstr "Sólo invitados"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:11
 msgid "Hostname"
-msgstr "Nombre de máquina"
+msgstr "Nombre del dispositivo"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:88
 msgid "Inherit owner"
-msgstr ""
+msgstr "Heredar dueño"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:57
 msgid "Name"
@@ -104,7 +106,7 @@ msgstr "Nombre"
 #: applications/luci-app-samba4/luasrc/controller/samba4.lua:12
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:3
 msgid "Network Shares"
-msgstr "Comparticiones de red"
+msgstr "Samba"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:58
 msgid "Path"
@@ -115,18 +117,20 @@ msgid ""
 "Please add directories to share. Each directory refers to a folder on a "
 "mounted device."
 msgstr ""
+"Por favor agregue carpetas para compartir. Cada carpeta se refiere a una "
+"carpeta en un dispositivo montado."
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:68
 msgid "Read-only"
-msgstr "Solo lectura"
+msgstr "Sólo lectura"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:14
 msgid "Share home-directories"
-msgstr "Compartir directorios personales"
+msgstr "Compartir carpetas personales"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:51
 msgid "Shared Directories"
-msgstr "Directorios compartidos"
+msgstr "Carpetas compartidos"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:35
 msgid ""
@@ -141,11 +145,11 @@ msgstr ""
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:108
 msgid "Time-machine size in GB"
-msgstr ""
+msgstr "Tamaño del Time-Machine en GB"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:103
 msgid "Vfs objects"
-msgstr ""
+msgstr "Objetos vfs"
 
 #: applications/luci-app-samba4/luasrc/model/cbi/samba4.lua:13
 msgid "Workgroup"

package/lean/samba4/Config.in

@@ -1,7 +1,6 @@
 config SAMBA4_SERVER_ACL
 	bool "ACL support (xattr)"
 	depends on PACKAGE_samba4-server
-	select PACKAGE_acl
 	help
 		installs: sharesec
 			modules: vfs_acl_xattr vfs_acl_tdb vfs_posixacl
@@ -12,13 +11,9 @@ config SAMBA4_SERVER_ACL
 config SAMBA4_SERVER_AD_DC
 	bool "Active Directory Domain Controller support (requires krb5-server) (EXPERIMENTAL)"
 	depends on PACKAGE_samba4-server
-	select PACKAGE_python-base
 	select PACKAGE_python-crypto
-	select PACKAGE_libopenssl
-	select PACKAGE_libgnutls
-	select PACKAGE_libopenldap
 	help
-		installs: samba (meta-daemon) python-crypt ntlm_auth
+		installs: samba (meta-daemon) python-crypto ntlm_auth
 			scripts: samba-tool
 
 		Run as a Active Directory Domain Controller
@@ -31,7 +26,6 @@ config SAMBA4_SERVER_AVAHI
 	bool "Avahi support"
 	depends on PACKAGE_samba4-server
 	select SAMBA4_SERVER_VFS
-	select PACKAGE_libavahi-client
 	help
 		Announce Samba resources via DNS/DNS-SD using the Avahi daemon, for Linux/Mac clients.
 	default y
@@ -76,12 +70,11 @@ config SAMBA4_SERVER_NETBIOS
 		WSD (Web Services for Devices) replaces the functionality of NetBIOS and is provided by the wsdd2 package (selected by default).
 		Note: As of Windows 10 Fall Creators Update (1709) NetBIOS isn't supported unless the old SMB1 feature is reinstalled (not recommended).
 		Network shares can be directly accessed via network paths '\\hostname\sharename' and mounted via 'map network drive' without NetBIOS or WSD.
-	default n
+	default y
 
 config SAMBA4_SERVER_WINBIND
 	bool "Winbind support"
 	depends on PACKAGE_samba4-server
-	depends on SAMBA4_SERVER_AD_DC
 	help
 		installs: winbindd (daemon) wbinfo
 

package/lean/samba4/Makefile

@@ -2,19 +2,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
-PKG_VERSION:=4.9.2
+PKG_VERSION:=4.9.11
 PKG_RELEASE:=3
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://ftp.heanet.ie/mirrors/ftp.samba.org/stable/ \
+		https://ftp.gwdg.de/pub/samba/stable/ \
+		https://ftp.riken.jp/net/samba/samba/stable/ \
+		http://www.nic.funet.fi/index/samba/pub/samba/stable/ \
+		http://samba.mirror.bit.nl/samba/ftp/stable/ \
+		https://download.samba.org/pub/samba/stable/
+PKG_HASH:=bb736624d16f7369e395de2f15fec153b554f76f95864015b4ce1f2ae53e817b
+
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=COPYING
 
-PKG_SOURCE_URL:=https://download.samba.org/pub/samba/stable/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=349c17b7bf1bf667167843470533da89ff1b2ca4a768b529aaacf5197af1efa2
-
-# Buildroot bug? Can't add target deps via '+SAMBA4_SERVER_AD_DC:python-crypto' (as work-around we select via config.in)
-PKG_BUILD_DEPENDS:=SAMBA4_SERVER_AD_DC:python-crypto nfs-kernel-server/host
+# samba4=(asn1_compile) e2fsprogs=(compile_et) nfs-kernel-server=(rpcgen)
+HOST_BUILD_DEPENDS:=python/host nfs-kernel-server/host e2fsprogs/host
+PKG_BUILD_DEPENDS:=samba4/host
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_SAMBA4_SERVER_NETBIOS \
@@ -29,6 +35,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_kmod-fs-xfs
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
@@ -36,7 +43,7 @@ define Package/samba4/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Samba $(PKG_VERSION)
-  URL:=http://www.samba.org/
+  URL:=https://www.samba.org/
 endef
 
 define Package/samba4/Default/description
@@ -50,8 +57,8 @@ endef
 define Package/samba4-libs
   $(call Package/samba4/Default)
   TITLE+= libs
-  DEPENDS:= +zlib +libtirpc +krb5-libs +libpopt +libcap \
-	+PACKAGE_libpthread:libpthread +PACKAGE_libnettle:libnettle \
+  DEPENDS:= +zlib +libtirpc +libpopt +libcomerr +libreadline \
+	+PACKAGE_libcap:libcap +PACKAGE_libpthread:libpthread +PACKAGE_libnettle:libnettle \
 	+PACKAGE_libgcrypt:libgcrypt +PACKAGE_libpam:libpam +PACKAGE_dbus:dbus +PACKAGE_libavahi-client:libavahi-client \
 	+SAMBA4_SERVER_VFS:attr \
 	+SAMBA4_SERVER_ACL:acl +SAMBA4_SERVER_ACL:attr \
@@ -63,15 +70,17 @@ define Package/samba4-server
   $(call Package/samba4/Default)
   TITLE+= server
   DEPENDS:= +samba4-libs
+  EXTRA_DEPENDS:=$(if $(CONFIG_SAMBA4_SERVER_AD_DC),python-crypto,)
 endef
 
 define Package/samba4-server/description
-  installs: smbd (daemon) smbpasswd pdbedit testparm
+  installs: smbd, nmbd (daemon) smbpasswd pdbedit testparm
 
-    This provides the basic fileserver service and is the minimum needed to serve file shares.
-    HINT: https://fitzcarraldoblog.wordpress.com/2016/10/17/a-correct-method-of-configuring-samba-for-browsing-smb-shares-in-a-home-network/
+  This provides the basic fileserver service and is the minimum needed to serve file shares.
+  HINT: https://fitzcarraldoblog.wordpress.com/2016/10/17/a-correct-method-of-configuring-samba-for-browsing-smb-shares-in-a-home-network/
 endef
 
+# BUG: We cant add DEPENDS:= +SAMBA4_SERVER_AD_DC:python-crypto, so this only happens here via select!
 define Package/samba4-server/config
   select PACKAGE_wsdd2
   source "$(SOURCE)/Config.in"
@@ -120,16 +129,33 @@ CONFIGURE_VARS += \
 	CPP="$(TARGET_CROSS)cpp"
 
 CONFIGURE_CMD = ./buildtools/bin/waf
+HOST_CONFIGURE_CMD = ./buildtools/bin/waf
 
 # Strip options that WAF configure script does not recognize
 CONFIGURE_ARGS:=$(filter-out	\
-	--host=%		\
-	--build=%		\
-	--program-suffix=%	\
+	--target=%			\
+	--host=%			\
+	--build=%			\
+	--program-prefix=%	\
+	--program-suffix=% 	\
 	--disable-nls		\
 	--disable-ipv6		\
 	, $(CONFIGURE_ARGS))
 
+HOST_CONFIGURE_ARGS:=$(filter-out	\
+	--target=%			\
+	--host=%			\
+	--build=%			\
+	--program-prefix=%	\
+	--program-suffix=% 	\
+	--disable-nls		\
+	--disable-ipv6		\
+	, $(HOST_CONFIGURE_ARGS))
+
+# Waf needs the "configure" argument
+CONFIGURE_ARGS:=configure $(CONFIGURE_ARGS)
+HOST_CONFIGURE_ARGS:=configure $(HOST_CONFIGURE_ARGS)
+
 CONFIGURE_ARGS += \
 		--hostcc="$(HOSTCC)" \
 		--cross-compile \
@@ -156,6 +182,35 @@ CONFIGURE_ARGS += \
 		--without-regedit \
 		--without-gpgme
 
+HOST_CONFIGURE_ARGS += \
+		--hostcc="$(HOSTCC)" \
+		--disable-cups \
+		--disable-iprint \
+		--disable-cephfs \
+		--disable-fault-handling \
+		--disable-glusterfs \
+		--disable-rpath \
+		--disable-rpath-install \
+		--disable-rpath-private-install \
+		--enable-fhs \
+		--without-automount \
+		--without-iconv \
+		--without-lttng \
+		--without-ntvfs-fileserver \
+		--without-pam \
+		--without-systemd \
+		--without-utmp \
+		--without-dmapi \
+		--without-fam \
+		--without-gettext \
+		--without-regedit \
+		--without-gpgme
+
+HOST_CONFIGURE_ARGS += --disable-avahi --without-quotas --without-acl-support --without-winbind \
+	--without-ad-dc --without-json-audit --without-libarchive --disable-python --nopyc --nopyo \
+	--disable-gnutls --without-dnsupdate --without-ads --without-ldap
+HOST_CONFIGURE_VARS += python_LDFLAGS="" python_LIBDIR=""
+
 # Optional AES-NI support - https://lists.samba.org/archive/samba-technical/2017-September/122738.html
 # Support for Nettle wasn't comitted
 ifdef CONFIG_TARGET_x86_64
@@ -170,13 +225,6 @@ CONFIGURE_ARGS += \
 		--with-piddir=/var/run \
 		--with-privatedir=/etc/samba
 
-CONFIGURE_ARGS += \
-		--with-system-mitkrb5 "$(STAGING_DIR)/usr" \
-		--with-system-mitkdc=/usr/sbin/krb5kdc
-
-		## embedded-heimdal
-		# --bundled-libraries=talloc,tevent,tdb,ldb,com_err,cmocka,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,NONE
-
 ifeq ($(CONFIG_SAMBA4_SERVER_AVAHI),y)
 	CONFIGURE_ARGS += --enable-avahi
 else
@@ -196,7 +244,8 @@ ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
 	CONFIGURE_ARGS += --enable-gnutls --with-dnsupdate --with-ads --with-ldap
 	TARGET_CFLAGS := -I$(STAGING_DIR)/usr/include/python2.7 $(TARGET_CFLAGS)
 else
-	CONFIGURE_ARGS += --without-ad-dc --without-json-audit --without-libarchive --disable-python --nopyc --nopyo --disable-gnutls --without-dnsupdate --without-ads --without-ldap
+	CONFIGURE_ARGS += --without-ad-dc --without-json-audit --without-libarchive --disable-python --nopyc --nopyo \
+		--disable-gnutls --without-dnsupdate --without-ads --without-ldap
 	CONFIGURE_VARS += \
 		python_LDFLAGS="" \
 		python_LIBDIR=""
@@ -212,46 +261,55 @@ SAMBA4_IDMAP_MODULES_SHARED :=
 SAMBA4_PDB_MODULES :=pdb_smbpasswd,pdb_tdbsam,
 SAMBA4_AUTH_MODULES :=auth_builtin,auth_sam,auth_unix,auth_script,
 SAMBA4_VFS_MODULES :=vfs_default,
+SAMBA4_VFS_MODULES_SHARED :=
 ifeq ($(CONFIG_SAMBA4_SERVER_VFS),y)
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_fruit,vfs_shadow_copy2,vfs_recycle,vfs_fake_perms,vfs_readonly,vfs_cap,vfs_offline,vfs_crossrename,vfs_catia,vfs_streams_xattr,vfs_xattr_tdb,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_fruit,vfs_shadow_copy2,vfs_recycle,vfs_fake_perms,vfs_readonly,vfs_cap,vfs_offline,vfs_crossrename,vfs_catia,vfs_streams_xattr,vfs_xattr_tdb,
 ifeq ($(CONFIG_PACKAGE_kmod-fs-btrfs),y)
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_btrfs,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_btrfs,
 endif
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_VFSX),y)
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_virusfilter,vfs_shell_snap,vfs_commit,vfs_worm,vfs_aio_fork,vfs_aio_pthread,vfs_netatalk,vfs_dirsort,vfs_fileid,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_virusfilter,vfs_shell_snap,vfs_commit,vfs_worm,vfs_aio_fork,vfs_aio_pthread,vfs_netatalk,vfs_dirsort,vfs_fileid,
 ifeq ($(CONFIG_PACKAGE_kmod-fs-xfs),y)
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_linux_xfs_sgid,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_linux_xfs_sgid,
 endif
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_QUOTAS),y)
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_default_quota,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_default_quota,
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_ACL),y)
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_posixacl,vfs_acl_xattr,vfs_acl_tdb,
+	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_posixacl,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_acl_xattr,vfs_acl_tdb,
 	# vfs_zfsacl needs https://github.com/zfsonlinux/zfs/tree/master/include/sys/zfs_acl.h
 	# vfs_nfs4acl_xattr needs https://github.com/notriddle/libdrpc/blob/master/rpc/xdr.h
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
-	SAMBA4_PDB_MODULES :=$(SAMBA4_PDB_MODULES)pdb_samba_dsdb,
+	SAMBA4_PDB_MODULES :=$(SAMBA4_PDB_MODULES)pdb_samba_dsdb,pdb_ldapsam,
 	SAMBA4_AUTH_MODULES :=$(SAMBA4_AUTH_MODULES)auth_samba4,
-	SAMBA4_VFS_MODULES :=$(SAMBA4_VFS_MODULES)vfs_audit,vfs_extd_audit,vfs_full_audit,
+	SAMBA4_VFS_MODULES_SHARED :=$(SAMBA4_VFS_MODULES_SHARED)vfs_audit,vfs_extd_audit,vfs_full_audit,
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_WINBIND),y)
-	SAMBA4_IDMAP_MODULES :=$(SAMBA4_IDMAP_MODULES)idmap_passdb,idmap_nss,idmap_tdb,idmap_tdb2,idmap_script,nss_info_template,
-	SAMBA4_IDMAP_MODULES_SHARED :=$(SAMBA4_IDMAP_MODULES_SHARED)idmap_autorid,idmap_rid,idmap_ad,idmap_rfc2307,
+	SAMBA4_IDMAP_MODULES :=$(SAMBA4_IDMAP_MODULES)idmap_tdb,idmap_passdb,idmap_nss,nss_info_template,
+	SAMBA4_IDMAP_MODULES_SHARED :=$(SAMBA4_IDMAP_MODULES_SHARED)idmap_autorid,idmap_rid,idmap_hash,idmap_tdb2,idmap_script,
+ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
+	SAMBA4_IDMAP_MODULES_SHARED :=$(SAMBA4_IDMAP_MODULES_SHARED)idmap_ad,idmap_ldap,idmap_rfc2307,
 	# idmap_ad needs --with-ads
 	# idmap_rfc2307 needs ldap headers
+endif
 	SAMBA4_AUTH_MODULES :=$(SAMBA4_AUTH_MODULES)auth_winbind,
 endif
 
-SAMBA4_MODULES :=${SAMBA4_AUTH_MODULES}${SAMBA4_PDB_MODULES}${SAMBA4_IDMAP_MODULES}${SAMBA4_VFS_MODULES}
-SAMBA4_MODULES_SHARDED :=${SAMBA4_IDMAP_MODULES_SHARED}
+SAMBA4_MODULES :=${SAMBA4_VFS_MODULES}${SAMBA4_AUTH_MODULES}${SAMBA4_PDB_MODULES}${SAMBA4_IDMAP_MODULES}
+SAMBA4_MODULES_SHARDED :=${SAMBA4_VFS_MODULES_SHARED}${SAMBA4_IDMAP_MODULES_SHARED}
 
 CONFIGURE_ARGS += \
 		--with-static-modules=$(SAMBA4_MODULES)!DEFAULT,!FORCED \
 		--with-shared-modules=$(SAMBA4_MODULES_SHARDED)!DEFAULT,!FORCED
 
+HOST_CONFIGURE_ARGS += \
+		--with-static-modules=!DEFAULT,!FORCED \
+		--with-shared-modules=!DEFAULT,!FORCED
+
 # Setup build/install targets
 # CONFIG_PACKAGE_samba4-server
 BUILD_TARGETS_SERVER :=smbd/smbd,smbpasswd,pdbedit,testparm
@@ -263,7 +321,7 @@ ifeq ($(CONFIG_SAMBA4_SERVER_NETBIOS),y)
 	BUILD_TARGETS_SERVER :=$(BUILD_TARGETS_SERVER),nmbd
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
-	BUILD_TARGETS_SERVER :=$(BUILD_TARGETS_SERVER),samba,nsstest,ntlm_auth
+	BUILD_TARGETS_SERVER :=$(BUILD_TARGETS_SERVER),samba,nsstest,ntlm_auth,samba4kinit,samba4kgetcred,samba4kpasswd,samba4ktutil
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_WINBIND),y)
 	BUILD_TARGETS_SERVER :=$(BUILD_TARGETS_SERVER),winbindd,wbinfo,winbind_krb5_locator
@@ -271,20 +329,35 @@ endif
 # CONFIG_PACKAGE_samba4-client
 BUILD_TARGETS_CLIENT :=client/smbclient,client/cifsdd
 # CONFIG_PACKAGE_samba4-admin
-BUILD_TARGETS_ADMIN :=net,smbcontrol,profiles,rpcclient,smbcacls,smbcquotas
+BUILD_TARGETS_ADMIN :=net,smbcontrol,profiles,rpcclient,smbcacls,smbcquotas,eventlogadm
 # CONFIG_PACKAGE_samba4-utils
 BUILD_TARGETS_UTILS :=smbstatus,smbtree,smbget,mvxattr,nmblookup
 
 # lib bundling
 # NOTE: bundle + make private, we want to avoid version configuration (build, link) conflicts
-CONFIGURE_ARGS += --builtin-libraries=talloc,tevent,texpect,tdb,ldb,tdr,cmocka,replace
-#CONFIGURE_ARGS += --nonshared-binary=$(BUILD_TARGETS_SERVER)
+CONFIGURE_ARGS += --builtin-libraries=talloc,tevent,tevent-util,texpect,tdb,ldb,tdr,cmocka
+HOST_CONFIGURE_ARGS += --builtin-libraries=replace --nonshared-binary=asn1_compile
+
 ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
-CONFIGURE_ARGS += --bundled-libraries=talloc,tevent,texpect,tdb,ldb,tdr,cmocka,replace,pytalloc-util,pyldb-util,NONE
+CONFIGURE_ARGS += --bundled-libraries=talloc,tevent,tevent-util,texpect,tdb,ldb,tdr,cmocka,replace,pytalloc-util,pyldb-util,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,NONE
 else
-CONFIGURE_ARGS += --bundled-libraries=talloc,tevent,texpect,tdb,ldb,tdr,cmocka,replace,NONE
+CONFIGURE_ARGS += --bundled-libraries=talloc,tevent,tevent-util,texpect,tdb,ldb,tdr,cmocka,replace,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,NONE
 endif
-CONFIGURE_ARGS += --private-libraries=talloc,tevent,texpect,tdb,ldb,tdr,cmocka,replace
+# BUG: --private-libraries, Does not work for System possible libs, will not get "samba4" suffix!
+CONFIGURE_ARGS += --private-libraries=talloc,tevent,tevent-util,texpect,tdb,ldb,tdr,cmocka,replace
+# CONFIGURE_ARGS += --disable-symbol-versions
+
+define Host/Compile
+	(cd $(HOST_BUILD_DIR); \
+		./buildtools/bin/waf build \
+		--targets=asn1_compile \
+	)
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/asn1_compile $(STAGING_DIR_HOSTPKG)/bin/
+endef
 
 define Build/Prepare
 	$(Build/Prepare/Default)
@@ -303,15 +376,16 @@ define Build/Configure
 	echo 'Checking uname version type: "$(VERSION_DIST) Linux-$(LINUX_VERSION) $(shell date +%Y-%m-%d)"' >> $(PKG_BUILD_DIR)/cross-answers.txt
 	# NOTE: For some unknown reason this answer is not needed on some hosts/distros, yet needed on others?
 	echo 'Checking whether POSIX capabilities are available: OK' >> $(PKG_BUILD_DIR)/cross-answers.txt
-	$(call Build/Configure/Default,configure)
+	$(call Build/Configure/Default)
 endef
 
 # BUG: We need to use "waf install --targets=" otherwise a "make install" or "waf install" will retrigger a full recompile of all possible targets!
 define Build/Compile
 	(cd $(PKG_BUILD_DIR); \
-		./buildtools/bin/waf install -j$(shell nproc) \
-		--targets=$(SAMBA4_MODULES)$(SAMBA4_MODULES_SHARDED)$(BUILD_TARGETS_SERVER),$(BUILD_TARGETS_UTILS),$(BUILD_TARGETS_ADMIN),$(BUILD_TARGETS_CLIENT) \
+		./buildtools/bin/waf install \
+		--jobs=$(shell nproc) \
 		--destdir="$(PKG_INSTALL_DIR)" \
+		--targets=$(SAMBA4_MODULES)$(SAMBA4_MODULES_SHARDED)$(BUILD_TARGETS_SERVER),$(BUILD_TARGETS_UTILS),$(BUILD_TARGETS_ADMIN),$(BUILD_TARGETS_CLIENT) \
 	)
 endef
 
@@ -323,6 +397,21 @@ define Package/samba4-libs/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/*.so* $(1)/usr/lib/
+	
+	$(INSTALL_DIR) $(1)/usr/lib/samba/vfs $(1)/usr/lib/samba/idmap $(1)/usr/lib/samba/ldb $(1)/usr/lib/samba/krb5
+	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/idmap ]; then \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/idmap $(1)/usr/lib/samba/; \
+	fi
+	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/vfs ]; then \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/vfs $(1)/usr/lib/samba/; \
+	fi
+	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/krb5 ]; then \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/krb5 $(1)/usr/lib/samba/; \
+	fi
+ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
+	$(INSTALL_DIR) $(1)/usr/lib/python2.7
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7 $(1)/usr/lib/
+endif
 endef
 
 define Package/samba4-client/install
@@ -333,6 +422,8 @@ endef
 define Package/samba4-admin/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{net,smbcontrol,profiles,rpcclient,smbcacls,smbcquotas} $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/eventlogadm $(1)/usr/sbin/
 endef
 
 define Package/samba4-utils/install
@@ -341,27 +432,15 @@ define Package/samba4-utils/install
 endef
 
 define Package/samba4-server/install
-	$(INSTALL_DIR) $(1)/usr/lib/samba
-	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/idmap ]; then \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/idmap $(1)/usr/lib/samba/; \
-	fi
-	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/auth ]; then \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/auth $(1)/usr/lib/samba/; \
-	fi
-	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/vfs ]; then \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/vfs $(1)/usr/lib/samba/; \
-	fi
-	if [ -d $(PKG_INSTALL_DIR)/usr/lib/samba/pdb ]; then \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/samba/pdb $(1)/usr/lib/samba/; \
-	fi
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{smbpasswd,pdbedit,testparm} $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smbd $(1)/usr/sbin/
 ifeq ($(CONFIG_SAMBA4_SERVER_AD_DC),y)
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7 $(1)/usr/lib/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{samba-tool,ntlm_auth,smbtar} $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{samba,samba-gpupdate,samba_dnsupdate,samba_kcc,samba_spnupdate,samba_upgradedns} $(1)/usr/sbin/
+	# waf does not install those?
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/{samba4kinit,samba4kgetcred,samba4kpasswd,samba4ktutil} $(1)/usr/bin/
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_NETBIOS),y)
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nmbd $(1)/usr/sbin/
@@ -374,7 +453,7 @@ ifeq ($(CONFIG_SAMBA4_SERVER_ACL),y)
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sharesec $(1)/usr/bin/
 endif
 	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/samba $(1)/etc/init.d
-	$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba4
+	$(INSTALL_CONF) ./files/samba.config $(1)/etc/config/samba4
 	$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba
 	$(INSTALL_BIN) ./files/samba.init $(1)/etc/init.d/samba4
 endef
@@ -389,8 +468,10 @@ define Package/samba4-server/conffiles
 /etc/samba/idmap.ldb
 /etc/samba/lmhosts
 /etc/nsswitch.conf
+/etc/krb5.conf
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,samba4-libs))
 $(eval $(call BuildPackage,samba4-server))
 $(eval $(call BuildPackage,samba4-client))

package/lean/samba4/files/samba.init

@@ -7,7 +7,8 @@ smb_header() {
 	config_get samba_iface $1 interface "loopback lan"
 
 	# resolve interfaces
-	local interfaces=$(
+	local interfaces
+	interfaces=$(
 		. /lib/functions/network.sh
 
 		local net
@@ -15,19 +16,20 @@ smb_header() {
 			local device
 			network_is_up $net || continue
 			network_get_device device "$net"
-			echo -n "${device:-$net} "
+			printf "%s " "${device:-$net}"
 		done
 	)
 
 	local workgroup description charset
 	# we dont use netbios anymore as default and wsd/avahi is dns based
-	local hostname="$(cat /proc/sys/kernel/hostname)"
+	local hostname
+	hostname="$(cat /proc/sys/kernel/hostname)"
 
 	config_get workgroup		$1 workgroup	"WORKGROUP"
 	config_get description		$1 description	"Samba on OpenWrt"
-	config_get charset			$1 charset		"UTF-8"
-	
-	config_get_bool MACOS			$1 macos			0
+	config_get charset		$1 charset	"UTF-8"
+
+	config_get_bool MACOS		$1 macos		0
 	config_get_bool DISABLE_NETBIOS	$1 disable_netbios	0
 	config_get_bool DISABLE_AD_DC	$1 disable_ad_dc	0
 	config_get_bool DISABLE_WINBIND	$1 disable_winbind	0
@@ -40,15 +42,16 @@ smb_header() {
 	    -e "s#|CHARSET|#$charset#g" \
 	    /etc/samba/smb.conf.template > /var/etc/smb.conf
 
-	echo -e "\n######### Dynamic written config options #########\n" >> /var/etc/smb.conf
-	if [ "$DISABLE_NETBIOS" -eq 1 ] || [ ! -x /usr/sbin/nmbd ]; then
-		echo -e "\tdisable netbios = yes" >> /var/etc/smb.conf
-	fi
+	{
+		printf "\n######### Dynamic written config options #########\n"
+		if [ "$DISABLE_NETBIOS" -eq 1 ] || [ ! -x /usr/sbin/nmbd ]; then
+			printf "\tdisable netbios = yes\n"
+		fi
 
-	local homes
-	config_get_bool homes $1 homes 0
-	[ $homes -gt 0 ] && {
-		cat <<EOT >> /var/etc/smb.conf
+		local homes
+		config_get_bool homes $1 homes 0
+		[ $homes -gt 0 ] && {
+			cat <<EOT
 
 [homes]
 	comment     = Home Directories
@@ -57,9 +60,15 @@ smb_header() {
 	read only   = no
 	create mask = 0750
 EOT
-	}
+		}
+	} >> /var/etc/smb.conf
+
+	[ -e /etc/samba/smb.conf ] || ln -nsf /var/etc/smb.conf /etc/samba/smb.conf
+
+	if ! [ -L /etc/samba/smb.conf ]; then
+		logger -t 'samba4-server' "Local custom /etc/samba/smb.conf file detected, all luci/config settings are ignored!"
+	fi
 
-	[ -L /etc/samba/smb.conf ] || ln -nsf /var/etc/smb.conf /etc/samba/smb.conf
 }
 
 smb_add_share() {
@@ -70,6 +79,7 @@ smb_add_share() {
 	local dir_mask
 	local browseable
 	local read_only
+	local writeable
 	local guest_ok
 	local guest_only
 	local inherit_owner
@@ -77,6 +87,8 @@ smb_add_share() {
 	local timemachine
 	local timemachine_maxsize
 	local force_root
+	local write_list
+	local read_list
 
 	config_get name $1 name
 	config_get path $1 path
@@ -85,6 +97,7 @@ smb_add_share() {
 	config_get dir_mask $1 dir_mask
 	config_get browseable $1 browseable
 	config_get read_only $1 read_only
+	config_get writeable $1 writeable
 	config_get guest_ok $1 guest_ok
 	config_get guest_only $1 guest_only
 	config_get inherit_owner $1 inherit_owner
@@ -92,40 +105,48 @@ smb_add_share() {
 	config_get_bool timemachine	$1 timemachine	0
 	config_get timemachine_maxsize $1 timemachine_maxsize
 	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" ] || [ -z "$path" ] && return
 
-	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
-	
-	if [ "$force_root" -eq 1 ]; then
-		echo -e "\tforce user = root" >> /var/etc/smb.conf
-		echo -e "\tforce group = root" >> /var/etc/smb.conf
-	else
-		[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
-	fi
+	{
+		printf "\n[$name]\n\tpath = %s\n" "$path"
 
-	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/smb.conf
-	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/smb.conf
-
-	[ -n "$browseable" ] && echo -e "\tbrowseable = $browseable" >> /var/etc/smb.conf
-	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
-	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /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
-	
-	if [ "$MACOS" -eq 1 ]; then
-		vfs_objects="catia fruit streams_xattr $vfs_objects"
-		echo -e "\tfruit:encoding = native" >> /var/etc/smb.conf
-		echo -e "\tfruit:metadata = stream" >> /var/etc/smb.conf
-		echo -e "\tfruit:veto_appledouble = no" >> /var/etc/smb.conf
-		# avoid mixed shares order for aapl
-		if [ "$timemachine" -eq 1 ]; then
-			echo -e "\tfruit:time machine = yes" >> /var/etc/smb.conf
-			[ -n "$timemachine_maxsize" ] && echo -e "\tfruit:time machine max size = ${timemachine_maxsize}G" >> /var/etc/smb.conf
+		if [ "$force_root" -eq 1 ]; then
+			printf "\tforce user = root\n"
+			printf "\tforce group = root\n"
+		else
+			[ -n "$users" ] && printf "\tvalid users = %s\n" "$users"
 		fi
-	fi
-	
-	[ -n "$vfs_objects" ] && echo -e "\tvfs objects = $vfs_objects" >> /var/etc/smb.conf
+
+		[ -n "$create_mask" ] && printf "\tcreate mask = %s\n" "$create_mask"
+		[ -n "$dir_mask" ] && printf "\tdirectory mask = %s\n" "$dir_mask"
+
+		[ -n "$browseable" ] && printf "\tbrowseable = %s\n" "$browseable"
+		[ -n "$read_only" ] && printf "\tread only = %s\n" "$read_only"
+		[ -n "$writeable" ] && printf "\twriteable = %s\n" "$writeable"
+		[ -n "$guest_ok" ] && printf "\tguest ok = %s\n" "$guest_ok"
+		[ -n "$guest_only" ] && printf "\tguest only = %s\n" "$guest_only"
+		[ -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"
+
+		if [ "$MACOS" -eq 1 ]; then
+			vfs_objects="catia fruit streams_xattr $vfs_objects"
+			printf "\tfruit:encoding = native\n"
+			printf "\tfruit:metadata = stream\n"
+			printf "\tfruit:veto_appledouble = no\n"
+			# avoid mixed shares order for aapl
+			if [ "$timemachine" -eq 1 ]; then
+				printf "\tfruit:time machine = yes\n"
+				[ -n "$timemachine_maxsize" ] && printf "\tfruit:time machine max size = %sG\n" "${timemachine_maxsize}"
+			fi
+		fi
+
+		[ -n "$vfs_objects" ] && printf "\tvfs objects = %s\n" "$vfs_objects"
+	} >> /var/etc/smb.conf
 }
 
 init_config() {
@@ -134,10 +155,8 @@ init_config() {
 	[ -d /var/cache/samba ] || mkdir -p /var/cache/samba
 	[ -d /var/run/samba ] || mkdir -p /var/run/samba
 	[ -d /var/log/samba ] || mkdir -p /var/log/samba
-	[ -d /var/lock ] && chmod 0755 /var/lock || {
-		mkdir -p /var/lock
-		chmod 0755 /var/lock
-	}
+	[ -d /var/lock ] || mkdir -p /var/lock
+	chmod 0755 /var/lock
 
 	config_load samba4
 	config_foreach smb_header samba
@@ -146,9 +165,9 @@ init_config() {
 
 service_triggers() {
 	PROCD_RELOAD_DELAY=2000
-	
+
 	procd_add_reload_trigger "dhcp" "system" "samba4"
-	
+
 	local i
 	for i in $samba_iface; do
 		procd_add_reload_interface_trigger $i
@@ -192,9 +211,9 @@ start_service() {
 	fi
 	# lower priority using renice (if found)
 	if [ -x /usr/bin/renice ]; then
-		[ -x /usr/sbin/samba ] && renice -n 2 $(pidof samba)
-		[ -x /usr/sbin/smbd ] && renice -n 2 $(pidof smbd)
-		[ -x /usr/sbin/nmbd ] && renice -n 2 $(pidof nmbd)
-		[ -x /usr/sbin/winbindd ] && renice -n 2 $(pidof winbindd)
+		[ -x /usr/sbin/samba ] && renice -n 2 "$(pidof samba)"
+		[ -x /usr/sbin/smbd ] && renice -n 2 "$(pidof smbd)"
+		[ -x /usr/sbin/nmbd ] && renice -n 2 "$(pidof nmbd)"
+		[ -x /usr/sbin/winbindd ] && renice -n 2 "$(pidof winbindd)"
 	fi
 }

package/lean/samba4/patches/100-do-not-import-target-module-while-cross-compile.patch

@@ -1,56 +0,0 @@
-Some modules such as dynamic library maybe cann't be imported while cross compile, 
-we just check whether does the module exist.
-
-Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
-
---- a/buildtools/wafsamba/samba_bundled.py
-+++ b/buildtools/wafsamba/samba_bundled.py
-@@ -2,6 +2,7 @@
- 
- import sys
- import Build, Options, Logs
-+import imp, os
- from Configure import conf
- from samba_utils import TO_LIST
- 
-@@ -249,17 +250,32 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li
-     # versions
-     minversion = minimum_library_version(conf, libname, minversion)
- 
--    try:
--        m = __import__(modulename)
--    except ImportError:
--        found = False
--    else:
-+    # Find module in PYTHONPATH
-+    stuff = imp.find_module(modulename, [os.environ["PYTHONPATH"]])
-+    if stuff:
-         try:
--            version = m.__version__
--        except AttributeError:
-+            m = imp.load_module(modulename, stuff[0], stuff[1], stuff[2])
-+        except ImportError:
-             found = False
-+
-+            if conf.env.CROSS_COMPILE:
-+                # Some modules such as dynamic library maybe cann't be imported
-+                # while cross compile, we just check whether the module exist
-+                Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (stuff[1]))
-+                found = True
-         else:
--            found = tuplize_version(version) >= tuplize_version(minversion)
-+            try:
-+                version = m.__version__
-+            except AttributeError:
-+                found = False
-+            else:
-+                found = tuplize_version(version) >= tuplize_version(minversion)
-+        finally:
-+            if stuff[0]:
-+                stuff[0].close()
-+    else:
-+        found = False
-+
-     if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
-         Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion))
-         sys.exit(1)

package/lean/samba4/patches/102-samba-4.8.2-unbundle-libreadline.patch

@@ -1,21 +0,0 @@
---- a/libcli/smbreadline/wscript_configure
-+++ b/libcli/smbreadline/wscript_configure
-@@ -1,11 +1,13 @@
- #!/usr/bin/env python
- 
- 
--conf.CHECK_HEADERS('readline.h history.h readline/readline.h readline/history.h')
--for termlib in ['ncurses', 'curses', 'termcap', 'terminfo', 'termlib', 'tinfo']:
--    if conf.CHECK_FUNCS_IN('tgetent', termlib):
--        conf.env['READLINE_TERMLIB'] = termlib
--        break
-+#conf.CHECK_HEADERS('readline.h history.h readline/readline.h readline/history.h')
-+#for termlib in ['ncurses', 'curses', 'termcap', 'terminfo', 'termlib', 'tinfo']:
-+#    if conf.CHECK_FUNCS_IN('tgetent', termlib):
-+#        conf.env['READLINE_TERMLIB'] = termlib
-+#        break
-+
-+conf.undefine('HAVE_READLINE_READLINE_H')
- 
- #
- # Check if we need to work around readline/readline.h

package/lean/samba4/patches/103-tmsize-overflow-fix.patch

@@ -0,0 +1,21 @@
+--- a/source3/modules/vfs_fruit.c	2019-07-09
++++ b/source3/modules/vfs_fruit.c	2019-07-09
+@@ -6995,12 +6995,12 @@ static bool fruit_tmsize_do_dirent(vfs_h
+ 		return true;
+ 	}
+ 
+-	if (bandsize > SIZE_MAX/nbands) {
+-		DBG_ERR("tmsize overflow: bandsize [%zu] nbands [%zu]\n",
+-			bandsize, nbands);
+-		return false;
+-	}
+-	tm_size = bandsize * nbands;
++	// if (bandsize > SIZE_MAX/nbands) {
++		// DBG_ERR("tmsize overflow: bandsize [%zu] nbands [%zu]\n",
++			// bandsize, nbands);
++		// return false;
++	// }
++	tm_size = (off_t)bandsize * (off_t)nbands;
+ 
+ 	if (state->total_size + tm_size < state->total_size) {
+ 		DBG_ERR("tmsize overflow: bandsize [%zu] nbands [%zu]\n",

package/zxlhhyccc/phicomm-k3screenctrl/Makefile

@@ -22,7 +22,7 @@ TARGET_CFLAGS+= -D_GNU_SOURCE
 define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 +@BUSYBOX_CONFIG_ARPING +@KERNEL_DEVMEM +bash +bc +jq +od +arp
+  DEPENDS:=@TARGET_bcm53xx_DEVICE_phicomm-k3 +@BUSYBOX_CONFIG_ARPING +@KERNEL_DEVMEM +bash +bc +jq +coreutils-od
   TITLE:=LCD screen controller on PHICOMM K3
   URL:=https://github.com/zxlhhyccc/Hill-98-k3screenctrl
 endef