gentoo resync : 18.11.2018

2 files changed, 57 insertions, 0 deletions

diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
new file mode 100644
index 000000000000..1093b1de71df
--- /dev/null
+++ b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
@@ -0,0 +1,36 @@
+Do not install the python DSDB modules when ADDC is disabled.
+This is a change integrated upstream in 4.9.1 (or earlier).
+
+Without this, the python dsdb_dns.so module is installed, which
+is linked to libdnsserver-common.so that is NOT installed, and so
+potential breakage ensues.
+
+--- a/source4/dsdb/wscript_build	2018-01-17 03:08:39.000000000 -0500
++++ b/source4/dsdb/wscript_build	2018-11-08 10:43:58.064486832 -0500
+@@ -63,10 +63,11 @@
+ 	)
+ 
+ bld.SAMBA_PYTHON('python_dsdb',
+ 	source='pydsdb.c',
+ 	# the dependency on dcerpc here is because gensec
+ 	# depends on dcerpc but the waf circular dependency finder
+ 	# removes it so we end up with unresolved symbols.
+ 	deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones',
+-	realname='samba/dsdb.so'
++	realname='samba/dsdb.so',
++	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ 	)
+--- a/source4/dns_server/wscript_build	2018-11-08 11:49:03.450296286 -0500
++++ b/source4/dns_server/wscript_build	2018-11-08 11:49:23.327864408 -0500
+@@ -64,9 +64,10 @@
+                   private_library=True,
+                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
+ 
+ 
+ bld.SAMBA_PYTHON('python_dsdb_dns',
+ 	         source='pydns.c',
+ 	         deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util',
+-	         realname='samba/dsdb_dns.so')
++	         realname='samba/dsdb_dns.so',
++	         enabled=bld.AD_DC_BUILD_IS_ENABLED())
diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch b/net-fs/samba/files/samba-4.9.2-timespec.patch
new file mode 100644
index 000000000000..c82f4af4e7ea
--- /dev/null
+++ b/net-fs/samba/files/samba-4.9.2-timespec.patch
@@ -0,0 +1,21 @@
+From 11e8c14b78e2423041f3846882f74cd6490a3e44 Mon Sep 17 00:00:00 2001
+From: Joan Karadimov <joan@profuzdigital.com>
+Date: Thu, 18 Oct 2018 18:16:17 +0300
+Subject: [PATCH] Fix compatibility issues with the timespec struct
+
+---
+ source3/include/libsmbclient.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
+index 5e4a1715402..6487ea7a8aa 100644
+--- a/source3/include/libsmbclient.h
++++ b/source3/include/libsmbclient.h
+@@ -78,6 +78,7 @@ extern "C" {
+ #include <sys/statvfs.h>
+ #include <stdint.h>
+ #include <fcntl.h>
++#include <time.h>
+ #include <utime.h>
+ 
+ #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */