16103575 Update Samba to 3.6.12 release.
authorJiri Sasek <Jiri.Sasek@Sun.COM>
Tue, 12 Mar 2013 04:52:23 -0700
changeset 1207 1d0be3a9fc06
parent 1206 8f71b436e7f7
child 1208 8071b2820035
16103575 Update Samba to 3.6.12 release. 16299853 problem in UTILITY/SAMBA 16443813 Build noise in vfs_samfs caused by a missing prototype
components/samba/samba/Makefile
components/samba/samba/patches/idmap_hash-be_init-NULLderef.patch
components/samba/samba/patches/vfs_samfs.c.patch
components/samba/samba/samba.p5m
--- a/components/samba/samba/Makefile	Mon Mar 11 15:41:09 2013 -0700
+++ b/components/samba/samba/Makefile	Tue Mar 12 04:52:23 2013 -0700
@@ -20,17 +20,17 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.6.8
+COMPONENT_VERSION=	3.6.12
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de
+COMPONENT_ARCHIVE_HASH=	sha256:6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b
 COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/samba
 
@@ -157,8 +157,9 @@
 CONFIGURE_OPTIONS +=	--with-logfilebase=/var/samba/log
 CONFIGURE_OPTIONS +=	--enable-shared=yes
 CONFIGURE_OPTIONS +=	--enable-static=no
-CONFIGURE_OPTIONS +=	--with-static-modules=vfs_solarisacl
+CONFIGURE_OPTIONS.32 +=	--with-static-modules=vfs_solarisacl
 CONFIGURE_OPTIONS.32 += --with-shared-modules=vfs_zfsacl,vfs_samfs,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
+CONFIGURE_OPTIONS.64 +=	--with-static-modules=
 CONFIGURE_OPTIONS.64 += --with-shared-modules=
 CONFIGURE_OPTIONS +=	--with-readline
 CONFIGURE_OPTIONS +=	--enable-cups
--- a/components/samba/samba/patches/idmap_hash-be_init-NULLderef.patch	Mon Mar 11 15:41:09 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-see: https://git.samba.org/?p=samba.git;a=patch;h=03055af9b2af8a5a1c23946369a21d6437cf1b8c;hp=f43498b7590e33f2c8939c4f04781068674335af
---- a/source3/winbindd/idmap_hash/idmap_hash.c	2012-10-17 09:54:59.176103842 -0700
-+++ b/source3/winbindd/idmap_hash/idmap_hash.c	2012-10-17 09:56:31.449330518 -0700
[email protected]@ -259,7 +259,7 @@
- 
- static NTSTATUS nss_hash_init(struct nss_domain_entry *e )
- {
--	return be_init(NULL);
-+	return NT_STATUS_OK;
- }
- 
- /**********************************************************************
--- a/components/samba/samba/patches/vfs_samfs.c.patch	Mon Mar 11 15:41:09 2013 -0700
+++ b/components/samba/samba/patches/vfs_samfs.c.patch	Tue Mar 12 04:52:23 2013 -0700
@@ -41,7 +41,7 @@
 index 0000000..9370768
 --- /dev/null	2012-07-16 09:13:54.000000000 -0700
 +++ b/source3/modules/vfs_samfs.c	2012-07-16 09:21:00.168046000 -0700
[email protected]@ -0,0 +1,180 @@
[email protected]@ -0,0 +1,181 @@
 +/*
 + * Support for offline files with Sun SAM-QFS
 + *
@@ -66,6 +66,7 @@
 + */
 +
 +#include "includes.h"
++#include "smbd/smbd.h"
 +/*
 + * Include files for Sun SAM-QFS
 + *
--- a/components/samba/samba/samba.p5m	Mon Mar 11 15:41:09 2013 -0700
+++ b/components/samba/samba/samba.p5m	Tue Mar 12 04:52:23 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/service/network/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="samba - A Windows SMB/CIFS fileserver for UNIX"
 set name=com.oracle.info.description value="samba, a Windows SMB/CIFS fileserver for UNIX"
-set name=com.oracle.info.tpno value=9712
+set name=com.oracle.info.tpno value=12677
 set name=info.classification value="org.opensolaris.category.2008:System/File System"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -40,16 +40,6 @@
  desc="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)" \
  name="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)"
 
-#
-# Objects up to the end of file were generated from the SFW prototype_% files:
-#  global lines: 822 files: 443 dirs: 113 links: 21
-#  protofile: SUNWsmbadocr/prototype_com lines: 51 files: 1 dirs: 4 links: 0
-#  protofile: SUNWsmbadocu/prototype_com lines: 380 files: 305 dirs: 29 links: 0
-#  protofile: SUNWsmbar/prototype_com lines: 60 files: 5 dirs: 13 links: 0
-#  protofile: SUNWsmbau/prototype_com lines: 266 files: 126 dirs: 64 links: 15
-#  protofile: SUNWsmbau/prototype_sparc lines: 65 files: 6 dirs: 3 links: 6
-# then file sources were added manually if needed
-
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 <transform dir path=usr/share/locale/.* -> default group other>
 
@@ -132,8 +122,10 @@
 dir path=usr/share/samba/swat/help
 dir path=usr/share/samba/swat/help/manpages
 dir path=usr/share/samba/swat/help/Samba3-ByExample
+dir path=usr/share/samba/swat/help/Samba3-ByExample/images
 dir path=usr/share/samba/swat/help/Samba3-Developers-Guide
 dir path=usr/share/samba/swat/help/Samba3-HOWTO
+dir path=usr/share/samba/swat/help/Samba3-HOWTO/images
 dir path=usr/share/samba/swat/images
 dir path=usr/share/samba/swat/include
 dir path=usr/share/samba/swat/js
@@ -240,6 +232,7 @@
 file path=usr/lib/samba/valid.dat
 file path=usr/lib/samba/vfs/acl_tdb.so
 file path=usr/lib/samba/vfs/acl_xattr.so
+file path=usr/lib/samba/vfs/aio_fork.so
 file path=usr/lib/samba/vfs/audit.so
 file path=usr/lib/samba/vfs/cacheprime.so
 file path=usr/lib/samba/vfs/cap.so
@@ -408,6 +401,60 @@
 file path=usr/share/samba/swat/help/Samba3-ByExample/small.html
 file path=usr/share/samba/swat/help/Samba3-ByExample/unixclients.html
 file path=usr/share/samba/swat/help/Samba3-ByExample/upgrades.html
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/acct2net.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-A.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-B.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2r.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-netr.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-config.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-login.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-users.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/openmag.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp010.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp011.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp012.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp013.png
+file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp015.png
 file path=usr/share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
 file path=usr/share/samba/swat/help/Samba3-Developers-Guide/Packaging.html
 file path=usr/share/samba/swat/help/Samba3-Developers-Guide/architecture.html
@@ -494,6 +541,74 @@
 file path=usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
 file path=usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 file path=usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/10small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/11small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/12small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/13small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/14small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/1small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/2small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/3small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/4small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/5small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/6small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/7small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/8small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/9small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME001.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME002.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME003.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME004.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME005.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME006.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME007.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME008.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME009.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME010.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME011.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME012.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME013.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME014.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/a_small.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/access1.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/cups1.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/cups2.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/domain.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-groups.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp006.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp010.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp011.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp012.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp013.png
+file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp015.png
 file path=usr/share/samba/swat/help/manpages/eventlogadm.8.html
 file path=usr/share/samba/swat/help/manpages/findsmb.1.html
 file path=usr/share/samba/swat/help/manpages/idmap_ad.8.html