From 6166352feae3509a24fa7dcc617da54ca5c1b9bd Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Tue, 2 Nov 2021 03:24:56 +0100
Subject: samba: Update to version 4.13.2

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 package/samba/Makefile        | 24 ++++++++++++++++++------
 package/samba/files/cache.txt |  4 ++++
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'package/samba')

diff --git a/package/samba/Makefile b/package/samba/Makefile
index 82d4a5f87..e21f06ed2 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_VERSION:=		4.13.2
 PKG_RELEASE:=		1
-PKG_HASH:=		c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a
+PKG_HASH:=		276464396a05d88b775bda01ac2eb1e5a636ccf7010b0fd28efc3d85583af2b4
 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
 PKG_NEEDS:=		threads intl
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
@@ -33,6 +32,7 @@ CONFIGURE_ARGS+=	--enable-fhs \
 			--cross-compile \
 			--cross-answers=$(WRKSRC)/cache.txt \
 			--hostcc=gcc \
+			--with-system-mitkrb5 \
 			--without-pie \
 			--without-gettext \
 			--without-relro \
@@ -44,20 +44,32 @@ 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
+else
+	echo 'Checking for a 64-bit host to support lmdb: NO' >>$(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..f750653d9 100644
--- a/package/samba/files/cache.txt
+++ b/package/samba/files/cache.txt
@@ -37,3 +37,7 @@ Checking value of NSIG: "65"
 Checking value of _NSIG: "65"
 Checking value of SIGRTMAX: "64"
 Checking value of SIGRTMIN: "34"
+Checking whether the WRFILE -keytab is supported: OK
+Checking errno of iconv for illegal multibyte sequence: OK
+Checking value of GNUTLS_CIPHER_AES_128_CFB8: "29"
+Checking value of GNUTLS_MAC_AES_CMAC_128: "203"
-- 
cgit v1.2.3