From 7358fc99fda7c0210fc63a9a1ece0f74d1a41ce7 Mon Sep 17 00:00:00 2001
From: Andy Walsh <andy.walsh44+github@gmail.com>
Date: Tue, 14 Aug 2018 17:42:30 +0200
Subject: [PATCH] samba4: update to 4.8.4

* remove perl, python host depends
* fixes: CVE-2018-1139, CVE-2018-1140, CVE-2018-10858, CVE-2018-10918, CVE-2018-10919
* remove avahi timemachine service file (4.8 handles this automatically via avahi client-lib)
* fix more optional depends

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
---
 net/samba4/Makefile            | 15 +++++----------
 net/samba4/files/samba.service | 14 --------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 net/samba4/files/samba.service

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index b3645850a5..c029bff4cc 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -2,8 +2,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
-PKG_VERSION:=4.8.3
-PKG_RELEASE:=3
+PKG_VERSION:=4.8.4
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-3.0-only
@@ -11,10 +11,10 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE_URL:=https://download.samba.org/pub/samba/stable/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=e0569a8a605d5dfb49f1fdd11db796f4d36fe0351c4a7f21387ef253010b82ed
+PKG_HASH:=f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406
 
 # 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:=perl/host python/host SAMBA4_SERVER_AD_DC:python-crypto nfs-kernel-server/host
+PKG_BUILD_DEPENDS:=SAMBA4_SERVER_AD_DC:python-crypto nfs-kernel-server/host
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_SAMBA4_SERVER_NETBIOS \
@@ -52,7 +52,7 @@ define Package/samba4-libs
   TITLE+= libs
   DEPENDS:= +zlib +libtirpc +krb5-libs +libpopt \
 	+PACKAGE_libcap:libcap +PACKAGE_jansson:jansson +PACKAGE_libpthread:libpthread +PACKAGE_libnettle:libnettle \
-	+PACKAGE_libarchive:libarchive +PACKAGE_libgcrypt:libgcrypt +PACKAGE_libpam:libpam \
+	+PACKAGE_libarchive:libarchive +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 \
 	+SAMBA4_SERVER_AVAHI:libavahi-client \
@@ -368,10 +368,6 @@ ifeq ($(CONFIG_SAMBA4_SERVER_WINBIND),y)
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_ACL),y)
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sharesec $(1)/usr/bin/
-endif
-ifeq ($(CONFIG_SAMBA4_SERVER_AVAHI),y)
-	$(INSTALL_DIR) $(1)/etc/avahi/services
-	$(INSTALL_DATA) ./files/samba.service $(1)/etc/avahi/services/
 endif
 	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/samba $(1)/etc/init.d
 	$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba4
@@ -389,7 +385,6 @@ define Package/samba4-server/conffiles
 /etc/samba/idmap.ldb
 /etc/samba/lmhosts
 /etc/nsswitch.conf
-/etc/avahi/services/samba.service
 endef
 
 $(eval $(call BuildPackage,samba4-libs))
diff --git a/net/samba4/files/samba.service b/net/samba4/files/samba.service
deleted file mode 100644
index 8191e527f6..0000000000
--- a/net/samba4/files/samba.service
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">%h</name>
- <service>
-   <type>_adisk._tcp</type>
-   <txt-record>sys=waMa=0,adVF=0x100</txt-record>
-   <txt-record>dk0=adVN=TimeMachine,adVF=0x82</txt-record>
- </service>
-  <service>
-    <type>_smb._tcp</type>
-    <port>445</port>
-  </service>
-</service-group>
-- 
2.30.2