From 8a13ef7efd3153317489ea2bdbadb261e2febe80 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 1 Aug 2013 02:46:22 +0200
Subject: [PATCH] samba: update to samba-3.6.16

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/package.mk          |  2 +-
 packages/network/samba/build                  |  2 ++
 .../samba/patches/samba-110-multicall.patch   | 25 +++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 3c1b50713f..eae61d8fa0 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -258,7 +258,7 @@ if [ "$SAMBA_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET samba"
   PKG_DEPENDS="$PKG_DEPENDS samba"
   XBMC_SAMBA="--enable-samba"
-  XBMC_LIBS="$XBMC_LIBS -ltalloc -ltdb -lwbclient"
+  XBMC_LIBS="$XBMC_LIBS -ltalloc -ltdb -ltevent -lwbclient"
 else
   XBMC_SAMBA="--disable-samba"
 fi
diff --git a/packages/network/samba/build b/packages/network/samba/build
index b9a89077ec..18257a9381 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -116,6 +116,7 @@ samba_cv_have_setresuid=yes \
             --without-acl-support \
             --without-aio-support \
             --with-sendfile-support \
+            --without-libtevent \
             --without-wbclient \
             --without-winbind \
             --with-included-popt \
@@ -126,6 +127,7 @@ samba_cv_have_setresuid=yes \
 make bin/libtalloc.a
 make bin/libwbclient.a
 make bin/libtdb.a
+make bin/libtevent.a
 make bin/libsmbclient.a
 
 if [ "$SAMBA_SERVER" = "yes" ]; then
diff --git a/packages/network/samba/patches/samba-110-multicall.patch b/packages/network/samba/patches/samba-110-multicall.patch
index e667f06a69..e4681a2e85 100644
--- a/packages/network/samba/patches/samba-110-multicall.patch
+++ b/packages/network/samba/patches/samba-110-multicall.patch
@@ -1,6 +1,7 @@
---- a/source3/Makefile.in
-+++ b/source3/Makefile.in
-@@ -73,20 +73,20 @@ LDAP_LIBS=@LDAP_LIBS@
+diff -Naur samba-3.6.16/source3/Makefile.in samba-3.6.16.patch/source3/Makefile.in
+--- samba-3.6.16/source3/Makefile.in	2013-06-19 09:35:24.000000000 +0200
++++ samba-3.6.16.patch/source3/Makefile.in	2013-08-01 01:53:43.264428180 +0200
+@@ -73,22 +73,22 @@
  NSCD_LIBS=@NSCD_LIBS@
  UUID_LIBS=@UUID_LIBS@
  LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@
@@ -14,6 +15,9 @@
  LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
 -LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
 +LIBTALLOC_LIBS=@LIBTALLOC_STATIC@
+ LIBTEVENT=@LIBTEVENT_STATIC@ @LIBTEVENT_SHARED@
+-LIBTEVENT_LIBS=@LIBTEVENT_LIBS@
++LIBTEVENT_LIBS=@LIBTEVENT_STATIC@
  LIBREPLACE_LIBS=@LIBREPLACE_LIBS@
  LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
 -LIBTDB_LIBS=@LIBTDB_LIBS@
@@ -25,7 +29,7 @@
  LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
  LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
  
-@@ -214,7 +214,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_P
+@@ -216,7 +216,7 @@
  
  # Note that all executable programs now provide for an optional executable suffix.
  
@@ -34,7 +38,7 @@
  
  BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
  	bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@ \
-@@ -1774,6 +1774,42 @@ bin/.dummy:
+@@ -1777,6 +1777,42 @@
  	  dir=bin $(MAKEDIR); fi
  	@: >> $@ || : > $@ # what a fancy emoticon!
  
@@ -66,19 +70,20 @@
 +
 +MULTICALL_O = $(sort $(SMBD_MULTI_O) $(NMBD_MULTI_O) $(SMBPASSWD_MULTI_O) $(MULTI_O))
 +
-+bin/samba_multicall@EXEEXT@: $(BINARY_PREREQS) $(MULTICALL_O) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
++bin/samba_multicall@EXEEXT@: $(BINARY_PREREQS) $(MULTICALL_O) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
 +	@echo Linking $@
 +	@$(CC) -o $@ $(MULTICALL_O) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
 +		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
 +		$(ACL_LIBS) $(PASSDB_LIBS) $(LIBS) $(DNSSD_LIBS) $(AVAHI_LIBS) \
-+		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
++		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) \
 +		$(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
 +
- bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
+ bin/smbd@EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBTDB) $(LIBWBCLIENT) @BUILD_POPT@
  	@echo Linking $@
  	@$(CC) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) @SMBD_FAM_LIBS@ \
---- /dev/null
-+++ b/source3/multi.c
+diff -Naur samba-3.6.16/source3/multi.c samba-3.6.16.patch/source3/multi.c
+--- samba-3.6.16/source3/multi.c	1970-01-01 01:00:00.000000000 +0100
++++ samba-3.6.16.patch/source3/multi.c	2013-08-01 01:24:51.794393962 +0200
 @@ -0,0 +1,35 @@
 +#include <stdio.h>
 +#include <string.h>