diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2016-02-09 16:57:29 -0800 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-02-09 16:58:20 -0800 |
commit | bcbbee6f67634fd8f4b532538faaee639a275610 (patch) | |
tree | 3e32b2b4fc97a34624ed9de75cfc4240b4b46e30 /net-fs/samba/files | |
parent | dev-python/jsonschema: Clean out old revisions of 2.5.1 (diff) | |
download | gentoo-bcbbee6f67634fd8f4b532538faaee639a275610.tar.gz gentoo-bcbbee6f67634fd8f4b532538faaee639a275610.tar.bz2 gentoo-bcbbee6f67634fd8f4b532538faaee639a275610.zip |
Revert "net-fs/samba: add ebuild for 4.4.0rc2"
This commit is missing the DIST entry for
samba-disable-python-patches-4.4.0.tar.xz, and the distfile is not
available.
This reverts commit bedb32a1fbb6675c639446b39d25d4f13e2d4b67.
Diffstat (limited to 'net-fs/samba/files')
-rw-r--r-- | net-fs/samba/files/4.4/samba4.confd | 38 | ||||
-rw-r--r-- | net-fs/samba/files/4.4/samba4.initd-r1 | 56 | ||||
-rw-r--r-- | net-fs/samba/files/samba-4.4.0-pam.patch | 29 |
3 files changed, 0 insertions, 123 deletions
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 58b2c7827bdf..000000000000 --- a/net-fs/samba/files/4.4/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.4/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1 deleted file mode 100644 index ff42552e5d43..000000000000 --- a/net-fs/samba/files/4.4/samba4.initd-r1 +++ /dev/null @@ -1,56 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 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} -} - -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.4.0-pam.patch b/net-fs/samba/files/samba-4.4.0-pam.patch deleted file mode 100644 index e5f360b73929..000000000000 --- a/net-fs/samba/files/samba-4.4.0-pam.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/samba-4.4.0rc2/source3/wscript 2016-01-26 15:25:54.000000000 -0500 -+++ b/samba-4.4.0rc2/source3/wscript 2016-02-09 14:37:46.385279942 -0500 -@@ -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 - - # |