summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-09-25 09:44:10 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-09-25 10:06:15 +0200
commitde92eae15d207c289b6394b9784adba6c69cf478 (patch)
tree90bce528a48097b852569d0eb2a84a564bcdfeb8 /net-fs/samba/files
parentnet-fs/samba: Bump to version 4.9.1 (diff)
downloadgentoo-de92eae15d207c289b6394b9784adba6c69cf478.tar.gz
gentoo-de92eae15d207c289b6394b9784adba6c69cf478.tar.bz2
gentoo-de92eae15d207c289b6394b9784adba6c69cf478.zip
net-fs/samba: Removed old.
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Diffstat (limited to 'net-fs/samba/files')
-rw-r--r--net-fs/samba/files/4.2/samba4.confd38
-rw-r--r--net-fs/samba/files/4.2/samba4.initd-r155
-rw-r--r--net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch22
-rw-r--r--net-fs/samba/files/samba-4.2.7-pam.patch36
-rw-r--r--net-fs/samba/files/samba-4.6-no_ads.patch37
5 files changed, 0 insertions, 188 deletions
diff --git a/net-fs/samba/files/4.2/samba4.confd b/net-fs/samba/files/4.2/samba4.confd
deleted file mode 100644
index 58b2c7827bdf..000000000000
--- a/net-fs/samba/files/4.2/samba4.confd
+++ /dev/null
@@ -1,38 +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"
-
-#----------------------------------------------------------------------------
-# 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"
-
-samba4_start_options=""
-samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}"
-samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba"
-samba4_reload="killall -HUP samba"
-
-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/4.2/samba4.initd-r1 b/net-fs/samba/files/4.2/samba4.initd-r1
deleted file mode 100644
index 52a9b68bba80..000000000000
--- a/net-fs/samba/files/4.2/samba4.initd-r1
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-piddir="/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}
-}
-
-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/samba-4.2.3-heimdal_compilefix.patch b/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch
deleted file mode 100644
index c6f50073317a..000000000000
--- a/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/542638
-
-From: Stephan Wolf <stephan@letzte-bankreihe.de>
-
-Samba uses the build in implementation of heimdal from year 2011.
-The ebuild uses the portage version of heimdal.
-I got it fixed to patch samba kdc_init function.
-
---- samba-4.2.3/source4/kdc/kdc.c
-+++ samba-4.2.3/source4/kdc/kdc.c
-@@ -967,9 +967,9 @@
- * The old behavior in the _kdc_get_preferred_key()
- * function is use_strongest_server_key=TRUE.
- */
-- kdc->config->as_use_strongest_session_key = false;
-+ kdc->config->tgt_use_strongest_session_key = false;
- kdc->config->preauth_use_strongest_session_key = false;
-- kdc->config->tgs_use_strongest_session_key = false;
-+ kdc->config->svc_use_strongest_session_key = false;
- kdc->config->use_strongest_server_key = true;
-
- /* Register hdb-samba4 hooks for use as a keytab */
diff --git a/net-fs/samba/files/samba-4.2.7-pam.patch b/net-fs/samba/files/samba-4.2.7-pam.patch
deleted file mode 100644
index 22b393e78677..000000000000
--- a/net-fs/samba/files/samba-4.2.7-pam.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- samba-4.2.7/source3/wscript
-+++ samba-4.2.7/source3/wscript
-@@ -853,11 +853,11 @@
- if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
- conf.env.with_iconv = False
- 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'):
- Logs.warn("--with-pam=yes but pam_appl.h not found")
- use_pam=False
-@@ -926,10 +926,20 @@
- msg="Checking whether PAM_RADIO_TYPE is available");
- if use_pam:
- 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')
-+
- if Options.options.with_pam_smbpass:
- conf.env.with_pam_smbpass = True
-
- seteuid = False
-
diff --git a/net-fs/samba/files/samba-4.6-no_ads.patch b/net-fs/samba/files/samba-4.6-no_ads.patch
deleted file mode 100644
index e3f3dfd03058..000000000000
--- a/net-fs/samba/files/samba-4.6-no_ads.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 655504d97a98541bebac812953fd48c49526312d Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl@samba.org>
-Date: Sat, 3 Feb 2018 07:07:24 +0100
-Subject: [PATCH] libads: Fix the build --without-ads
-
-Signed-off-by: Volker Lendecke <vl@samba.org>
-Reviewed-by: David Disseldorp <ddiss@samba.org>
-
-Autobuild-User(master): David Disseldorp <ddiss@samba.org>
-Autobuild-Date(master): Tue Feb 6 02:47:44 CET 2018 on sn-devel-144
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=13273
-
-(cherry picked from commit 859698d29b547217356851094ed8188236e717b6)
----
- source3/libads/kerberos_keytab.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
-index ffd100c..37ac7ba 100644
---- a/source3/libads/kerberos_keytab.c
-+++ b/source3/libads/kerberos_keytab.c
-@@ -640,7 +640,11 @@ int ads_keytab_list(const char *keytab_name)
- }
-
- if (keytab_name == NULL) {
-+#ifdef HAVE_ADS
- ret = ads_keytab_open(context, &keytab);
-+#else
-+ ret = ENOENT;
-+#endif
- } else {
- ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
- }
---
-1.9.1
-