gentoo resync : 31.05.2021

3 files changed, 0 insertions, 144 deletions

diff --git a/net-fs/samba/files/samba-4.13-vfs_snapper_configure_option.patch b/net-fs/samba/files/samba-4.13-vfs_snapper_configure_option.patch
deleted file mode 100644
index b47211995684..000000000000
--- a/net-fs/samba/files/samba-4.13-vfs_snapper_configure_option.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7ae03a19b3ca895ba5f97a6bd4f9539d8daa6e0a Mon Sep 17 00:00:00 2001
-From: Matt Taylor <liverbugg@rinux.org>
-Date: Mon, 11 May 2020 15:26:41 -0400
-Subject: [PATCH] build: add configure option to control vfs_snapper build
-
-vfs_snapper is currently built if dbus development headers / libraries
-are detected during configure. This commit adds new --disable-snapper
-and --enable-snapper (default) configure parameters. When enabled,
-configure will fail if the dbus development headers / libraries are
-missing.
-
-Signed-off-by: Matt Taylor <liverbugg@rinux.org>
-Reviewed-by: David Disseldorp <ddiss@samba.org>
-Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-
-Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
-Autobuild-Date(master): Mon May 25 01:16:46 UTC 2020 on sn-devel-184
----
- source3/wscript | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/source3/wscript b/source3/wscript
-index 07991806c63..24ade3b0a2b 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -74,6 +74,7 @@ def options(opt):
- 
-     opt.samba_add_onoff_option('glusterfs', with_name="enable", without_name="disable", default=True)
-     opt.samba_add_onoff_option('cephfs', with_name="enable", without_name="disable", default=True)
-+    opt.samba_add_onoff_option('snapper', with_name="enable", without_name="disable", default=True)
- 
-     opt.add_option('--enable-vxfs',
-                   help=("enable support for VxFS (default=no)"),
-@@ -1752,11 +1753,16 @@ main() {
-     if Options.options.enable_vxfs:
-         conf.DEFINE('HAVE_VXFS', '1')
- 
--    if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs',
-+    if Options.options.with_snapper:
-+        if conf.CHECK_CFG(package='dbus-1', args='--cflags --libs',
-                       msg='Checking for dbus', uselib_store="DBUS-1"):
--        if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
-+            if (conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
-                                       and conf.CHECK_LIB('dbus-1', shlib=True)):
--            conf.DEFINE('HAVE_DBUS', '1')
-+                conf.DEFINE('HAVE_DBUS', '1')
-+        else:
-+            conf.fatal("vfs_snapper is enabled but prerequisite DBUS libraries "
-+                       "or headers not found. Use --disable-snapper to disable "
-+                       "vfs_snapper support.");
- 
-     if conf.CHECK_CFG(package='liburing', args='--cflags --libs',
-                       msg='Checking for liburing package', uselib_store="URING"):
--- 
-2.26.2
-
diff --git a/net-fs/samba/files/samba-4.13-winexe_option.patch b/net-fs/samba/files/samba-4.13-winexe_option.patch
deleted file mode 100644
index 63f8a9ec41df..000000000000
--- a/net-fs/samba/files/samba-4.13-winexe_option.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 54c21a99e6ca54bdb963c70d322f6778b57a384f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
-Date: Wed, 4 Mar 2020 18:51:01 +0100
-Subject: [PATCH] winexe: add configure option to control whether to build it
- (default: auto)
-
-Guenther
-
-Signed-off-by: Guenther Deschner <gd@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
-Autobuild-Date(master): Mon Mar  9 16:27:21 UTC 2020 on sn-devel-184
----
- examples/winexe/wscript_build |  3 ++-
- source3/wscript               | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/examples/winexe/wscript_build b/examples/winexe/wscript_build
-index 43c09717e3d..559ed3fc706 100644
---- a/examples/winexe/wscript_build
-+++ b/examples/winexe/wscript_build
-@@ -106,4 +106,5 @@ if winexesvc_binaries != '':
-                           LOADPARM_CTX
-                           libsmb
-                           msrpc3
--                      ''')
-+                      ''',
-+                      enabled=bld.env.build_winexe)
-diff --git a/source3/wscript b/source3/wscript
-index 85466b493fa..6d5bd22ca49 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -63,6 +63,7 @@ def options(opt):
-     opt.samba_add_onoff_option('cluster-support', default=False)
- 
-     opt.samba_add_onoff_option('regedit', default=None)
-+    opt.samba_add_onoff_option('winexe', default=None)
- 
-     opt.samba_add_onoff_option('fake-kaserver',
-                           help=("Include AFS fake-kaserver support"), default=False)
-@@ -1782,6 +1783,22 @@ main() {
-     if conf.CHECK_HEADERS('ftw.h') and conf.CHECK_FUNCS('nftw'):
-         conf.env.build_mvxattr = True
- 
-+    conf.env.build_winexe = False
-+    if not Options.options.with_winexe == False:
-+        if conf.CONFIG_SET('HAVE_WINEXE_CC_WIN32') or conf.CONFIG_SET('HAVE_WINEXE_CC_WIN64'):
-+            conf.env.build_winexe = True
-+
-+    if conf.env.build_winexe:
-+        Logs.info("building winexe")
-+    else:
-+        if Options.options.with_winexe == False:
-+            Logs.info("not building winexe (--without-winexe)")
-+        elif Options.options.with_winexe == True:
-+            Logs.error("mingw not available, cannot build winexe")
-+            conf.fatal("mingw not available, but --with-winexe was specified")
-+        else:
-+            Logs.info("mingw not available, not building winexe")
-+
-     conf.CHECK_FUNCS_IN('DES_pcbc_encrypt', 'crypto')
-     if Options.options.with_fake_kaserver == True:
-         conf.CHECK_HEADERS('afs/param.h afs/stds.h', together=True)
--- 
-2.26.2
-
diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch b/net-fs/samba/files/samba-4.9.2-timespec.patch
deleted file mode 100644
index c82f4af4e7ea..000000000000
--- a/net-fs/samba/files/samba-4.9.2-timespec.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 */