From: Patrick Lauer Date: Mon, 1 Mar 2010 16:19:57 +0000 (+0000) Subject: Bump to monolithic 3.5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=317a1efc362073b699d8092b808f923dcd4eb206;p=gentoo.git Bump to monolithic 3.5 Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 30cf723d22e9..846831c7370b 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-fs/samba # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.403 2010/02/28 16:03:03 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.404 2010/03/01 16:19:57 patrick Exp $ + +*samba-3.5.0 (01 Mar 2010) + + 01 Mar 2010; Patrick Lauer +files/3.5/lmhosts, + +files/3.5/nsswitch.conf-winbind, +files/3.5/nsswitch.conf-wins, + +files/3.5/samba.confd, +files/3.5/samba.initd, +files/3.5/samba.pam, + +files/3.5/smb.conf.default, +files/3.5/smbusers, +files/3.5/swat.xinetd, + -samba-3.5.0_rc2.ebuild, -samba-3.5.0_rc3.ebuild, + +files/3.5/system-auth-winbind.pam, +samba-3.5.0.ebuild: + Bump to monolithic 3.5 28 Feb 2010; Patrick Lauer +files/samba4.initd, samba-4.0.0_alpha11.ebuild: diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 0c816d564022..e982a8db6fcc 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -16,6 +16,16 @@ AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SH AUX 3.4/smbusers 218 RMD160 6a8acc59ff824419c9f10db432ae8ed9d0ec5651 SHA1 5bad77d5e82f914b716722b4d5fa5126236b73ef SHA256 97562315c02ed571aca99ba857a1fab7550fa8dbbf3eebcb41157b2d5deb57b3 AUX 3.4/swat.xinetd 527 RMD160 a4b3d8c6fef6417007fe17bba7737bf6c6821696 SHA1 706cfa524e14f16237f6f6a8039236b59e1beddc SHA256 f59fe771e6804296ac3a0a7c3ad88dd3ae2cd59b89c64af8924f6e0f2ad30cd0 AUX 3.4/system-auth-winbind.pam 705 RMD160 f6275a470e06dc168cf39ef144ccc190901978ee SHA1 a8e4946fc4dd24b00b9ce7d8574795e987350462 SHA256 046ba3a997328eeeaffa65d662b90dc415a27c8a77f9e4402d2a979aace97dd7 +AUX 3.5/lmhosts 126 RMD160 485c480c5d3203e5f6c3d769ea36d04682a4ce39 SHA1 149e536986bddaf961d77e73f3bf04f39212333d SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e +AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f5 SHA1 16c57e5ba8d07ecc50d0e1a93df5bc82c4063764 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 +AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 +AUX 3.5/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314 +AUX 3.5/samba.initd 1136 RMD160 49d7be720d68d9477fcfbfb61372471dbdba580e SHA1 19a4ac095e6c9c0cfb5dfabbf75a7a3e92e06b47 SHA256 24e5fb58f8fb360ce0ef75bd639b1e1f5f43c0c5e4e17049ebccc011dfca9ab9 +AUX 3.5/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38 +AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297 +AUX 3.5/smbusers 218 RMD160 a94e0928466c0ed7cfd3edd3ac88dd1c8725a987 SHA1 84518d8768048e497724c72f89c00e6223c6cdb6 SHA256 ed24f121813aff4b8e79c99317f4f9dfde9246d150d7718f0fa60babb8b9dca1 +AUX 3.5/swat.xinetd 527 RMD160 8b2364e6fda8cecc75feef8129347ebc545ecc43 SHA1 98f94bc638ffb68d6fb35745aebbf0c63d4135ce SHA256 7919926945c9a7a28446280ea477aed2d7d3506372a03cbea96b446a8fa39aa4 +AUX 3.5/system-auth-winbind.pam 705 RMD160 666533e99283449d60a97fd4fcd704d72212b871 SHA1 a1fe11d7a4f7501c938c03121e4ad950c515f75e SHA256 eca81593dc1b3e2be19bba7a128d71474243216a7783ed788320ca51cf6ea6c7 AUX README.gentoo 3208 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 SHA1 819ae809566e967cdc03024adae4443c5833dfc5 SHA256 9e87efa3fcea73becdfad4adb0fe677e1969c2951f03c47d1b0f4aeb00999578 AUX config-3.2/lmhosts 134 RMD160 7c99b13a2f273ee190c7df9392b1678b00ec461a SHA1 d63d8d846c3cecfc706d28d916ea323f2eae4ef1 SHA256 b891ca7448db3fadefd9f5ddaeb28ea19bad63c3ee21ea8f74cdc2dfecd6ab6b AUX config-3.2/nsswitch.conf-winbind 414 RMD160 71491dd98acc39aea8f18f5cc382f6a56d80259f SHA1 fa5c1e24437d4ffc0150a2b202f5ba6df5d40463 SHA256 5466dc681036731046f53e4ef59fb7c2110783e77a38d0887432d94776c3dafa @@ -43,6 +53,7 @@ AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0b DIST samba-3.0.37.tar.gz 23416703 RMD160 06b76ae22729e10c83d6af42d03b03ad69e49103 SHA1 5ec6bc6558b3c799f747eb49fbba019d5edf0cbd SHA256 bb67c0e13d4ccbd84b9200c8739393fdd9b3145b5aad216934dc670f0fcea266 DIST samba-3.2.15.tar.gz 24435114 RMD160 0046aeaf5b91c34bbc9a387c714caf41ca84d1ae SHA1 52240aa9f2f5584f1978d788024fa2d6cb208e56 SHA256 84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46 DIST samba-3.4.6.tar.gz 34849318 RMD160 d94c6c85e1c30a160d3440630943fd0af2f8da72 SHA1 7896340d96a9c7f8a57d3a4c425bbbed78886f5c SHA256 c06504a5dcf6f0dea26c40869e7350af634500114052ddaf3590086cfbba6a16 +DIST samba-3.5.0.tar.gz 30755153 RMD160 4c0169a3b5d1b7e08f10264a31165fcf94896de2 SHA1 68a6c2c47dd9e791ca58ad810fc5838fe0e27f35 SHA256 074217e5438affa45906f5e1395633a57f7cd25453adfdba9fa442bab7f3266f DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9 DIST samba-vscan-0.3.6c-beta5.tar.gz 248183 RMD160 6929c30b57e342c4bdf6a6b432fbe41c2ac70a74 SHA1 9e1b37225246ff2f19e37aceb97a680afc82cdda SHA256 bfe910d54add8dcb87d5babdf50127a6dcf079e0e90ad9947b4cbfdbe3e3037d EBUILD samba-3.0.37.ebuild 10118 RMD160 759a57434fe5f82287b0312c856130d7b00c014e SHA1 9a1b2c19e65a00fef37e9177151843a174edc60c SHA256 ad1df7f3892aba9b69504bc35aa2f0e1fe6fbb72986e44b910cd7941dd3be0ed @@ -50,8 +61,7 @@ EBUILD samba-3.2.15.ebuild 8586 RMD160 1b4e8d899150a548892ac7c91f0e6165f8ca0171 EBUILD samba-3.3.10.ebuild 544 RMD160 d5959ae1d9f98a346c1d83429055864ee575fdc1 SHA1 fd7fae3afe619faebe70ac64b8e556dcb15f7728 SHA256 f3889e924b3ee2849ee4abdcdfec501a32dafd1171fdc30c94fa31a2b549d10b EBUILD samba-3.4.5.ebuild 566 RMD160 c1b065c044c1d3f50cffc1a2b83e0535294f8403 SHA1 2f0a6d29172ef3db545b8d133a604616495da671 SHA256 243757fd0ddc2a7bd28d45ea625f8122d8caa42377586ba0cc92802220d2d561 EBUILD samba-3.4.6.ebuild 10343 RMD160 810fc8f8151b317b0efc45076f21cd8a340508ab SHA1 92e06db8a90e913eefea3ee24f5a21766e4b886d SHA256 eb88ee2797466e4134d1d2cf6d3d120c8cc675a17bc661410289447c7735cf57 -EBUILD samba-3.5.0_rc2.ebuild 570 RMD160 ecb24b5d669189f9b2327d86e0b03857d6757dc8 SHA1 8fc19a543cd6313c142a6e1bf5c8f935d0af5b71 SHA256 42ee00b106547a6ae913bc4769794c06d9772d4eed27b21c0af97f5b9d62d339 -EBUILD samba-3.5.0_rc3.ebuild 570 RMD160 2ee7e3c76dddf2ea37076247d51ed19f9445db22 SHA1 d1881568da6ac776bda35628452eab9ec5a86dfa SHA256 946421ac43dcc1d4bbfe22414c6b9fd04d91c2b684cd1a6bd7a8813280f77dd3 +EBUILD samba-3.5.0.ebuild 10377 RMD160 8bb7f9bcfcd13002cd72733c0e52fa0480ebeb3a SHA1 1c0dc8330d747943135bb7d37e8eee3b3ec295fa SHA256 52a728a009223e74bcc6ab7e31dce0b8cbe1bf68463ceddfe49298d5fbd5b5a3 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58 -MISC ChangeLog 67153 RMD160 7562da05fd1c6d712251987c890e8eb036dda41d SHA1 55bdfb65b9b5b56da206f460cc5c192930760b95 SHA256 758c3016e26ac78c53179f39607223dea3f98c97f90ddf6fd67f40c25de3bf1c +MISC ChangeLog 67603 RMD160 81ee8b8c3b0c87505d12a1ec501c574c85b2d621 SHA1 b34cb21f3d16eda7583c7aced1bd97636357c38f SHA256 b7f7e526670ed2c84e0ca01e3499845fed633688b0931a2253088263bcfdc64e MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e diff --git a/net-fs/samba/files/3.5/lmhosts b/net-fs/samba/files/3.5/lmhosts new file mode 100644 index 000000000000..80e717563f10 --- /dev/null +++ b/net-fs/samba/files/3.5/lmhosts @@ -0,0 +1,2 @@ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/lmhosts,v 1.1 2010/03/01 16:19:54 patrick Exp $ +127.0.0.1 localhost diff --git a/net-fs/samba/files/3.5/nsswitch.conf-winbind b/net-fs/samba/files/3.5/nsswitch.conf-winbind new file mode 100644 index 000000000000..a95258d1bfae --- /dev/null +++ b/net-fs/samba/files/3.5/nsswitch.conf-winbind @@ -0,0 +1,17 @@ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/nsswitch.conf-winbind,v 1.1 2010/03/01 16:19:54 patrick Exp $ +passwd: files winbind +group: files winbind + +hosts: files dns +networks: files dns + +services: db files +protocols: db files +rpc: db files +ethers: db files +netmasks: files +netgroup: files +bootparams: files + +automount: files +aliases: files diff --git a/net-fs/samba/files/3.5/nsswitch.conf-wins b/net-fs/samba/files/3.5/nsswitch.conf-wins new file mode 100644 index 000000000000..2ca2490e8daf --- /dev/null +++ b/net-fs/samba/files/3.5/nsswitch.conf-wins @@ -0,0 +1,17 @@ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/nsswitch.conf-wins,v 1.1 2010/03/01 16:19:54 patrick Exp $ +passwd: files +group: files + +hosts: files dns wins +networks: files dns + +services: db files +protocols: db files +rpc: db files +ethers: db files +netmasks: files +netgroup: files +bootparams: files + +automount: files +aliases: files diff --git a/net-fs/samba/files/3.5/samba.confd b/net-fs/samba/files/3.5/samba.confd new file mode 100644 index 000000000000..8ef8d7351a27 --- /dev/null +++ b/net-fs/samba/files/3.5/samba.confd @@ -0,0 +1,28 @@ +#add "winbind" to the daemon_list if you also want winbind to start +daemon_list="smbd nmbd" + +#---------------------------------------------------------------------------- +# Daemons calls: _ +#---------------------------------------------------------------------------- +my_service_name="samba" +my_service_PRE="unset TMP TMPDIR" +my_service_POST="" + +#---------------------------------------------------------------------------- +# Daemons calls: _ +#---------------------------------------------------------------------------- +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" + +winbind_start_options="" +winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}" +winbind_stop="start-stop-daemon --stop --oknodo --exec /usr/sbin/winbindd" +winbind_reload="killall -HUP winbindd" + diff --git a/net-fs/samba/files/3.5/samba.initd b/net-fs/samba/files/3.5/samba.initd new file mode 100644 index 000000000000..584b509aa0bc --- /dev/null +++ b/net-fs/samba/files/3.5/samba.initd @@ -0,0 +1,53 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/samba.initd,v 1.1 2010/03/01 16:19:54 patrick Exp $ + +opts="reload" + +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} + 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/3.5/samba.pam b/net-fs/samba/files/3.5/samba.pam new file mode 100644 index 000000000000..91beadd478a4 --- /dev/null +++ b/net-fs/samba/files/3.5/samba.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +# * pam_smbpass.so authenticates against the smbpasswd file +# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility +# (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only +auth required pam_smbpass.so nodelay +account include system-auth +session include system-auth +password required pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf diff --git a/net-fs/samba/files/3.5/smb.conf.default b/net-fs/samba/files/3.5/smb.conf.default new file mode 100644 index 000000000000..4c9a4a6d529f --- /dev/null +++ b/net-fs/samba/files/3.5/smb.conf.default @@ -0,0 +1,271 @@ +# 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 +# +# 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: +# http://www.samba.org/samba/docs/Samba-Guide.pdf +# +# 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, eg: MIDEARTH + workgroup = MYGROUP + +# server string is the equivalent of the NT Description field + server string = Samba Server + +# Security mode. Defines in which mode Samba will operate. Possible +# values are share, user, server, domain and ads. Most people will want +# user level security. See the Samba-HOWTO-Collection for details. + security = user + +# 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 + load printers = yes + +# you may wish to override the location of the printcap file +; printcap name = /etc/printcap + +# on SystemV system setting printcap name to lpstat should allow +# you to automatically obtain a printer list from the SystemV spool +# system +; printcap name = lpstat + +# It should not be necessary to specify the print system type unless +# it is non-standard. Currently supported print systems include: +# bsd, cups, sysv, plp, lprng, aix, hpux, qnx +; printing = cups + +# 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 + +# Use password server option only with security = server +# The argument list may include: +# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] +# or to auto-locate the domain controller/s +# password server = * +; password server = + +# Use the realm option only with security = ads +# Specifies the 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 +# compatibility. tdbsam requires no further configuration. +; passdb backend = tdbsam + +# 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. +# Note: Consider carefully the location in the configuration file of +# this line. The included file is read at that point. +; 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 + +# 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 + +# 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 default is NO. + dns proxy = no + +# 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 +; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u +; delete user script = /usr/sbin/userdel %u +; delete user from group script = /usr/sbin/deluser %u %g +; delete group script = /usr/sbin/groupdel %g + + +#============================ 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 = /var/lib/samba/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 = /var/lib/samba/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 +; writable = yes +; printable = no +; 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 + + diff --git a/net-fs/samba/files/3.5/smbusers b/net-fs/samba/files/3.5/smbusers new file mode 100644 index 000000000000..51b8dda2e99c --- /dev/null +++ b/net-fs/samba/files/3.5/smbusers @@ -0,0 +1,7 @@ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/smbusers,v 1.1 2010/03/01 16:19:54 patrick Exp $ + +# Syntax: +# Unix_name = SMB_name1 SMB_name2 ... + +root = Administrator admin +nobody = guest pcguest smbguest diff --git a/net-fs/samba/files/3.5/swat.xinetd b/net-fs/samba/files/3.5/swat.xinetd new file mode 100644 index 000000000000..13b3ee23a318 --- /dev/null +++ b/net-fs/samba/files/3.5/swat.xinetd @@ -0,0 +1,17 @@ +# 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. +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/swat.xinetd,v 1.1 2010/03/01 16:19:54 patrick Exp $ + +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/net-fs/samba/files/3.5/system-auth-winbind.pam b/net-fs/samba/files/3.5/system-auth-winbind.pam new file mode 100644 index 000000000000..b58dcf64fe96 --- /dev/null +++ b/net-fs/samba/files/3.5/system-auth-winbind.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/system-auth-winbind.pam,v 1.1 2010/03/01 16:19:54 patrick Exp $ + +auth required pam_env.so +auth sufficient pam_winbind.so +auth sufficient pam_unix.so likeauth nullok use_first_pass +auth required pam_deny.so + +account sufficient pam_winbind.so +account required pam_unix.so + +password required pam_cracklib.so retry=3 +password sufficient pam_unix.so nullok use_authtok md5 shadow +password required pam_deny.so + +session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 +session required pam_limits.so +session required pam_unix.so diff --git a/net-fs/samba/samba-3.5.0.ebuild b/net-fs/samba/samba-3.5.0.ebuild new file mode 100644 index 000000000000..ae1f34004760 --- /dev/null +++ b/net-fs/samba/samba-3.5.0.ebuild @@ -0,0 +1,368 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.0.ebuild,v 1.1 2010/03/01 16:19:57 patrick Exp $ + +EAPI="2" + +inherit pam confutils versionator multilib + +MY_PV=${PV/_/} +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Library bits of the samba network filesystem" +HOMEPAGE="http://www.samba.org/" +SRC_URI="mirror://samba/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam + ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat + syslog winbind " + +DEPEND="dev-libs/popt + !net-fs/samba-client + !net-fs/samba-libs + !net-fs/samba-server + sys-libs/talloc + sys-libs/tdb + virtual/libiconv + ads? ( virtual/krb5 sys-fs/e2fsprogs + client? ( sys-apps/keyutils ) ) + avahi? ( net-dns/avahi ) + caps? ( sys-libs/libcap ) + client? ( !net-fs/mount-cifs + dev-libs/iniparser ) + cluster? ( dev-db/ctdb ) + cups? ( net-print/cups ) + debug? ( dev-libs/dmalloc ) + fam? ( dev-libs/libgamin ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam + winbind? ( dev-libs/iniparser ) ) + readline? ( >=sys-libs/readline-5.2 ) + syslog? ( virtual/logger )" + +RDEPEND="${DEPEND}" + +# Disable tests since we don't want to build that much here +RESTRICT="test" + +SBINPROGS="" +BINPROGS="" + +if use server ; then + SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" + BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit + bin/profiles bin/sharesec bin/eventlogadm" + + use swat && SBINPROGS="${SBINPROGS} bin/swat" + use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" + use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator" +fi + +if use client ; then + BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree + bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas + bin/ntlm_auth" + + use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall" +fi + +use cups && BINPROGS="${BINPROGS} bin/smbspool" +use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; +use winbind && BINPROGS="${BINPROGS} bin/wbinfo" + +S="${WORKDIR}/${MY_P}/source3" + +# TODO: +# - enable iPrint on Prefix/OSX and Darwin? +# - selftest-prefix? selftest? +# - AFS? + +CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" + +pkg_setup() { + confutils_use_depend_all ads ldap + confutils_use_depend_all swat server +} + +src_prepare() { + cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk" + + # ensure that winbind has correct ldflags (QA notice) + sed -i \ + -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \ + configure || die "sed failed" +} + +src_configure() { + local myconf + + # Filter out -fPIE + [[ ${CHOST} == *-*bsd* ]] || use hppa && myconf="${myconf} --disable-pie" + + # Upstream refuses to make this configurable + use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no + + # use_with doesn't accept 2 USE-flags + if use client && use ads ; then + myconf="${myconf} --with-cifsupcall" + else + myconf="${myconf} --without-cifsupcall" + fi + + # Notes: + # - automount is only needed in conjunction with NIS and we don't have that + # anymore => LDAP? + # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default + econf ${myconf} \ + --with-piddir=/var/run/samba \ + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + $(use_enable debug developer) \ + --enable-largefile \ + --enable-socket-wrapper \ + --enable-nss-wrapper \ + $(use_enable swat) \ + $(use_enable debug dmalloc) \ + $(use_enable cups) \ + --disable-iprint \ + $(use_enable fam) \ + --enable-shared-libs \ + --disable-dnssd \ + $(use_enable avahi) \ + --with-fhs \ + --with-privatedir=/var/lib/samba/private \ + --with-rootsbindir=/var/cache/samba \ + --with-lockdir=/var/cache/samba \ + --with-swatdir=/usr/share/doc/${PF}/swat \ + --with-configdir=/etc/samba \ + --with-logfilebase=/var/log/samba \ + --with-pammodulesdir=$(getpam_mod_dir) \ + --without-afs \ + --without-fake-kaserver \ + --without-vfs-afsacl \ + $(use_with ldap) \ + $(use_with ads) \ + $(use_with ads krb5 /usr) \ + $(use_with ads dnsupdate) \ + --without-automount \ + $(use_with client cifsmount) \ + $(use_with client cifsumount) \ + $(use_with pam) \ + $(use_with pam pam_smbpass) \ + $(use_with syslog) \ + $(use_with quota quotas) \ + $(use_with quota sys-quotas) \ + --without-utmp \ + --without-lib{talloc,tdb} \ + $(use_with netapi libnetapi) \ + $(use_with smbclient libsmbclient) \ + $(use_with smbsharemodes libsmbsharemodes) \ + $(use_with addns libaddns) \ + $(use_with cluster ctdb /usr) \ + $(use_with cluster cluster-support) \ + $(use_with acl acl-support) \ + $(use_with aio aio-support) \ + --with-sendfile-support \ + $(use_with winbind) \ + --without-included-popt \ + --without-included-iniparser +} + +src_compile() { + # compile libs + if use addns ; then + einfo "make addns library" + emake libaddns || die "emake libaddns failed" + fi + if use netapi ; then + einfo "make netapi library" + emake libnetapi || die "emake libnetapi failed" + fi + if use smbclient ; then + einfo "make smbclient library" + emake libsmbclient || die "emake libsmbclient failed" + fi + if use smbsharemodes ; then + einfo "make smbsharemodes library" + emake libsmbsharemodes || die "emake libsmbsharemodes failed" + fi + + # compile modules + emake modules || die "building modules failed" + + # compile pam moudles + if use pam ; then + einfo "make pam modules" + emake pam_modules || die "emake pam_modules failed"; + fi + + # compile winbind nss modules + if use winbind ; then + einfo "make nss modules" + emake nss_modules || die "emake nss_modules failed"; + fi + + # compile utilities + if [ -n "${BINPROGS}" ] ; then + einfo "make binprogs" + emake ${BINPROGS} || die "emake binprogs failed"; + fi + if [ -n "${SBINPROGS}" ] ; then + einfo "make sbinprogs" + emake ${SBINPROGS} || die "emake sbinprogs failed"; + fi + + if use client ; then + einfo "make {,u}mount.cifs" + emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed" + fi +} + +src_install() { + # install libs + if use addns ; then + einfo "install addns library" + emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed" + fi + if use netapi ; then + einfo "install netapi library" + emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed" + fi + if use smbclient ; then + einfo "install smbclient library" + emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed" + fi + if use smbsharemodes ; then + einfo "install smbsharemodes library" + emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed" + fi + + # install modules + emake installmodules DESTDIR="${D}" || die "installing modules failed" + + if use pam ; then + einfo "install pam modules" + emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed" + + if use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + doman ../docs/manpages/pam_winbind.8 + fi + + newpamd "${CONFDIR}/samba.pam" samba + dodoc pam_smbpass/README + fi + + # Nsswitch extensions. Make link for wins and winbind resolvers + if use winbind ; then + einfo "install libwbclient" + emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed" + dolib.so ../nsswitch/libnss_wins.so + dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 + dolib.so ../nsswitch/libnss_winbind.so + dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 + fi + + # install binaries + insinto /usr + for prog in ${SBINPROGS} ; do + dosbin ${prog} || die "installing ${prog} failed" + doman ../docs/manpages/${prog/bin\/}* || die "doman failed" + done + dobin ${BINPROGS} || die "installing binaries failed" + for prog in ${BINPROGS} ; do + dobin ${prog} || die "installing ${prog} failed" + doman ../docs/manpages/${prog/bin\/}* || die "doman failed" + done + + # install server components + if use server ; then + doman ../docs/manpages/vfs* ../docs/manpages/samba.7 + + diropts -m0700 + keepdir /var/lib/samba/private + + diropts -m1777 + keepdir /var/spool/samba + + diropts -m0755 + keepdir /var/{cache,log}/samba + keepdir /var/lib/samba/{netlogon,profiles} + keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR} + keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext} + + newconfd "${CONFDIR}/samba.confd" samba + newinitd "${CONFDIR}/samba.initd" samba + + insinto /etc/samba + doins "${CONFDIR}"/{smbusers,lmhosts} + + if use ldap ; then + insinto /etc/openldap/schema + doins ../examples/LDAP/samba.schema + fi + + if use swat ; then + insinto /etc/xinetd.d + newins "${CONFDIR}/swat.xinetd" swat + script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \ + || die "installing swat failed" + fi + + dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS + fi + + # install client files ({u,}mount.cifs into /) + if use client ; then + into / + dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around" + doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages" + fi + + # install the spooler to cups + use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb + + # install misc files + insinto /etc/samba + doins "${CONFDIR}"/smb.conf.default + doman ../docs/manpages/smb.conf.5 + + insinto /usr/"$(get_libdir)"/samba + doins ../codepages/{valid.dat,upcase.dat,lowcase.dat} + + # install docs + if use doc ; then + dohtml -r ../docs/htmldocs/* + dodoc ../docs/*.pdf + fi + + # install examples + if use examples ; then + einfo "install examples" + insinto /usr/share/doc/${PF}/examples + + if use smbclient ; then + doins -r ../examples/libsmbclient + fi + + if use winbind ; then + doins -r ../examples/pam_winbind ../examples/nss + fi + + if use server ; then + doins -r \ + auth autofs dce-dfs LDAP logon misc pdb perfcounter \ + printer-accounting printing scripts tridge validchars VFS + fi + fi + + # Remove empty installation directories + rmdir --ignore-fail-on-non-empty \ + "${D}/usr/$(get_libdir)/samba" \ + "${D}/usr"/{sbin,bin} \ + "${D}/usr/share"/{man,locale,} \ + "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ + # || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" +} diff --git a/net-fs/samba/samba-3.5.0_rc2.ebuild b/net-fs/samba/samba-3.5.0_rc2.ebuild deleted file mode 100644 index 8b303ee67596..000000000000 --- a/net-fs/samba/samba-3.5.0_rc2.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.0_rc2.ebuild,v 1.1 2010/01/26 19:02:41 patrick Exp $ - -EAPI="2" - -DESCRIPTION="Meta package for samba-{libs,client,server}" -HOMEPAGE="http://www.samba.org/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+client +server" - -DEPEND="" -RDEPEND="~net-fs/samba-libs-${PV} - client? ( ~net-fs/samba-client-${PV} ) - server? ( ~net-fs/samba-server-${PV} )" diff --git a/net-fs/samba/samba-3.5.0_rc3.ebuild b/net-fs/samba/samba-3.5.0_rc3.ebuild deleted file mode 100644 index 93606d288364..000000000000 --- a/net-fs/samba/samba-3.5.0_rc3.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.0_rc3.ebuild,v 1.1 2010/02/19 17:19:36 patrick Exp $ - -EAPI="2" - -DESCRIPTION="Meta package for samba-{libs,client,server}" -HOMEPAGE="http://www.samba.org/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+client +server" - -DEPEND="" -RDEPEND="~net-fs/samba-libs-${PV} - client? ( ~net-fs/samba-client-${PV} ) - server? ( ~net-fs/samba-server-${PV} )"