[csw-devel] SF.net SVN: gar:[16208] csw/mgar/pkg/samba/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Nov 17 22:48:23 CET 2011
Revision: 16208
http://gar.svn.sourceforge.net/gar/?rev=16208&view=rev
Author: dmichelsen
Date: 2011-11-17 21:48:23 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
samba: Further split packages, add sample smb.conf
Modified Paths:
--------------
csw/mgar/pkg/samba/trunk/Makefile
csw/mgar/pkg/samba/trunk/files/cswsamba
Added Paths:
-----------
csw/mgar/pkg/samba/trunk/files/cswkrb5.conf
csw/mgar/pkg/samba/trunk/files/smb.conf
Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile 2011-11-17 21:09:19 UTC (rev 16207)
+++ csw/mgar/pkg/samba/trunk/Makefile 2011-11-17 21:48:23 UTC (rev 16208)
@@ -13,7 +13,15 @@
MASTER_SITES = http://samba.org/samba/ftp/stable/
DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += cswsamba
+EXPANDVARS += cswsamba
+# From http://www.reallylinux.com/docs/smb.conf
+DISTFILES += smb.conf
+
+# This is taken from the old Samba package
+DISTFILES += cswkrb5.conf
+
#What needs to be fixed:
# Split libs and packages
@@ -39,21 +47,30 @@
RUNTIME_DEP_PKGS_CSWsamba += CSWoldaprt
# Make one unified package for now
-OBSOLETED_BY_CSWsamba += CSWsambaclient
OBSOLETED_BY_CSWsamba += CSWsambacommon
OBSOLETED_BY_CSWsamba += CSWsambadoc
-OBSOLETED_BY_CSWsamba += CSWsambalib
-#PACKAGES += CSWsambaclient
-SPKG_DESC_CSWsambaclient = Client binaries for samba
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWsasl
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWsambacommon
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWreadline
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWlibpopt
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWlibnet
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWiconv
-RUNTIME_DEP_PKGS_CSWsambaclient += CSWggettext
+PACKAGES += CSWsamba-client
+SPKG_DESC_CSWsamba-client = Client binaries for samba
+SMB_CLIENT_TOOLS = rpcclient smbcacls smbclient smbcquotas smbget smbspool smbtar smbtree
+PKGFILES_CSWsamba-client += $(foreach T,$(SMB_CLIENT_TOOLS),$(call baseisadirs,$(bindir),$T) $(mandir)/man1/$T\.1)
+PKGFILES_CSWsamba-client += $(mandir)/man5/smbgetrc\.5
+PKGFILES_CSWsamba-client += $(mandir)/man8/smbspool\.8
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibpopt0
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibz1
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWsamba-client += CSWsamba
+OBSOLETED_BY_CSWsamba-client += CSWsambaclient
+CATALOGNAME_CSWsambaclient = samba_client_stub
#PACKAGES += CSWsambacommon
SPKG_DESC_CSWsambacommon = Shared support files for samba
@@ -69,16 +86,56 @@
SPKG_DESC_CSWsambadoc = Samba documentation
ARCHALL_CSWsambadoc = 1
-#PACKAGES += CSWsambalib
-SPKG_DESC_CSWsambalib = Samba shared libraries
-RUNTIME_DEP_PKGS_CSWsambalib += CSWsasl
-RUNTIME_DEP_PKGS_CSWsambalib += CSWlibnet
-RUNTIME_DEP_PKGS_CSWsambalib += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWsambalib += CSWiconv
+PACKAGES += CSWlibsmbclient0
+SPKG_DESC_CSWlibsmbclient0 = Samba client library, libsmbclient.so.0
+PKGFILES_CSWlibsmbclient0 += $(call pkgfiles_lib,libsmbclient.so.0)
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibk5crypto3
+OBSOLETED_BY_CSWlibsmclient0 += CSWsambalib
+CATALOGNAME_CSWsambalib = samba_lib_stub
+PACKAGES += CSWlibnetapi0
+PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0)
+SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibnetapi0
+
+PACKAGES += CSWlibsmbsharemodes0
+PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0)
+SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibsmbsharemodes0
+
+PACKAGES += CSWlibtdb1
+PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1)
+SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1
+
+PACKAGES += CSWlibwbclient0
+PKGFILES_CSWlibwbclient0 += $(call pkgfiles_lib,libwbclient.so.0)
+SPKG_DESC_CSWlibwbclient0 += Samba client library, libwbclient.so.0
+
+PACKAGES += CSWlibnetapi0
+PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0)
+SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0
+
+PACKAGES += CSWlibsmbsharemodes0
+PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0)
+SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0
+
+PACKAGES += CSWlibtdb1
+PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1)
+SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1
+
PACKAGES += CSWsamba-dev
-SPKG_DESC_CSWsamba-dev = Development files for the samba libraries
+SPKG_DESC_CSWsamba-dev = Development files for Samba, libsmbclient.so.0
PKGFILES_CSWsamba-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibsmbclient0
RUNTIME_DEP_PKGS_CSWsamba-dev += CSWsamba
OBSOLETED_BY_CSWsamba-dev += CSWsambalibdev
CATALOGNAME_CSWsambalibdev = samba_libdev_stub
@@ -133,8 +190,11 @@
INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile
-INITSMF = /etc/opt/csw/init.d/cswsamba
+INITSMF += /etc/opt/csw/init.d/cswsamba
+MIGRATE_FILES += samba
+PRESERVECONF += $(sysconfdir)/samba/smb.conf
+
include gar/category.mk
# Use this hack until this bug has been fixed:
@@ -152,3 +212,5 @@
post-merge:
ginstall -d $(PKGROOT)/etc/opt/csw/init.d
ginstall $(WORKDIR)/cswsamba $(PKGROOT)/etc/opt/csw/init.d/cswsamba
+ ginstall -d $(PKGROOT)/etc/opt/csw/samba
+ ginstall $(WORKDIR)/smb.conf $(PKGROOT)/etc/opt/csw/samba/smb.conf
Added: csw/mgar/pkg/samba/trunk/files/cswkrb5.conf
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswkrb5.conf (rev 0)
+++ csw/mgar/pkg/samba/trunk/files/cswkrb5.conf 2011-11-17 21:48:23 UTC (rev 16208)
@@ -0,0 +1,31 @@
+#v 1.01
+#Template Kerberos->Windows AD integration.
+#Belongs to CSW samba_wb package.
+#20051008 Fredrik Lundholm
+#
+#To use:
+# 1. copy this file into /etc/krb5.conf.
+#
+# 2. Replace AD.EXAMPLE.NET below with your AD and 12.12.12.12
+# with the hostname of your kdc.
+#
+# 3. Add the Samba server to the AD:
+# 'net ads join -UAdministrator%not24get'
+#
+# 4. Make sure /etc/nsswitch.conf contains winbind entries
+# for users and groups.
+#
+# 5. Check that 'getent passwd' and 'getent group' works.
+#
+
+#[libdefaults]
+# default_realm = AD.EXAMPLE.NET
+#
+#[realms]
+# AD.EXAMPLE.NET = {
+# kdc = 12.12.12.12
+# }
+#
+#[domain_realms]
+# .kerberos.server = AD.EXAMPLE.NET
+
Modified: csw/mgar/pkg/samba/trunk/files/cswsamba
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswsamba 2011-11-17 21:09:19 UTC (rev 16207)
+++ csw/mgar/pkg/samba/trunk/files/cswsamba 2011-11-17 21:48:23 UTC (rev 16208)
@@ -8,8 +8,8 @@
PATH=/bin:/sbin:/usr/bin:/usr/sbin
export PATH
-SMBCONF=/etc/opt/csw/samba/smb.conf
-KRBCONF=/etc/opt/csw/krb5.conf
+SMBCONF=@sysconfdir@/samba/smb.conf
+KRBCONF=@sysconfdir@/krb5.conf
export SMBCONF
export KRBCONF
@@ -17,11 +17,11 @@
start)
if [ -f $SMBCONF ]; then
echo "Starting samba..."
- /opt/csw/sbin/nmbd -D
- /opt/csw/sbin/smbd -D
+ @sbindir@/nmbd -D
+ @sbindir@/smbd -D
if [ -f $KRBCONF ]; then
echo "Starting winbind..."
- /opt/csw/sbin/winbindd -B
+ @sbindir@/winbindd -B
fi
else
echo "No $SMBCONF found. Not starting";
@@ -29,8 +29,8 @@
;;
stop)
echo "Stopping Samba..."
- kill "`cat /var/opt/csw/locks/smbd.pid`"
- kill "`cat /var/opt/csw/locks/nmbd.pid`"
+ kill "`cat @localstatedir@/locks/smbd.pid`"
+ kill "`cat @localstatedir@/locks/nmbd.pid`"
if [ -f $KRBCONF ]; then
echo "Stopping Winbind..."
fi
Added: csw/mgar/pkg/samba/trunk/files/smb.conf
===================================================================
--- csw/mgar/pkg/samba/trunk/files/smb.conf (rev 0)
+++ csw/mgar/pkg/samba/trunk/files/smb.conf 2011-11-17 21:48:23 UTC (rev 16208)
@@ -0,0 +1,288 @@
+# 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 = Make sure it matches YOUR OWN NT-Domain-Name or Workgroup-Name
+ workgroup = workgroup
+
+# 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/%m.log
+# all log information in one file
+# log file = /var/log/samba/smbd.log
+
+# 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.
+# 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.
+; password level = 8
+; 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 system 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
+
+# Most people will find that this option gives better performance.
+# See speed.txt and the manual pages for details
+ socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+
+# 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
+
+# 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 ==============================
+ idmap uid = 16777216-33554431
+ idmap gid = 16777216-33554431
+ template shell = /bin/false
+ username map = /etc/samba/smbusers
+ winbind use default domain = no
+[homes]
+ comment = Home Directories
+ browseable = no
+ writeable = 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
+ 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
+; printable = yes
+
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.
+;[fredsdir]
+; comment = Fred's Service
+; path = /usr/somewhere/private
+; valid users = fred
+; public = no
+; writable = yes
+; printable = no
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %u option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.
+;[pchome]
+; comment = PC Directories
+; path = /usr/pc/%m
+; public = no
+; writable = yes
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.
+;[public]
+; path = /usr/somewhere/else/public
+; public = yes
+; only guest = yes
+; writable = yes
+; printable = no
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.
+;[myshare]
+; comment = Mary's and Fred's stuff
+; path = /usr/somewhere/shared
+; valid users = mary fred
+; public = no
+; writable = yes
+; printable = no
+; create mask = 0765
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list