# HG changeset patch
# User Jiri Sasek <Jiri.Sasek@Oracle.COM>
# Date 1378889058 25200
# Node ID d6db5104276e5c540da2975697d6dbb05aca3b0c
# Parent  bcf516ed6959f133bcdc04bbd5509e1f3bf6f290
17413858 Update Samba to 3.6.18 release.
17311103 problem in UTILITY/SAMBA

diff -r bcf516ed6959 -r d6db5104276e components/samba/samba/Makefile
--- a/components/samba/samba/Makefile	Mon Sep 09 11:34:17 2013 -0700
+++ b/components/samba/samba/Makefile	Wed Sep 11 01:44:18 2013 -0700
@@ -26,11 +26,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.6.15
+COMPONENT_VERSION=	3.6.18
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:42b9acb13f8760a1767829ebaa4c371e462aad5287caf92887e64930cf27da60
+COMPONENT_ARCHIVE_HASH=	sha256:6d71a9ba77567eae863b9599e451479b99f6acb6042a1d98e7a22422ce599992
 COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/samba
 
diff -r bcf516ed6959 -r d6db5104276e components/samba/samba/samba.p5m
--- a/components/samba/samba/samba.p5m	Mon Sep 09 11:34:17 2013 -0700
+++ b/components/samba/samba/samba.p5m	Wed Sep 11 01:44:18 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/service/network/samba@$(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 SMB/CIFS fileserver"
-set name=com.oracle.info.tpno value=13398
+set name=com.oracle.info.tpno value=14896
 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)
@@ -91,6 +91,8 @@
 file usr/include/smb_share_modes.h path=usr/include/samba/smb_share_modes.h
 file usr/include/talloc.h path=usr/include/samba/talloc.h
 file usr/include/tdb.h path=usr/include/samba/tdb.h
+file usr/include/tevent.h path=usr/include/samba/tevent.h
+file usr/include/tevent_internal.h path=usr/include/samba/tevent_internal.h
 file usr/include/wbclient.h path=usr/include/samba/wbclient.h
 # nsswitch modules
 file build/$(MACH32)/nsswitch/libnss_winbind.so path=usr/lib/nss_winbind.so.1
@@ -121,6 +123,8 @@
 file build/$(MACH64)/source3/bin/libtalloc.so.2 path=usr/lib/samba/$(MACH64)/libtalloc.so.2
 file path=usr/lib/samba/libtdb.so.1.2.9
 file build/$(MACH64)/source3/bin/libtdb.so.1 path=usr/lib/samba/$(MACH64)/libtdb.so.1
+file path=usr/lib/samba/libtevent.so.0.9.11
+file build/$(MACH64)/source3/bin/libtevent.so.0.9.11 path=usr/lib/samba/$(MACH64)/libtevent.so.0.9.11
 file path=usr/lib/samba/libwbclient.so.0
 file build/$(MACH64)/source3/bin/libwbclient.so.0 path=usr/lib/samba/$(MACH64)/libwbclient.so.0
 file path=usr/lib/samba/lowcase.dat
@@ -629,11 +633,15 @@
 link path=usr/lib/samba/libtalloc.so target=libtalloc.so.2
 link path=usr/lib/samba/libtdb.so.1 target=libtdb.so.1.2.9
 link path=usr/lib/samba/libtdb.so target=libtdb.so.1
+link path=usr/lib/samba/libtevent.so target=libtevent.so.0
+link path=usr/lib/samba/libtevent.so.0 target=libtevent.so.0.9.11
 link path=usr/lib/samba/libwbclient.so target=libwbclient.so.0
 link path=usr/lib/samba/$(MACH64)/libtalloc.so.1 target=libtalloc.so.2
 link path=usr/lib/samba/$(MACH64)/libtalloc.so target=libtalloc.so.2
 link path=usr/lib/samba/$(MACH64)/libtdb.so target=libtdb.so.1
 link path=usr/lib/samba/$(MACH64)/libwbclient.so target=libwbclient.so.0
+link path=usr/lib/samba/$(MACH64)/libtevent.so target=libtevent.so.0
+link path=usr/lib/samba/$(MACH64)/libtevent.so.0 target=libtevent.so.0.9.11
 link path=usr/lib/samba/nss_info/adex.so target=../idmap/adex.so
 link path=usr/lib/samba/nss_info/hash.so target=../idmap/hash.so
 link path=usr/lib/samba/nss_info/rfc2307.so target=../idmap/ad.so