# HG changeset patch
# User Jiri Sasek <Jiri.Sasek@Oracle.COM>
# Date 1387282592 28800
# Node ID c02ad4077bcd21919efbd540c4128f6382d136fb
# Parent  936fff797203e68f403336a56c0439108f3dd08d
17938490 Update Samba to 3.6.22 release.
17922676 problem in UTILITY/SAMBA
17931244 problem in UTILITY/SAMBA

diff -r 936fff797203 -r c02ad4077bcd components/samba/samba/Makefile
--- a/components/samba/samba/Makefile	Mon Dec 02 05:58:52 2013 -0800
+++ b/components/samba/samba/Makefile	Tue Dec 17 04:16:32 2013 -0800
@@ -26,11 +26,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.6.20
+COMPONENT_VERSION=	3.6.22
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:5fb5daa65c06c890cdc938fd30daca40945afe2880e6a4b95b8eea418e003a0f
+COMPONENT_ARCHIVE_HASH= sha256:30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea
 COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/samba
 
diff -r 936fff797203 -r c02ad4077bcd components/samba/samba/samba.p5m
--- a/components/samba/samba/samba.p5m	Mon Dec 02 05:58:52 2013 -0800
+++ b/components/samba/samba/samba.p5m	Tue Dec 17 04:16:32 2013 -0800
@@ -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=15824
+set name=com.oracle.info.tpno value=16120
 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)