From 4da8b01f67fc96cba27ae665b038b89551a0f96c Mon Sep 17 00:00:00 2001
From: Andy Walsh <andy.walsh44+github@gmail.com>
Date: Fri, 3 Jul 2020 01:38:48 +0200
Subject: [PATCH] samba4: update to 4.12.5

* update to 4.12.5
* fixes CVE-2020-10730, CVE-2020-10745, CVE-2020-10760, CVE-2020-14303
* add fix-musl_missing__nss_buflen_passwd.patch
* remove fixed tirpc include
* add extra CONFIGURE_VARS (XSLTPROC=false, WAF_NO_PREFORK=1)

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
---
 net/samba4/Makefile                                | 14 ++++++++------
 ...9-samba-4-11-fix-host-tools-checks.patch.patch} |  0
 ...-4-12-fix-musl_missing__nss_buflen_passwd.patch | 12 ++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 rename net/samba4/patches/{010-samba-4-11-fix-host-tools-checks.patch.patch => 009-samba-4-11-fix-host-tools-checks.patch.patch} (100%)
 create mode 100644 net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 7292589059..c28bfa012c 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -2,8 +2,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
-PKG_VERSION:=4.12.3
-PKG_RELEASE:=5
+PKG_VERSION:=4.12.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
@@ -13,7 +13,7 @@ PKG_SOURCE_URL:= \
 		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:=3fadbca4504937820d0d8a34e500a1efdcc35e0c554f05bd0a844916ae528727
+PKG_HASH:=54b41cc6378acae20dd155ba55d78ff171875c2eaa3f05f87b485d3d6891b815
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-3.0-only
@@ -61,7 +61,7 @@ endef
 define Package/samba4-libs
   $(call Package/samba4/Default)
   TITLE+= libs
-  DEPENDS:= +libtirpc +libreadline +libpopt +libcap +zlib +libgnutls +libtasn1 +libuuid +libopenssl +USE_GLIBC:libpthread \
+  DEPENDS:= +libtirpc +libreadline +libpopt +libcap +zlib +libgnutls +libtasn1 +libuuid +libopenssl +libpthread \
 	+PACKAGE_libpam:libpam \
 	+SAMBA4_SERVER_VFS:attr \
 	+SAMBA4_SERVER_VFSX:libaio \
@@ -127,13 +127,15 @@ define Package/samba4-utils/description
   Utilities collection
 endef
 
-TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -I$(STAGING_DIR)/usr/include/tirpc
+TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 # dont mess with sambas private rpath!
 RSTRIP:=:
 
 CONFIGURE_VARS += \
-	CPP="$(TARGET_CROSS)cpp"
+	CPP="$(TARGET_CROSS)cpp" \
+	XSLTPROC=false \
+	WAF_NO_PREFORK=1
 
 CONFIGURE_CMD = ./buildtools/bin/waf
 HOST_CONFIGURE_CMD = ./buildtools/bin/waf
diff --git a/net/samba4/patches/010-samba-4-11-fix-host-tools-checks.patch.patch b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch
similarity index 100%
rename from net/samba4/patches/010-samba-4-11-fix-host-tools-checks.patch.patch
rename to net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch
diff --git a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch
new file mode 100644
index 0000000000..1d19ec73c0
--- /dev/null
+++ b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch
@@ -0,0 +1,12 @@
+--- a/lib/util/util_paths.c	2020-07-03
++++ b/lib/util/util_paths.c	2020-07-03
+@@ -26,6 +26,9 @@
+ #include "dynconfig/dynconfig.h"
+ #include "lib/util/util_paths.h"
+ #include "system/passwd.h"
++#if !defined(__GLIBC__) 
++	#define NSS_BUFLEN_PASSWD 1024
++#endif
+ 
+ /**
+  * @brief Returns an absolute path to a file in the Samba modules directory.