5 files changed, 36 insertions, 47 deletions
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 82d4a5f87..63085b06a 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,15 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		samba
-PKG_VERSION:=		4.6.9
-PKG_RELEASE:=		1
-PKG_HASH:=		c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a
+PKG_VERSION:=		4.19.4
+PKG_RELEASE:=		2
+PKG_HASH:=		4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c
 PKG_DESCR:=		file and print server
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		libuuid libpopt libgnutls libtirpc
-PKG_DEPENDS+=		libtalloc
-PKG_BUILDDEP:=		util-linux popt python2 gnutls talloc
-PKG_BUILDDEP+=		heimdal-host python2-host libtirpc
+PKG_DEPENDS+=		libtalloc libkrb5
+PKG_BUILDDEP:=		util-linux talloc p5-parse-yapp-host gnutls krb5
 PKG_NEEDS:=		threads intl
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
@@ -29,10 +28,12 @@ CONFIGURE_ARGS+=	--enable-fhs \
 			--prefix=/usr \
 			--sysconfdir=/etc \
 			--localstatedir=/var \
-			--with-privatedir=/etc/samba \
+			--with-privatedir=/var/lib/samba \
 			--cross-compile \
 			--cross-answers=$(WRKSRC)/cache.txt \
 			--hostcc=gcc \
+			--with-system-mitkrb5 \
+			--without-libunwind \
 			--without-pie \
 			--without-gettext \
 			--without-relro \
@@ -44,20 +45,35 @@ CONFIGURE_ARGS+=	--enable-fhs \
 			--without-ads \
 			--without-ldap \
 			--without-acl-support \
+			--without-ad-dc \
+			--without-json \
+			--without-libarchive \
+			--without-iconv \
 			--disable-glusterfs \
 			--disable-iprint \
 			--disable-cups \
 			--disable-avahi \
 			--disable-rpath \
+			--disable-python \
 			--bundled-libraries='com_err,!asn1_compile,!compile_et' \
+			--with-shared-modules=!vfs_snapper \
 			--disable-rpath-install
 CONFIGURE_ENV+=		PYTHON_CONFIG="$(STAGING_TARGET_DIR)/usr/bin/python-config" \
 			python_LDFLAGS="" \
-			python_LIBDIR=""
+			python_LIBDIR="" \
+			PERL="$(STAGING_HOST_DIR)/usr/bin/perl-host"
 
 pre-configure:
 	$(CP) ./files/cache.txt $(WRKSRC)
 	echo 'Checking uname machine type: "$(ADK_TARGET_ARCH)"' >>$(WRKSRC)/cache.txt
+ifneq ($(ADK_LINUX_64),)
+	echo 'Checking for a 64-bit host to support lmdb: OK' >>$(WRKSRC)/cache.txt
+	echo 'Checking for large file support without additional flags: OK' >>$(WRKSRC)/cache.txt
+else
+	echo 'Checking for a 64-bit host to support lmdb: NO' >>$(WRKSRC)/cache.txt
+	echo 'Checking for large file support without additional flags: NO' >>$(WRKSRC)/cache.txt
+	echo 'Checking for -D_FILE_OFFSET_BITS=64: OK' >>$(WRKSRC)/cache.txt
+endif
 
 samba-install:
 	$(INSTALL_DIR) $(IDIR_SAMBA)/etc/samba
diff --git a/package/samba/files/cache.txt b/package/samba/files/cache.txt
index 3ba8a75ea..e08011165 100644
--- a/package/samba/files/cache.txt
+++ b/package/samba/files/cache.txt
@@ -2,8 +2,6 @@ Checking simple C program: OK
 rpath library support: OK
 -Wl,--version-script support: OK
 Checking getconf LFS_CFLAGS: NO
-Checking for large file support without additional flags: OK
-Checking for -D_LARGE_FILES: OK
 Checking correct behavior of strtoll: NO
 Checking for working strptime: OK
 Checking for C99 vsnprintf: OK
@@ -37,3 +35,12 @@ Checking value of NSIG: "65"
 Checking value of _NSIG: "65"
 Checking value of SIGRTMAX: "64"
 Checking value of SIGRTMIN: "34"
+Checking errno of iconv for illegal multibyte sequence: "0"
+checking for clnt_create(): OK
+Checking for a 64-bit host to support lmdb: NO
+Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29
+Checking value of GNUTLS_MAC_AES_CMAC_128: 203
+Checking whether fcntl supports flags to send direct I/O availability signals: OK
+Checking for gnutls fips mode support: NO
+Checking for readlink breakage: NO
+Checking whether the WRFILE -keytab is supported: NO
diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init
index 21b983530..8b9e7e375 100644
--- a/package/samba/files/samba.init
+++ b/package/samba/files/samba.init
@@ -11,12 +11,13 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	[ -d /var/lib/samba ] || mkdir -p /var/lib/samba
+	[ -d /var/lib/samba/msg.sock ] || mkdir -p /var/lib/samba/msg.sock
 	[ -d /var/run/samba ] || mkdir -p /var/run/samba
 	[ -d /var/log/samba ] || mkdir -p /var/log/samba
 	[ -d /var/cache/samba ] || mkdir -p /var/cache/samba
 	[ -d /var/lock/samba ] || mkdir -p /var/lock/samba
-	/usr/sbin/nmbd -D 
+	chmod 700 /var/lib/samba/msg.sock
+	/usr/sbin/nmbd -D
 	/usr/sbin/smbd -D
 	;;
 stop)
diff --git a/package/samba/patches/patch-nsswitch_wins_c b/package/samba/patches/patch-nsswitch_wins_c
deleted file mode 100644
index 92aa624f5..000000000
--- a/package/samba/patches/patch-nsswitch_wins_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- samba-4.6.6.orig/nsswitch/wins.c	2017-01-09 09:12:30.000000000 +0100
-+++ samba-4.6.6/nsswitch/wins.c	2017-08-02 22:28:16.616627669 +0200
-@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex =
- #define INADDRSZ 4
- #endif
- 
-+#ifndef NETDB_INTERNAL
-+#define NETDB_INTERNAL -1
-+#endif
-+
-+#ifndef NETDB_SUCCESS
-+#define NETDB_SUCCESS 0
-+#endif
-+
- NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
- 				     struct hostent *he,
- 				     char *buffer,
diff --git a/package/samba/patches/patch-source3_lib_util_c b/package/samba/patches/patch-source3_lib_util_c
deleted file mode 100644
index 5755bb837..000000000
--- a/package/samba/patches/patch-source3_lib_util_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- samba-4.6.6.orig/source3/lib/util.c	2017-02-09 08:45:27.000000000 +0100
-+++ samba-4.6.6/source3/lib/util.c	2017-08-02 21:54:59.695281066 +0200
-@@ -565,6 +565,7 @@ char *get_mydnsdomname(TALLOC_CTX *ctx)
- 	}
- }
- 
-+#if 0
- #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
- /******************************************************************
-  Remove any mount options such as -rsize=2048,wsize=2048 etc.
-@@ -687,6 +688,7 @@ char *automount_lookup(TALLOC_CTX *ctx,
- }
- #endif /* WITH_NISPLUS_HOME */
- #endif
-+#endif
- 
- bool process_exists(const struct server_id pid)
- {