net-fs/samba: treeclean

::gentoo should be fine now.

Signed-off-by: Sam James <sam@gentoo.org>

19 files changed, 0 insertions, 955 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
deleted file mode 100644
index 03fe0620..00000000
--- a/net-fs/samba/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST samba-4.15.7.tar.gz 19290930 BLAKE2B 4a295f79d38212d4c6917ed61a22e4204b5ea3d5e26f30b65d1e7e81842e92405870dd40fd4d05ec1126a532bdb1ddea300848387a4c64370ba5c2c1354ee8e5 SHA512 beffb09b5bcd62991398d39c7a8aec5fed0c51d550e2f0fb42b2e0a09094f4c6a8f29adf708c4969db12329f5c7343d2debd04315107b79bef59e99a4a7e4ce4
diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd
deleted file mode 100644
index 629a6050..00000000
--- a/net-fs/samba/files/4.4/samba4.confd
+++ /dev/null
@@ -1,45 +0,0 @@
-# Add "winbind" to the daemon_list if you also want winbind to start.
-# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs
-# file server part or the rpc proxy to start.
-# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however,
-# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file
-# accordingly.
-daemon_list="smbd nmbd"
-
-piddir="/run/samba"
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-my_service_name="samba"
-my_service_PRE="unset TMP TMPDIR"
-my_service_POST=""
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-smbd_start_options="-D"
-smbd_command="/usr/sbin/smbd"
-smbd_start="start-stop-daemon --start --exec ${smbd_command} -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec ${smbd_command}"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_command="/usr/sbin/nmbd"
-nmbd_start="start-stop-daemon --start --exec ${nmbd_command} -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec ${nmbd_command}"
-nmbd_reload="killall -HUP nmbd"
-
-samba4_start_options=""
-samba4_command="/usr/sbin/samba"
-samba4_pidfile="${piddir}/samba.pid"
-samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}"
-samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}"
-samba4_reload="killall -HUP samba"
-
-winbind_start_options=""
-winbind_command="/usr/sbin/winbindd"
-winbind_start="start-stop-daemon --start --exec ${winbind_command} -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --exec ${winbind_command}"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba/files/4.4/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1
deleted file mode 100644
index 0a528982..00000000
--- a/net-fs/samba/files/4.4/samba4.initd-r1
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-[ -z "${piddir}" ] && piddir="/run/samba"
-
-depend() {
-	after slapd
-	use cupsd
-}
-
-DAEMONNAME="${SVCNAME##samba.}"
-[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
-
-signal_do() {
-	local signal="$1"
-	[ -z "${signal}" ] && return 0
-
-	local result=0 last_result=0 daemon= cmd_exec=
-	for daemon in ${daemon_list} ; do
-		eval cmd_exec=\$${daemon}_${signal}
-		if [ -n "${cmd_exec}" ]; then
-			ebegin "${my_service_name} -> ${signal}: ${daemon}"
-			#echo ${cmd} '->' ${!cmd}
-			${cmd_exec} > /dev/null
-			last_result=$?
-			eend ${last_result}
-		fi
-		result=$(( ${result} + ${last_result} ))
-	done
-	return ${result}
-}
-
-start() {
-	${my_service_PRE}
-	[ -d "${piddir}" ] || mkdir -p "${piddir}"
-	signal_do start && return 0
-
-	eerror "Error: starting services (see system logs)"
-	signal_do stop
-	return 1
-}
-stop() {
-	${my_service_PRE}
-	if signal_do stop ; then
-		${my_service_POST}
-		return 0
-	fi
-}
-reload() {
-	${my_service_PRE}
-	signal_do reload
-}
diff --git a/net-fs/samba/files/4.4/system-auth-winbind.pam b/net-fs/samba/files/4.4/system-auth-winbind.pam
deleted file mode 100644
index 8d6746b7..00000000
--- a/net-fs/samba/files/4.4/system-auth-winbind.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-# $Id$
-
-auth        required      pam_env.so
-auth        sufficient    pam_winbind.so
-auth        sufficient    pam_unix.so likeauth nullok use_first_pass
-auth        required      pam_deny.so
-
-account     sufficient    pam_winbind.so
-account     required      pam_unix.so
-
-password    required      pam_cracklib.so retry=3
-password    sufficient    pam_unix.so nullok use_authtok md5 shadow
-password    required      pam_deny.so
-
-session     required      pam_mkhomedir.so skel=/etc/skel/ umask=0022 
-session     required      pam_limits.so
-session     required      pam_unix.so
diff --git a/net-fs/samba/files/add-missing_signal_h.patch b/net-fs/samba/files/add-missing_signal_h.patch
deleted file mode 100644
index b6ea71c7..00000000
--- a/net-fs/samba/files/add-missing_signal_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur samba-4.15.7.orig/source3/printing/samba-bgqd.c samba-4.15.7/source3/printing/samba-bgqd.c
---- samba-4.15.7.orig/source3/printing/samba-bgqd.c	2022-03-15 09:19:34.136201100 -0400
-+++ samba-4.15.7/source3/printing/samba-bgqd.c	2022-07-19 13:27:56.069779404 -0400
-@@ -15,6 +15,7 @@
-  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <signal.h>
- #include "replace.h"
- #include "system/filesys.h"
- #include "lib/util/server_id.h"
diff --git a/net-fs/samba/files/add_missing___compar_fn_t.patch b/net-fs/samba/files/add_missing___compar_fn_t.patch
deleted file mode 100644
index 96b65e6c..00000000
--- a/net-fs/samba/files/add_missing___compar_fn_t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source4/dsdb/samdb/ldb_modules/count_attrs.c
-+++ b/source4/dsdb/samdb/ldb_modules/count_attrs.c
-@@ -38,6 +38,11 @@
- #define NULL_REQ_PSEUDO_N -2LL;
- #define STAR_REQ_PSEUDO_N -4LL;
- 
-+#ifndef __COMPAR_FN_T
-+#define __COMPAR_FN_T
-+typedef int (*__compar_fn_t)(const void *, const void *);
-+#endif
-+
- struct count_attrs_private {
- 	struct tdb_wrap *requested;
- 	struct tdb_wrap *duplicates;
diff --git a/net-fs/samba/files/getpwent_r.patch b/net-fs/samba/files/getpwent_r.patch
deleted file mode 100644
index 0ba5fcc5..00000000
--- a/net-fs/samba/files/getpwent_r.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
-index 2cd6122..04f13c6 100644
---- a/source4/torture/local/nss_tests.c
-+++ b/source4/torture/local/nss_tests.c
-@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx,
- 	return true;
- }
- 
--
- static bool test_getgrgid(struct torture_context *tctx,
- 			  gid_t gid,
- 			  struct group *grp_p)
-@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx,
- 	return true;
- }
- 
-+#if HAVE_GETPWENT_R
- static bool test_enum_r_passwd(struct torture_context *tctx,
- 			       struct passwd **pwd_array_p,
- 			       size_t *num_pwd_p)
-@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
- 
- 	return true;
- }
-+#endif
- 
- static bool torture_assert_passwd_equal(struct torture_context *tctx,
- 					const struct passwd *p1,
-@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx)
- 	struct passwd *pwd, pwd1, pwd2;
- 	size_t num_pwd;
- 
--	torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
-+	torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
- 						"failed to enumerate passwd");
- 
- 	for (i=0; i < num_pwd; i++) {
-@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx)
- 	struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
- 	size_t num_pwd;
- 
--	torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
-+	torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
- 						"failed to enumerate passwd");
- 
- 	for (i=0; i < num_pwd; i++) {
-@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx,
- 	return true;
- }
- 
-+#if HAVE_GETGRENT_R
- static bool test_enum_r_group(struct torture_context *tctx,
- 			      struct group **grp_array_p,
- 			      size_t *num_grp_p)
-@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx,
- 
- 	return true;
- }
-+#endif
- 
- static bool torture_assert_group_equal(struct torture_context *tctx,
- 				       const struct group *g1,
-@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx)
- 	struct group *grp, grp1, grp2;
- 	size_t num_grp;
- 
--	torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
-+	torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
- 					       "failed to enumerate group");
- 
- 	for (i=0; i < num_grp; i++) {
-@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
- 	struct group *grp, grp1, grp2, grp3, grp4;
- 	size_t num_grp;
- 
--	torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
-+	torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
- 					       "failed to enumerate group");
- 
- 	for (i=0; i < num_grp; i++) {
diff --git a/net-fs/samba/files/missing-headers.patch b/net-fs/samba/files/missing-headers.patch
deleted file mode 100644
index 58c26aec..00000000
--- a/net-fs/samba/files/missing-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
-index b5d79b9..3f4eae0 100644
---- a/lib/param/loadparm.h
-+++ b/lib/param/loadparm.h
-@@ -31,6 +31,7 @@
- #define _LOADPARM_H
- 
- #include <talloc.h>
-+#include <time.h>
- 
- struct parmlist_entry {
- 	struct parmlist_entry *prev, *next;
-diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
-index 3b1ac9c..4044d75 100644
---- a/source3/lib/system_smbd.c
-+++ b/source3/lib/system_smbd.c
-@@ -27,6 +27,8 @@
- #include "system/passwd.h"
- #include "nsswitch/winbind_client.h"
- #include "../lib/util/setid.h"
-+#include <grp.h>
-+#include <uuid/uuid.h>
- 
- #ifndef HAVE_GETGROUPLIST
- 
-diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
-index 2cd6122..0c84ec2 100644
---- a/source4/torture/local/nss_tests.c
-+++ b/source4/torture/local/nss_tests.c
-@@ -20,6 +20,8 @@
- */
- 
- #include "includes.h"
-+#include <grp.h>
-+#include <uuid/uuid.h>
- 
- #include "torture/torture.h"
- #include "torture/local/proto.h"
diff --git a/net-fs/samba/files/musl_rm_unistd_incl.patch b/net-fs/samba/files/musl_rm_unistd_incl.patch
deleted file mode 100644
index 1f4aae26..00000000
--- a/net-fs/samba/files/musl_rm_unistd_incl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/lib/replace/replace.h
-+++ b/lib/replace/replace.h
-@@ -168,10 +168,6 @@
- #include <bsd/unistd.h>
- #endif
- 
--#ifdef HAVE_UNISTD_H
--#include <unistd.h>
--#endif
--
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
---- a/lib/replace/system/network.h
-+++ b/lib/replace/system/network.h
-@@ -31,10 +31,6 @@
- #error "AC_LIBREPLACE_NETWORK_CHECKS missing in configure"
- #endif
- 
--#ifdef HAVE_UNISTD_H
--#include <unistd.h>
--#endif
--
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
---- a/source3/rpc_server/mdssvc/mdssvc.c
-+++ b/source3/rpc_server/mdssvc/mdssvc.c
-@@ -18,6 +18,8 @@
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-+#include <unistd.h>
-+
- #include "includes.h"
- #include "librpc/gen_ndr/auth.h"
- #include "dbwrap/dbwrap.h"
diff --git a/net-fs/samba/files/musl_uintptr.patch b/net-fs/samba/files/musl_uintptr.patch
deleted file mode 100644
index de7f2857..00000000
--- a/net-fs/samba/files/musl_uintptr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit f81e5b71ce78f33250347914dacc75c8463bf102
-Author: Breno Leitao <breno.leitao@gmail.com>
-Date:   Wed Mar 29 15:22:38 2017 -0300
-
-    include: Check for previous declaration of uintptr_t
-    
-    Adding a extra check before declaring uintptr_t. Currently musl uses
-    macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking
-    this macro before defining it, and, defining it when uintptr_t is
-    defined.
-    
-    Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
-
-diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h
-index 303d0ae..a2bfc40 100644
---- a/third_party/cmocka/cmocka.h
-+++ b/third_party/cmocka/cmocka.h
-@@ -111,7 +111,7 @@
-     ((LargestIntegralType)(value))
- 
- /* Smallest integral type capable of holding a pointer. */
--#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
-+#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t)
- # if defined(_WIN32)
-     /* WIN32 is an ILP32 platform */
-     typedef unsigned int uintptr_t;
-@@ -137,6 +137,8 @@
- 
- # define _UINTPTR_T
- # define _UINTPTR_T_DEFINED
-+# define __DEFINED_uintptr_t
-+
- #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
- 
- /* Perform an unsigned cast to uintptr_t. */
diff --git a/net-fs/samba/files/netdb-defines.patch b/net-fs/samba/files/netdb-defines.patch
deleted file mode 100644
index d7d6446a..00000000
--- a/net-fs/samba/files/netdb-defines.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/nsswitch/wins.c b/nsswitch/wins.c
-index dccb6dd..bb24acb 100644
---- a/nsswitch/wins.c
-+++ b/nsswitch/wins.c
-@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
- #define INADDRSZ 4
- #endif
- 
-+#ifndef NETDB_INTERNAL
-+#define NETDB_INTERNAL -1
-+#endif
-+
-+#ifndef NETDB_SUCCESS
-+#define NETDB_SUCCESS 0
-+#endif
-+
- NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
- 				     struct hostent *he,
- 				     char *buffer,
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 b4721199..00000000
--- 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 63f8a9ec..00000000
--- 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.14.10-winbindd_regression_fix.patch b/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
deleted file mode 100644
index 23411dad..00000000
--- a/net-fs/samba/files/samba-4.14.10-winbindd_regression_fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From bc07c3b70702100975f8921e56cf9b733ec3b826 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze@samba.org>
-Date: Tue, 9 Nov 2021 20:50:20 +0100
-Subject: [PATCH] s3:winbindd: fix "allow trusted domains = no" regression
-
-add_trusted_domain() should only reject domains
-based on is_allowed_domain(), which now also
-checks "allow trusted domains = no", if we don't
-have an explicit trust to the domain (SEC_CHAN_NULL).
-
-We use at least SEC_CHAN_LOCAL for local domains like
-BUILTIN.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14899
-
-Signed-off-by: Stefan Metzmacher <metze@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
-Autobuild-Date(master): Wed Nov 10 11:21:31 UTC 2021 on sn-devel-184
-
-(cherry picked from commit a7f6c60cb037b4bc9eee276236539b8282213935)
----
- source3/winbindd/winbindd_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
-index 42ddbfd2f44e..9d54e462c425 100644
---- a/source3/winbindd/winbindd_util.c
-+++ b/source3/winbindd/winbindd_util.c
-@@ -134,7 +134,7 @@ static NTSTATUS add_trusted_domain(const char *domain_name,
- 		return NT_STATUS_INVALID_PARAMETER;
- 	}
- 
--	if (!is_allowed_domain(domain_name)) {
-+	if (secure_channel_type == SEC_CHAN_NULL && !is_allowed_domain(domain_name)) {
- 		return NT_STATUS_NO_SUCH_DOMAIN;
- 	}
- 
--- 
-2.25.1
-
diff --git a/net-fs/samba/files/samba-4.4.0-pam.patch b/net-fs/samba/files/samba-4.4.0-pam.patch
deleted file mode 100644
index 45160138..00000000
--- a/net-fs/samba/files/samba-4.4.0-pam.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- samba-4.4.0rc2/source3/wscript
-+++ samba-4.4.0rc2/source3/wscript
-@@ -870,7 +870,7 @@
-         if conf.env.with_iconv:
-             conf.DEFINE('HAVE_ICONV', 1)
- 
--    if Options.options.with_pam:
-+    if Options.options.with_pam != False:
-         use_pam=True
-         conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
-         if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
-@@ -943,6 +943,17 @@
-             conf.DEFINE('WITH_PAM', 1)
-             conf.DEFINE('WITH_PAM_MODULES', 1)
- 
-+    else:
-+        Logs.warn("PAM disabled")
-+        use_pam=False
-+        conf.undefine('WITH_PAM')
-+        conf.undefine('WITH_PAM_MODULES')
-+        conf.undefine('HAVE_SECURITY_PAM_APPL_H')
-+        conf.undefine('PAM_RHOST')
-+        conf.undefine('PAM_TTY')
-+        conf.undefine('HAVE_PAM_PAM_APPL_H')
-+
-+
-     seteuid = False
- 
- #
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 c82f4af4..00000000
--- 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 */
diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
deleted file mode 100644
index a7f4946f..00000000
--- a/net-fs/samba/files/samba.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-D /run/samba 0755 root root
-D /run/ctdb 0755 root root
-D /run/lock/samba 0755 root root
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
deleted file mode 100644
index f0f5b091..00000000
--- a/net-fs/samba/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>samba@gentoo.org</email>
-		<name>Samba Team</name>
-	</maintainer>
-	<longdescription>
-		Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
-	</longdescription>
-	<use>
-		<flag name="addc">Enable Active Directory Domain Controller support</flag>
-		<flag name="ads">Enable Active Directory support</flag>
-		<flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag>
-		<flag name="client">Enables the client part</flag>
-		<flag name="cluster">Enable support for clustering</flag>
-		<flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag>
-		<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
-		<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
-		<flag name="iprint">Enabling iPrint technology by Novell</flag>
-		<flag name="profiling-data">Enables support for collecting profiling data</flag>
-		<flag name="quota">Enables support for user quotas</flag>
-		<flag name="regedit">Enable support for regedit command-line tool</flag>
-		<flag name="snapper">Enable vfs_snapper module (requires <pkg>sys-apps/dbus</pkg>)</flag>
-		<flag name="spotlight">Enable support for spotlight backend</flag>
-		<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
-			bundled heimdal.</flag>
-		<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
-			<pkg>app-crypt/heimdal</pkg>.</flag>
-		<flag name="winbind">Enables support for the winbind auth daemon</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-fs/samba/samba-4.15.7.ebuild b/net-fs/samba/samba-4.15.7.ebuild
deleted file mode 100644
index 9ecb3bbf..00000000
--- a/net-fs/samba/samba-4.15.7.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	ads? ( acl ldap python winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.4.2[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		ads? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme:= )
-	json? ( dev-libs/jansson:= )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/add_missing___compar_fn_t.patch
-		eapply "${FILESDIR}"/add-missing_signal_h.patch
-		eapply "${FILESDIR}"/getpwent_r.patch
-		eapply "${FILESDIR}"/missing-headers.patch
-		eapply "${FILESDIR}"/musl_rm_unistd_incl.patch
-		eapply "${FILESDIR}"/musl_uintptr.patch
-		eapply "${FILESDIR}"/netdb-defines.patch
-	fi
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		--without-dmapi
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	PYTHONHASHSEED=1 waf-utils_src_compile
-}
-
-multilib_src_install() {
-	PYTHONHASHSEED=1 waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool \
-				/usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		if ! use addc ; then
-			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
-				|| die
-		fi
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	if [[ "${PV}" != *_rc* ]] ; then
-		elog "For further information and migration steps make sure to read "
-		elog "https://samba.org/samba/history/${P}.html "
-		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-	fi
-}