# HG changeset patch
# User Jiri Sasek <Jiri.Sasek@Sun.COM>
# Date 1351160070 25200
# Node ID ba55ae2d54aa948b4c6886608d37e42d88d15280
# Parent  6af2048773a2e84b1b9acfa8fe679a5ee78af0f3
7204906 Update Samba to 3.6.8 release.
7195246 After Samba patch 119757-25/119758-25: Files not deleted, smbstatus shows "Segmentation fault"

diff -r 6af2048773a2 -r ba55ae2d54aa components/samba/samba/Makefile
--- a/components/samba/samba/Makefile	Tue Oct 23 07:43:48 2012 -0700
+++ b/components/samba/samba/Makefile	Thu Oct 25 03:14:30 2012 -0700
@@ -26,11 +26,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	3.6.7
+COMPONENT_VERSION=	3.6.8
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:b858a0f011ba7fe554881b9c7e6cb1c9cb7face22ed86860f560fcaecc4ed4ca
+COMPONENT_ARCHIVE_HASH=	sha256:4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de
 COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
 
 COMPONENT_NAME_1=		docbook-xsl
diff -r 6af2048773a2 -r ba55ae2d54aa components/samba/samba/patches/idmap_hash-be_init-NULLderef.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/samba/samba/patches/idmap_hash-be_init-NULLderef.patch	Thu Oct 25 03:14:30 2012 -0700
@@ -0,0 +1,12 @@
+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
+@@ -259,7 +259,7 @@
+ 
+ static NTSTATUS nss_hash_init(struct nss_domain_entry *e )
+ {
+-	return be_init(NULL);
++	return NT_STATUS_OK;
+ }
+ 
+ /**********************************************************************
diff -r 6af2048773a2 -r ba55ae2d54aa components/samba/samba/samba-license
--- a/components/samba/samba/samba-license	Tue Oct 23 07:43:48 2012 -0700
+++ b/components/samba/samba/samba-license	Thu Oct 25 03:14:30 2012 -0700
@@ -2,7 +2,7 @@
 This package may include technology which may be subject to one or more
 of the following additional notices:
 
-Samba 3.6.6
+Samba 3.6.8
 Oracle Internal Tracking Number 9712
 
                         GNU GENERAL PUBLIC LICENSE