samba: bump to version 3.6.5 and enhancements

Bump samba to version 3.6.5 with SMB2 protocol support.

Use shared popt rather than the builtin - it saves some space if you've
already got it on your target.

mount.cifs & umount.cifs have been unbundled so remove the option -
users must use cifs-tools for that.

Add recommended enhancement from bug #807 (make iconv support optional).
Optional smbd was already commited some time ago.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

1 files changed, 13 insertions, 37 deletions

diff --git a/package/samba/Config.in b/package/samba/Config.in
index a5a5c295f..cebf7d939 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SAMBA
 	bool "samba"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_POPT
 	help
 	  Provides print services to all manner of SMB/CIFS clients,
 	  including the numerous versions of Microsoft Windows
@@ -11,20 +11,23 @@ config BR2_PACKAGE_SAMBA
 	  NOTE: A complete Samba install takes over 50MB of space,
 		so choose only the components you need.
 
-menu "Samba tools selection"
-	depends on BR2_PACKAGE_SAMBA
+if BR2_PACKAGE_SAMBA
 
-config BR2_PACKAGE_SAMBA_CIFS
-	bool "cifs"
-	default y
-	depends on BR2_PACKAGE_SAMBA
+config BR2_PACKAGE_SAMBA_LIBICONV
+	bool "extended encodings (libiconv)"
+	depends on !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBICONV
 	help
-	  Support CIFS
+	  Include libiconv support for extended conversion of filename
+	  enconding. Samba has built-in support for UTF-8, ISO-8859-1
+	  and ASCII, so this is only required if you want to support
+	  other encodings.
+
+menu "Samba tools selection"
 
 config BR2_PACKAGE_SAMBA_EVENTLOGADM
 	bool "eventlogadm"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Write Eventlog records to a tdb or perform other eventlog functions
 
@@ -43,14 +46,12 @@ comment "findsmb       - disabled (requires nmblookup, smbclient and perl)"
 config BR2_PACKAGE_SAMBA_NET
 	bool "net"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Distributed SMB/CIFS Server Management Utility
 
 config BR2_PACKAGE_SAMBA_NMBD
 	bool "nmbd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  NetBIOS name server to provide NetBIOS over IP naming services
 	  to clients
@@ -58,7 +59,6 @@ config BR2_PACKAGE_SAMBA_NMBD
 config BR2_PACKAGE_SAMBA_NMBLOOKUP
 	bool "nmblookup"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Query NetBIOS names and map them to IP addresses in a network
 	  using NetBIOS over TCP/IP queries
@@ -66,21 +66,18 @@ config BR2_PACKAGE_SAMBA_NMBLOOKUP
 config BR2_PACKAGE_SAMBA_NTLM_AUTH
 	bool "ntlm_auth"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Helper utility that authenticates users using NT/LM authentication
 
 config BR2_PACKAGE_SAMBA_PDBEDIT
 	bool "pdbedit"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Manage the SAM database (Database of Samba Users)
 
 config BR2_PACKAGE_SAMBA_PROFILES
 	bool "profiles"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Utility that reports and changes SIDs in Windows NT registry files
 
@@ -88,7 +85,6 @@ config BR2_PACKAGE_SAMBA_RPCCLIENT
 	bool "rpcclient"
 	select BR2_PACKAGE_READLINE
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Tool for executing client side MS-RPC functions using RPC
 	  calls from a UNIX workstation.
@@ -96,7 +92,6 @@ config BR2_PACKAGE_SAMBA_RPCCLIENT
 config BR2_PACKAGE_SAMBA_SMBCACLS
 	bool "smbcacls"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Set or get ACLs on an NT file or directory names
 
@@ -104,84 +99,72 @@ config BR2_PACKAGE_SAMBA_SMBCLIENT
 	bool "smbclient"
 	select BR2_PACKAGE_READLINE
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  ftp-like client to access SMB/CIFS resources on servers
 
 config BR2_PACKAGE_SAMBA_SMBCONTROL
 	bool "smbcontrol"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Send messages to smbd, nmbd or winbindd processes
 
 config BR2_PACKAGE_SAMBA_SMBCQUOTAS
 	bool "smbcquotas"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Set or get QUOTAs of NTFS 5 shares
 
 config BR2_PACKAGE_SAMBA_SMBD
 	bool "smbd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  The server daemon that provides filesharing and printing services
 
 config BR2_PACKAGE_SAMBA_SMBGET
 	bool "smbget"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  wget-like utility for download files over SMB
 
 config BR2_PACKAGE_SAMBA_SMBLDBTOOLS
 	bool "smbldbtools"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch tools
 
 config BR2_PACKAGE_SAMBA_SMBPASSWD
 	bool "smbpasswd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Change a user's SMB passwd
 
 config BR2_PACKAGE_SAMBA_SMBSHARESEC
 	bool "smbsharesec"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Manipulate share permissions on SMB file shares
 
 config BR2_PACKAGE_SAMBA_SMBSPOOL
 	bool "smbspool"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Send a print file to an SMB printer
 
 config BR2_PACKAGE_SAMBA_SMBSTATUS
 	bool "smbstatus"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Report on current Samba connections
 
 config BR2_PACKAGE_SAMBA_SMBTREE
 	bool "smbtree"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  A text based smb network browser
 
 config BR2_PACKAGE_SAMBA_SWAT
 	bool "swat"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Samba Web Administration Tool
 
@@ -198,21 +181,18 @@ comment "smbtar        - disabled (requires smbclient)"
 config BR2_PACKAGE_SAMBA_TDB
 	bool "tdb"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Tools to operate on the .tdb database files
 
 config BR2_PACKAGE_SAMBA_TESTPARM
 	bool "testparm"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Check an smb.conf configuration file for internal correctness
 
 config BR2_PACKAGE_SAMBA_WINBINDD
 	bool "winbindd"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  Name Service Switch daemon for resolving names from NT servers
 
@@ -227,11 +207,9 @@ endmenu
 
 
 menu "Samba libraries selection"
-	depends on BR2_PACKAGE_SAMBA
 
 config BR2_PACKAGE_SAMBA_LIBSMBCLIENT
 	bool "libsmbclient"
-	depends on BR2_PACKAGE_SAMBA
 	help
 	  libsmbclient is a library toolset that permits applications
 	  to manipulate CIFS/SMB network resources using many of the
@@ -242,12 +220,10 @@ endmenu
 
 
 menu "Samba support selection"
-	depends on BR2_PACKAGE_SAMBA
 
 config BR2_PACKAGE_SAMBA_AVAHI
 	bool "support avahi"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	depends on BR2_PACKAGE_AVAHI_DAEMON
 	select BR2_PACKAGE_DBUS
 	help
@@ -259,7 +235,6 @@ comment "support avahi - disabled (requires avahi-daemon)"
 config BR2_PACKAGE_SAMBA_GAMIN
 	bool "support gamin"
 	default y
-	depends on BR2_PACKAGE_SAMBA
 	depends on BR2_PACKAGE_GAMIN
 	help
 	  Include support for gamin
@@ -269,3 +244,4 @@ comment "support gamin - disabled (requires gamin)"
 
 endmenu
 
+endif