13 files changed, 0 insertions, 352 deletions
diff --git a/net-fs/samba/files/3.6/lmhosts b/net-fs/samba/files/3.6/lmhosts
deleted file mode 100644
index fe7b466eb16a..000000000000
--- a/net-fs/samba/files/3.6/lmhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-127.0.0.1 localhost
diff --git a/net-fs/samba/files/3.6/samba.confd b/net-fs/samba/files/3.6/samba.confd
deleted file mode 100644
index 1b329dae6b18..000000000000
--- a/net-fs/samba/files/3.6/samba.confd
+++ /dev/null
@@ -1,28 +0,0 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
-
-#----------------------------------------------------------------------------
-# 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_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
-nmbd_reload="killall -HUP nmbd"
-
-winbind_start_options=""
-winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba/files/3.6/samba.initd b/net-fs/samba/files/3.6/samba.initd
deleted file mode 100644
index 3d238fe21ea7..000000000000
--- a/net-fs/samba/files/3.6/samba.initd
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-extra_started_commands="reload"
-piddir="/var/run/samba"
-
-depend() {
-	after slapd
-	need net
-	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}
-}
-
-mkdir_sambadirs() {
-	[ -d "${piddir}" ] || mkdir -p ${piddir}
-}
-
-start() {
-	${my_service_PRE}
-	mkdir_sambadirs
-	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/3.6/samba.pam b/net-fs/samba/files/3.6/samba.pam
deleted file mode 100644
index 91beadd478a4..000000000000
--- a/net-fs/samba/files/3.6/samba.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# * pam_smbpass.so authenticates against the smbpasswd file
-# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
-#    (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only
-auth       required     pam_smbpass.so nodelay
-account    include      system-auth
-session    include      system-auth
-password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/net-fs/samba/files/3.6/smb.conf.default.patch b/net-fs/samba/files/3.6/smb.conf.default.patch
deleted file mode 100644
index c2a9a72cedad..000000000000
--- a/net-fs/samba/files/3.6/smb.conf.default.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- samba-3.6.0rc2/examples/smb.conf.default~	2011-06-07 19:13:47.000000000 +0100
-+++ samba-3.6.0rc2/examples/smb.conf.default	2011-06-30 16:12:42.388102480 +0100
-@@ -63,7 +63,7 @@
- 
- # this tells Samba to use a separate log file for each machine
- # that connects
--   log file = /usr/local/samba/var/log.%m
-+   log file = /var/log/samba/log.%m
- 
- # Put a capping on the size of the log files (in Kb).
-    max log size = 50
-@@ -81,7 +81,10 @@
- 
- # Backend to store user information in. New installations should 
- # use either tdbsam or ldapsam. smbpasswd is available for backwards 
--# compatibility. tdbsam requires no further configuration.
-+# compatibility. tdbsam requires no further configuration. If you're 
-+# migrating from < samba 3.4, you'll have to convert your old user 
-+# passwords to the new backend with the command:
-+# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
- ;   passdb backend = tdbsam
- 
- # Using the following line enables you to customise your configuration
-@@ -89,7 +92,7 @@
- # of the machine that is connecting.
- # Note: Consider carefully the location in the configuration file of
- #       this line.  The included file is read at that point.
--;   include = /usr/local/samba/lib/smb.conf.%m
-+;   include = /etc/samba/smb.conf.%m
- 
- # Configure Samba to use multiple interfaces
- # If you have multiple network interfaces then you must list them
-@@ -166,7 +169,7 @@
- # Un-comment the following and create the netlogon directory for Domain Logons
- ; [netlogon]
- ;   comment = Network Logon Service
--;   path = /usr/local/samba/lib/netlogon
-+;   path = /var/lib/samba/netlogon
- ;   guest ok = yes
- ;   writable = no
- ;   share modes = no
-@@ -175,7 +178,7 @@
- # Un-comment the following to provide a specific roving profile share
- # the default is to use the user's home directory
- ;[Profiles]
--;    path = /usr/local/samba/profiles
-+;    path = /var/lib/samba/profiles
- ;    browseable = no
- ;    guest ok = yes
- 
-@@ -184,7 +187,7 @@
- # specifically define each individual printer
- [printers]
-    comment = All Printers
--   path = /usr/spool/samba
-+   path = /var/spool/samba
-    browseable = no
- # Set public = yes to allow user 'guest account' to print
-    guest ok = no
-@@ -204,7 +207,7 @@
- ;   comment = Public Stuff
- ;   path = /home/samba
- ;   public = yes
--;   writable = no
-+;   writable = yes
- ;   printable = no
- ;   write list = @staff
- 
diff --git a/net-fs/samba/files/3.6/smbusers b/net-fs/samba/files/3.6/smbusers
deleted file mode 100644
index 7acb6dc817af..000000000000
--- a/net-fs/samba/files/3.6/smbusers
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
diff --git a/net-fs/samba/files/3.6/swat.xinetd b/net-fs/samba/files/3.6/swat.xinetd
deleted file mode 100644
index 45e977df11aa..000000000000
--- a/net-fs/samba/files/3.6/swat.xinetd
+++ /dev/null
@@ -1,17 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-# $Id$
-
-service swat
-{
-	port            = 901
-	socket_type     = stream
-	wait            = no
-	only_from       = localhost
-	user            = root
-	server          = /usr/sbin/swat
-	log_on_failure += USERID
-	disable         = yes
-}
diff --git a/net-fs/samba/files/3.6/system-auth-winbind.pam b/net-fs/samba/files/3.6/system-auth-winbind.pam
deleted file mode 100644
index 8d6746b7aeb6..000000000000
--- a/net-fs/samba/files/3.6/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/named.conf.dlz.patch b/net-fs/samba/files/named.conf.dlz.patch
deleted file mode 100644
index ad8486ce1c67..000000000000
--- a/net-fs/samba/files/named.conf.dlz.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz
-index be20a57..d86f766 100644
---- a/source4/setup/named.conf.dlz
-+++ b/source4/setup/named.conf.dlz
-@@ -11,9 +11,9 @@
- #
- dlz "AD DNS Zone" {
-     # For BIND 9.8.0
--    database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-+    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-
-     # For BIND 9.9.0
--    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
-+    database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
- };
diff --git a/net-fs/samba/files/samba-3.4.2-lib.tevent.python.mk b/net-fs/samba/files/samba-3.4.2-lib.tevent.python.mk
deleted file mode 100644
index 3a0375580bea..000000000000
--- a/net-fs/samba/files/samba-3.4.2-lib.tevent.python.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-[PYTHON::pytevent]
-LIBRARY_REALNAME = tevent.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBTEVENT PYTALLOC LIBSAMBA-UTIL LIBREPLACE
-
-pytevent_OBJ_FILES = $(libteventsrcdir)/pytevent.o
-
diff --git a/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch b/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch
deleted file mode 100644
index ec351db7a2d0..000000000000
--- a/net-fs/samba/files/samba-4.0.19-automagic_aio_fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=10370
-
---- samba-4.0.19/source3/wscript
-+++ samba-4.0.19/source3/wscript
-@@ -507,9 +507,10 @@
-     else:
-         conf.DEFINE('HAVE_NO_AIO', '1')
- 
--    if host_os.rfind('linux') > -1:
--	conf.CHECK_FUNCS_IN('io_submit', 'aio')
--	conf.CHECK_CODE('''
-+    if Options.options.with_aio_support != False:
-+	if host_os.rfind('linux') > -1:
-+	    conf.CHECK_FUNCS_IN('io_submit', 'aio')
-+	    conf.CHECK_CODE('''
- struct io_event ioev;
- struct iocb *ioc;
- io_context_t ctx;
-@@ -526,11 +527,11 @@
- io_getevents(ctx, 1, 1, &ioev, &ts);
- ''',
- 			'HAVE_LINUX_KERNEL_AIO',
--			msg='Checking for linux kernel asynchronous io support',
--			headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h',
--			lib='aio')
-+				msg='Checking for linux kernel asynchronous io support',
-+				headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h',
-+				lib='aio')
- 
--    conf.CHECK_CODE('''
-+	    conf.CHECK_CODE('''
- struct msghdr msg;
- union {
-         struct cmsghdr cm;
-@@ -540,17 +541,17 @@
- msg.msg_controllen = sizeof(control_un.control);
- ''',
-         'HAVE_MSGHDR_MSG_CONTROL',
--        msg='Checking if we can use msg_control for passing file descriptors',
--        headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
--    conf.CHECK_CODE('''
-+    		msg='Checking if we can use msg_control for passing file descriptors',
-+    		headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
-+	    conf.CHECK_CODE('''
- struct msghdr msg;
- int fd;
- msg.msg_acctrights = (caddr_t) &fd;
- msg.msg_acctrightslen = sizeof(fd);
- ''',
-         'HAVE_MSGHDR_MSG_ACCTRIGHTS',
--        msg='Checking if we can use msg_acctrights for passing file descriptors',
--        headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
-+    		msg='Checking if we can use msg_acctrights for passing file descriptors',
-+    		headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
- 
-     if Options.options.with_winbind:
-         conf.env.build_winbind = True
diff --git a/net-fs/samba/files/samba-4.1.14-libsystemd.patch b/net-fs/samba/files/samba-4.1.14-libsystemd.patch
deleted file mode 100644
index 94b30c00e162..000000000000
--- a/net-fs/samba/files/samba-4.1.14-libsystemd.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0f9b06ade820ce165015526220569db81e00150b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 3 Jan 2015 18:59:48 +0100
-Subject: [PATCH] Support libsystemd, renamed from libsystemd-daemon
-
----
- lib/util/wscript_build | 2 +-
- wscript                | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/util/wscript_build b/lib/util/wscript_build
-index f161f96..6b6b511 100755
---- a/lib/util/wscript_build
-+++ b/lib/util/wscript_build
-@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba-util',
-                     server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
-                     tevent_debug.c util_process.c memcache.c''',
-                   deps='DYNCONFIG',
--                  public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd-daemon',
-+                  public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
-                   public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
-                   header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
-                   local_include=False,
-diff --git a/wscript b/wscript
-index f389f90..3c4fa21 100644
---- a/wscript
-+++ b/wscript
-@@ -183,9 +183,12 @@ def configure(conf):
- 		conf.env['ENABLE_PIE'] = True
- 
-     if Options.options.enable_systemd != False:
-+        conf.check_cfg(package='libsystemd', args='--cflags --libs',
-+                       msg='Checking for libsystemd', uselib_store="SYSTEMD")
-         conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
-                        msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON")
-         conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
-+        conf.CHECK_LIB('systemd', shlib=True)
-         conf.CHECK_LIB('systemd-daemon', shlib=True)
- 
-     if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
-@@ -193,6 +196,7 @@ def configure(conf):
-         conf.env['ENABLE_SYSTEMD'] = True
-     else:
-         conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
-+        conf.SET_TARGET_TYPE('systemd', 'EMPTY')
-         conf.undefine('HAVE_SYSTEMD')
- 
-     conf.SAMBA_CONFIG_H('include/config.h')
--- 
-2.2.1
-
diff --git a/net-fs/samba/files/samba-4.1.14-named.conf.dlz.patch b/net-fs/samba/files/samba-4.1.14-named.conf.dlz.patch
deleted file mode 100644
index 9f1ebb819906..000000000000
--- a/net-fs/samba/files/samba-4.1.14-named.conf.dlz.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- samba-4.1.14/source4/setup/named.conf.dlz
-+++ samba-4.1.14/source4/setup/named.conf.dlz
-@@ -11,10 +11,10 @@
- #
- dlz "AD DNS Zone" {
-     # For BIND 9.8.x
--    database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
-+    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9.so";
- 
-     # For BIND 9.9.x
--    # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
-+    database "dlopen ${MODULESDIR}/bind9/dlz_bind9_9.so";
- 
-     # For BIND 9.10.x
-     # database "dlopen ${MODULESDIR}/bind9/dlz_bind9_10.so";