diff options
Diffstat (limited to 'source/n/samba')
| -rwxr-xr-x | source/n/samba/samba.SlackBuild | 24 | ||||
| -rw-r--r-- | source/n/samba/samba.url | 4 | ||||
| -rw-r--r-- | source/n/samba/smb.conf.default | 34 | ||||
| -rw-r--r-- | source/n/samba/smb.conf.default.orig | 32 |
4 files changed, 54 insertions, 40 deletions
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 0761cb69d..7eed0b774 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,6 +28,18 @@ PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# This option may be set to "heimdal" or "mit". +# Upstream considers the use of MIT Kerberos for provisioning an AD DC +# to be experimental (for now), and recommends using the bundled Heimdal. +KERBEROS=${KERBEROS:-heimdal} + +if [ "$KERBEROS" = "mit" ]; then + KERB_OPTIONS="--with-system-mitkrb5 --with-experimental-mit-ad-dc" +elif [ "$KERBEROS" = "heimdal" ]; then + # Please note that this perl module will be required: https://metacpan.org/pod/JSON + KERB_OPTIONS="--bundled-libraries=heimdal" +fi + if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] elif [ -e /etc/slackbuild/machine.conf ]; then @@ -102,7 +114,7 @@ find . \ # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then - PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib${LIBDIRSUFFIX}/security --with-system-mitkrb5 --with-experimental-mit-ad-dc" + PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib${LIBDIRSUFFIX}/security" unset SHADOW_OPTIONS else unset PAM_OPTIONS @@ -143,16 +155,16 @@ CFLAGS="$SLKCFLAGS" \ --with-ldap \ --with-ads \ --without-fam \ + $KERB_OPTIONS \ $PAM_OPTIONS \ $SHADOW_OPTIONS \ --build=$TARGET || exit 1 # Gives errors: #--builtin-libraries=replace,ccan \ - #--bundled-libraries=heimdal \ # Build with waf directly so that multiple jobs work. # Script lifted from "./configure". -PREVPATH=`dirname $0` +PREVPATH=$(dirname $0) WAF=./buildtools/bin/waf # using JOBS=1 gives maximum compatibility with # systems like AIX which have broken threading in python @@ -160,6 +172,9 @@ JOBS=$(echo $NUMJOBS | tr -dc '0-9') export JOBS # Make sure we don't have any library preloaded. unset LD_PRELOAD +# Make sure we get stable hashes +PYTHONHASHSEED=1 +export PYTHONHASHSEED cd . || exit 1 ${PYTHON:=python3} $WAF build "$@" || exit 1 cd $PREVPATH @@ -240,4 +255,3 @@ EOF cd $PKG /sbin/makepkg -l y -c n $TMP/samba-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 02619b55f..24e351aa8 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.14.7.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.14.7.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.20.1.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.20.1.tar.asc diff --git a/source/n/samba/smb.conf.default b/source/n/samba/smb.conf.default index 45d6f10f5..b23b90b6f 100644 --- a/source/n/samba/smb.conf.default +++ b/source/n/samba/smb.conf.default @@ -3,26 +3,26 @@ # here. Samba has a huge number of configurable options (perhaps too # many!) most of which are not shown in this example # -# For a step to step guide on installing, configuring and using samba, +# For a step to step guide on installing, configuring and using samba, # read the Samba-HOWTO-Collection. This may be obtained from: # http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf # -# Many working examples of smb.conf files can be found in the -# Samba-Guide which is generated daily and can be downloaded from: +# Many working examples of smb.conf files can be found in the +# Samba-Guide which is generated daily and can be downloaded from: # http://www.samba.org/samba/docs/Samba-Guide.pdf # -# Any line which starts with a ; (semi-colon) or a # (hash) +# Any line which starts with a ; (semi-colon) or a # (hash) # is a comment and is ignored. In this example we will use a # # for commentry and a ; for parts of the config file that you # may wish to enable # # NOTE: Whenever you modify this file you should run the command "testparm" -# to check that you have not made any basic syntactic errors. +# to check that you have not made any basic syntactic errors. # #======================= Global Settings ===================================== [global] -# workgroup = NT-Domain-Name or Workgroup-Name, eg: LINUX2 +# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH workgroup = MYGROUP # server string is the equivalent of the NT Description field @@ -60,8 +60,8 @@ # Specifies the Kerberos or Active Directory realm the host is part of ; realm = MY_REALM -# Backend to store user information in. New installations should -# use either tdbsam or ldapsam. smbpasswd is available for backwards +# 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. ; passdb backend = tdbsam @@ -75,7 +75,7 @@ # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them # here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 +; interfaces = 192.168.12.2/24 192.168.13.2/24 # Where to store roving profiles (only for Win95 and WinNT) # %L substitutes for this servers netbios name, %U is username @@ -97,9 +97,9 @@ # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names # via DNS nslookups. The default is NO. - dns proxy = no + dns proxy = no -# These scripts are used on a domain controller or stand-alone +# These scripts are used on a domain controller or stand-alone # machine to add or delete corresponding unix accounts ; add user script = /usr/sbin/useradd %u ; add group script = /usr/sbin/groupadd %g @@ -112,7 +112,7 @@ #============================ Share Definitions ============================== [homes] comment = Home Directories - browseable = no + browsable = no writable = yes # Un-comment the following and create the netlogon directory for Domain Logons @@ -128,17 +128,17 @@ # the default is to use the user's home directory ;[Profiles] ; path = /usr/local/samba/profiles -; browseable = no +; browsable = no ; guest ok = yes -# NOTE: If you have a BSD-style print system there is no need to +# NOTE: If you have a BSD-style print system there is no need to # specifically define each individual printer [printers] comment = All Printers path = /var/spool/samba - browseable = no -# Set public = yes to allow user 'guest account' to print + browsable = no +# Change 'guest ok' from 'no' to 'yes' to allow the 'guest account' user to print guest ok = no writable = no printable = yes @@ -160,7 +160,7 @@ ; printable = no ; write list = @staff -# Other examples. +# Other examples. # # A private printer, usable only by fred. Spool data will be placed in fred's # home directory. Note that fred must have write access to the spool directory, diff --git a/source/n/samba/smb.conf.default.orig b/source/n/samba/smb.conf.default.orig index 2f2072090..6210d6914 100644 --- a/source/n/samba/smb.conf.default.orig +++ b/source/n/samba/smb.conf.default.orig @@ -3,21 +3,21 @@ # here. Samba has a huge number of configurable options (perhaps too # many!) most of which are not shown in this example # -# For a step to step guide on installing, configuring and using samba, +# For a step to step guide on installing, configuring and using samba, # read the Samba-HOWTO-Collection. This may be obtained from: # http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf # -# Many working examples of smb.conf files can be found in the -# Samba-Guide which is generated daily and can be downloaded from: +# Many working examples of smb.conf files can be found in the +# Samba-Guide which is generated daily and can be downloaded from: # http://www.samba.org/samba/docs/Samba-Guide.pdf # -# Any line which starts with a ; (semi-colon) or a # (hash) +# Any line which starts with a ; (semi-colon) or a # (hash) # is a comment and is ignored. In this example we will use a # # for commentry and a ; for parts of the config file that you # may wish to enable # # NOTE: Whenever you modify this file you should run the command "testparm" -# to check that you have not made any basic syntactic errors. +# to check that you have not made any basic syntactic errors. # #======================= Global Settings ===================================== [global] @@ -60,8 +60,8 @@ # Specifies the Kerberos or Active Directory realm the host is part of ; realm = MY_REALM -# Backend to store user information in. New installations should -# use either tdbsam or ldapsam. smbpasswd is available for backwards +# 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. ; passdb backend = tdbsam @@ -75,7 +75,7 @@ # Configure Samba to use multiple interfaces # If you have multiple network interfaces then you must list them # here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 +; interfaces = 192.168.12.2/24 192.168.13.2/24 # Where to store roving profiles (only for Win95 and WinNT) # %L substitutes for this servers netbios name, %U is username @@ -97,9 +97,9 @@ # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names # via DNS nslookups. The default is NO. - dns proxy = no + dns proxy = no -# These scripts are used on a domain controller or stand-alone +# These scripts are used on a domain controller or stand-alone # machine to add or delete corresponding unix accounts ; add user script = /usr/sbin/useradd %u ; add group script = /usr/sbin/groupadd %g @@ -112,7 +112,7 @@ #============================ Share Definitions ============================== [homes] comment = Home Directories - browseable = no + browsable = no writable = yes # Un-comment the following and create the netlogon directory for Domain Logons @@ -128,17 +128,17 @@ # the default is to use the user's home directory ;[Profiles] ; path = /usr/local/samba/profiles -; browseable = no +; browsable = no ; guest ok = yes -# NOTE: If you have a BSD-style print system there is no need to +# NOTE: If you have a BSD-style print system there is no need to # specifically define each individual printer [printers] comment = All Printers path = /usr/spool/samba - browseable = no -# Set public = yes to allow user 'guest account' to print + browsable = no +# Change 'guest ok' from 'no' to 'yes' to allow the 'guest account' user to print guest ok = no writable = no printable = yes @@ -160,7 +160,7 @@ ; printable = no ; write list = @staff -# Other examples. +# Other examples. # # A private printer, usable only by fred. Spool data will be placed in fred's # home directory. Note that fred must have write access to the spool directory, |