[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed May 10 05:36:02 UTC 2017
The branch, master has been updated
via da95471 packaging: Remove Mandrake
via 66735f3 packaging: Remove SWAT references from Solaris
via c3be2a9 packaging: Remove SWAT references from RHEL
via 219505f packaging: Remove SWAT references from RHEL-CTDB
via 0a23cde packaging: Remove LSB packaging
via fb4eba0 packaging: Remove setup script for SWAT
from 4ed1bfb dbwrap_ctdb: Fix a typo
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit da95471bf448ed7eb9dd68a3544da2fb31c45293
Author: David Disseldorp <ddiss at samba.org>
Date: Tue May 9 17:01:20 2017 +0200
packaging: Remove Mandrake
Mandriva was discontinued in 2011, and the link in the readme is dead.
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Wed May 10 07:35:20 CEST 2017 on sn-devel-144
commit 66735f3d33e32b24a2438296430e9328624af118
Author: Andreas Schneider <asn at samba.org>
Date: Tue May 9 16:33:49 2017 +0200
packaging: Remove SWAT references from Solaris
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit c3be2a9e3e87038a085b0876f400a11283cb4cb4
Author: Andreas Schneider <asn at samba.org>
Date: Tue May 9 16:03:43 2017 +0200
packaging: Remove SWAT references from RHEL
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 219505fed72ffc17f78cc903638b9603956ba434
Author: Andreas Schneider <asn at samba.org>
Date: Tue May 9 15:51:08 2017 +0200
packaging: Remove SWAT references from RHEL-CTDB
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 0a23cde8efea06f81c6d34227b71dab627cc87b9
Author: Andreas Schneider <asn at samba.org>
Date: Tue May 9 15:48:09 2017 +0200
packaging: Remove LSB packaging
This hasn't been touched since 2001.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit fb4eba0c944a5ca43d25ceb0d723c3c3e38dd70a
Author: Andreas Schneider <asn at samba.org>
Date: Tue May 9 15:47:19 2017 +0200
packaging: Remove setup script for SWAT
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
-----------------------------------------------------------------------
Summary of changes:
packaging/Example/setup.sh | 27 ----
packaging/LSB/README | 6 -
packaging/LSB/lsb-samba.spec | 100 -------------
packaging/LSB/samba.sh | 80 ----------
packaging/LSB/samba.xinetd | 15 --
packaging/LSB/smb.conf | 285 ------------------------------------
packaging/Mandrake/README.mandrake | 3 -
packaging/RHEL-CTDB/configure.rpm | 2 -
packaging/RHEL-CTDB/samba.spec.tmpl | 38 +----
packaging/RHEL-CTDB/setup/swat | 15 --
packaging/RHEL/samba.spec.tmpl | 45 +-----
packaging/RHEL/setup/swat | 15 --
packaging/Solaris/i.swat | 44 ------
packaging/Solaris/inetd.conf.master | 1 -
packaging/Solaris/makepkg.sh | 31 +---
packaging/Solaris/prototype.master | 9 --
packaging/Solaris/r.swat | 16 --
packaging/Solaris/request | 4 -
packaging/Solaris/services | 1 -
19 files changed, 10 insertions(+), 727 deletions(-)
delete mode 100755 packaging/Example/setup.sh
delete mode 100644 packaging/LSB/README
delete mode 100644 packaging/LSB/lsb-samba.spec
delete mode 100755 packaging/LSB/samba.sh
delete mode 100644 packaging/LSB/samba.xinetd
delete mode 100644 packaging/LSB/smb.conf
delete mode 100644 packaging/Mandrake/README.mandrake
delete mode 100644 packaging/RHEL-CTDB/setup/swat
delete mode 100644 packaging/RHEL/setup/swat
delete mode 100644 packaging/Solaris/i.swat
delete mode 100644 packaging/Solaris/inetd.conf.master
delete mode 100644 packaging/Solaris/r.swat
delete mode 100644 packaging/Solaris/services
Changeset truncated at 500 lines:
diff --git a/packaging/Example/setup.sh b/packaging/Example/setup.sh
deleted file mode 100755
index 7fd8fc4..0000000
--- a/packaging/Example/setup.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Note: This file MUST be edited to suit the target OS environment.
-#
-
-echo "Setting up for SWAT - The Samba Web Administration Tool"
-
-echo 'swat 901/tcp' >> /etc/services
-uniq /etc/services /tmp/tempserv
-cp /tmp/tempserv /etc/services
-rm /tmp/tempserv
-echo 'swat stream tcp nowait.400 root /usr/local/samba/bin/swat swat' >> /etc/inetd.conf
-uniq /etc/inetd.conf /tmp/tempinetd
-cp /tmp/tempinetd /etc/inetd.conf
-rm /tmp/tempinetd
-echo "Creating Symbolic Links for Start up Scripts"
-cp -f samba.init /sbin/init.d
-chown bin.bin /sbin/init.d/samba.init
-chmod 750 /sbin/init.d/samba.init
-ln -sf /sbin/init.d/samba.init /sbin/rc0.d/K01samba
-ln -sf /sbin/init.d/samba.init /sbin/rc2.d/K91samba
-ln -sf /sbin/init.d/samba.init /sbin/rc3.d/S91samba
-echo "Done. Now settting up samba command"
-ln /sbin/init.d/samba.init /sbin/samba
-echo "Done."
-echo "To start / stop samba:"
-echo " execute: samba [start | stop]"
diff --git a/packaging/LSB/README b/packaging/LSB/README
deleted file mode 100644
index 4ff0b99..0000000
--- a/packaging/LSB/README
+++ /dev/null
@@ -1,6 +0,0 @@
-README.lsb - 1 July 2001
-------------------------
-
-The files in this directory allow you to build an LSB-compliant
-version of SAMBA using the RPM software and the LSB development
-environment.
diff --git a/packaging/LSB/lsb-samba.spec b/packaging/LSB/lsb-samba.spec
deleted file mode 100644
index 516eaa4..0000000
--- a/packaging/LSB/lsb-samba.spec
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# "$Id: lsb-samba.spec,v 1.2 2001/07/03 01:01:12 jra Exp $"
-#
-# Linux Standards Based RPM "spec" file for SAMBA.
-#
-
-Summary: SAMBA
-Name: lsb-samba
-Version: 2.2.1
-Release: 0
-Copyright: GPL
-Group: System Environment/Daemons
-Source: ftp://ftp.samba.org/pub/samba/samba-%{version}.tar.gz
-Url: http://www.samba.org
-Packager: Michael Sweet <mike at easysw.com>
-Vendor: SAMBA Team
-
-# Require the "lsb" package, which guarantees LSB compliance.
-Requires: lsb
-
-# use BuildRoot so as not to disturb the version already installed
-BuildRoot: /var/tmp/%{name}-root
-
-%description
-
-%prep
-%setup
-
-%build
-export LDFLAGS="-L/usr/lib/lsb --dynamic-linker=/lib/ld-lsb.so.1"
-
-./configure --with-fhs --prefix=/usr --sysconfdir=/etc \
- --sharedstatedir=/var --datadir=/usr/share \
- --with-configdir=/etc/samba \
- --with-swatdir=/usr/share/samba/swat
-
-# If we got this far, all prerequisite libraries must be here.
-make
-
-%install
-# Make sure the RPM_BUILD_ROOT directory exists.
-rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
-
-make \
- BASEDIR=$RPM_BUILD_ROOT/usr \
- BINDIR=$RPM_BUILD_ROOT/usr/bin \
- CODEPAGEDIR=$RPM_BUILD_ROOT/usr/share/samba/codepages \
- CONFIGDIR=$RPM_BUILD_ROOT/etc/samba \
- INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
- LIBDIR=$RPM_BUILD_ROOT/usr/lib \
- LOCKDIR=$RPM_BUILD_ROOT/var/lock/samba \
- LOGFILEBASE=$RPM_BUILD_ROOT/var/log/samba \
- MANDIR=$RPM_BUILD_ROOT/usr/share/man \
- SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
- SWATDIR=$RPM_BUILD_ROOT/usr/share/samba/swat \
- VARDIR=$RPM_BUILD_ROOT/var \
- install
-
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m 700 packaging/LSB/samba.sh /etc/init.d/samba
-
-mkdir -p $RPM_BUILD_ROOT/etc/samba
-install -m 644 packaging/LSB/smb.conf /etc/samba
-
-mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-install -m 644 packaging/LSB/samba.xinetd /etc/xinetd.d/samba
-
-%post
-/usr/lib/lsb/install_initd /etc/init.d/samba
-
-%preun
-/usr/lib/lsb/remove_initd /etc/init.d/samba
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%dir /etc/init.d
-/etc/init.d/samba
-%dir /etc/samba
-%config(noreplace) /etc/samba/smb.conf
-%dir /etc/samba/private
-%dir /etc/xinetd.d
-%config(noreplace) /etc/xinetd.d/samba
-%dir /usr/bin
-/usr/bin/*
-%dir /usr/sbin
-/usr/sbin/*
-%dir /usr/share/man
-/usr/share/man/*
-%dir /usr/share/samba
-/usr/share/samba/*
-%dir /var/lock/samba
-%dir /var/log/samba
-
-#
-# End of "$Id: lsb-samba.spec,v 1.2 2001/07/03 01:01:12 jra Exp $".
-#
diff --git a/packaging/LSB/samba.sh b/packaging/LSB/samba.sh
deleted file mode 100755
index 99fa1b01..0000000
--- a/packaging/LSB/samba.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# "$Id: samba.sh,v 1.2 2001/07/03 01:01:12 jra Exp $"
-#
-# SAMBA startup (init) script for LSB-compliant systems.
-#
-# Provides: smbd nmbd
-# Required-Start: 3 5
-# Required-Stop: 0 2 1 6
-# Default-Start: 3 5
-# Default-Stop: 0 2 1 6
-# Description: Starts and stops the SAMBA smbd and nmbd daemons \
-# used to provide SMB network services.
-#
-
-# Source LSB function library.
-. /lib/lsb/init-functions
-
-# Check that smb.conf exists.
-if test ! -f /etc/samba/smb.conf; then
- log_failure_msg "The smb.conf file does not exist."
- exit 6
-fi
-
-# Make sure that smbd and nmbd exist...
-if test ! -f /usr/sbin/nmbd -o ! -f /usr/sbin/smbd; then
- log_failure_msg "The nmbd and/or smbd daemons are not installed."
- exit 5
-fi
-
-# See how we were called.
-case "$1" in
- start)
- start_daemon nmbd -D
- start_daemon smbd -D
- log_success_msg "Started SMB services."
- ;;
-
- stop)
- killproc smbd
- killproc nmbd
- log_success_msg "Shutdown SMB services."
- ;;
-
- reload)
- # smbd and nmbd automatically re-read the smb.conf file...
- log_success_msg "Reload not necessary with SAMBA."
- ;;
-
- status)
- if test -z "`pidofproc smbd`"; then
- log_success_msg "smbd is not running."
- else
- log_success_msg "smbd is running."
- fi
- if test -z "`pidofproc nmbd`"; then
- log_success_msg "nmbd is not running."
- else
- log_success_msg "nmbd is running."
- fi
- ;;
-
-
- restart | force-reload)
- $0 stop
- $0 start
- ;;
-
- *)
- echo "Usage: smb {start|stop|reload|force-reload|restart|status}"
- exit 1
- ;;
-esac
-
-# Return "success"
-exit 0
-
-#
-# End of "$Id: samba.sh,v 1.2 2001/07/03 01:01:12 jra Exp $".
-#
diff --git a/packaging/LSB/samba.xinetd b/packaging/LSB/samba.xinetd
deleted file mode 100644
index 8c38b35..0000000
--- a/packaging/LSB/samba.xinetd
+++ /dev/null
@@ -1,15 +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.
-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/packaging/LSB/smb.conf b/packaging/LSB/smb.conf
deleted file mode 100644
index 36c9839..0000000
--- a/packaging/LSB/smb.conf
+++ /dev/null
@@ -1,285 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# 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.
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name
- workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
- server string = Samba Server
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-; hosts allow = 192.168.1. 192.168.2. 127.
-
-# if you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
- printcap name = /etc/printcap
- load printers = yes
-
-# It should not be necessary to spell out the print system type unless
-# yours is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
-; printing = bsd
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-; guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
- log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
- max log size = 50
-
-# Security mode. Most people will want user level security. See
-# security_level.txt for details.
- security = user
-# Use password server option only with security = server
-; password server = <NT-Server-Name>
-
-# Password Level allows matching of _n_ characters of the password for
-# all combinations of upper and lower case.
-; username level = 8
-
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-; encrypt passwords = yes
-; smb passwd file = /etc/samba/smbpasswd
-
-# The following are needed to allow password changing from Windows to
-# update the Linux sytsem password also.
-# NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above.
-# NOTE2: You do NOT need these to allow workstations to change only
-# the encrypted SMB passwords. They allow the Unix password
-# to be kept in sync with the SMB password.
-; unix password sync = Yes
-; passwd program = /usr/bin/passwd %u
-; passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully*
-
-# Unix users can map to different SMB User names
-; username map = /etc/samba/smbusers
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-; include = /etc/samba/smb.conf.%m
-
-# 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
-
-# Configure remote browse list synchronisation here
-# request announcement to, or browse list sync from:
-# a specific host or from / to a whole subnet (see below)
-; remote browse sync = 192.168.3.25 192.168.5.255
-# Cause this host to announce itself to local subnets here
-; remote announce = 192.168.1.255 192.168.2.44
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-; local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-; os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-; domain master = yes
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-; preferred master = yes
-
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-; domain controller = <NT-Domain-Controller-SMBName>
-
-# Enable this if you want Samba to be a domain logon server for
-# Windows95 workstations.
-; domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-; logon script = %m.bat
-# run a specific logon batch file per username
-; logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-# %L substitutes for this servers netbios name, %U is username
-# You must uncomment the [Profiles] share below
-; logon path = \\%L\Profiles\%U
-
-# All NetBIOS names must be resolved to IP Addresses
-# 'Name Resolve Order' allows the named resolution mechanism to be specified
-# the default order is "host lmhosts wins bcast". "host" means use the unix
-# system gethostbyname() function call that will use either /etc/hosts OR
-# DNS or NIS depending on the settings of /etc/host.config, /etc/nsswitch.conf
-# and the /etc/resolv.conf file. "host" therefore is system configuration
-# dependant. This parameter is most often of use to prevent DNS lookups
-# in order to resolve NetBIOS names to IP Addresses. Use with care!
-# The example below excludes use of name resolution for machines that are NOT
-# on the local network segment
-# - OR - are not deliberately to be known via lmhosts or via WINS.
-; name resolve order = wins lmhosts bcast
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-; wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-; wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one WINS Server on the network. The default is NO.
-; wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
- dns proxy = no
-
-# Case Preservation can be handy - system default is _no_
-# NOTE: These can be set on a per share basis
-; preserve case = no
-; short preserve case = no
-# Default case is normally upper case for all DOS files
-; default case = lower
-# Be very careful with case sensitivity - it can break things!
-; case sensitive = no
-
-#============================ Share Definitions ==============================
-[homes]
- comment = Home Directories
- browseable = no
- writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-; comment = Network Logon Service
-; path = /home/netlogon
-; guest ok = yes
-; writable = no
-; share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-; path = /home/profiles
-; browseable = no
-; guest ok = yes
-
-
-# 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
- guest ok = no
- writable = no
- printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-; comment = Temporary file space
-; path = /tmp
-; read only = no
-; public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-; comment = Public Stuff
-; path = /home/samba
-; public = yes
-; read only = yes
-; write list = @staff
-
-# 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,
-# wherever it is.
-;[fredsprn]
-; comment = Fred's Printer
-; valid users = fred
-; path = /homes/fred
-; printer = freds_printer
-; public = no
-; writable = no
--
Samba Shared Repository
More information about the samba-cvs
mailing list