From a94824ca8e3f57ac447601b28c5ca47aee28818d0d757dde27a036b106121b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 10 Dec 2012 11:40:59 +0000
Subject: [PATCH] - Update to 3.6.10.   + Respond correctly to FILE_STREAM_INFO
 requests; (bso#9460).   + Fix segfault when "default devmode" is disabled;
 (bso#9433).   + Fix segfaults in "log level = 10" on Solaris; (bso#9390).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=279
---
 build-source-timestamp | 2 +-
 patches.tar.bz2        | 4 ++--
 samba-3.6.10.tar.bz2   | 3 +++
 samba-3.6.9.tar.bz2    | 3 ---
 samba-doc.spec         | 6 +++---
 samba.changes          | 8 ++++++++
 samba.spec             | 6 +++---
 vendor-files.tar.bz2   | 4 ++--
 8 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 samba-3.6.10.tar.bz2
 delete mode 100644 samba-3.6.9.tar.bz2

diff --git a/build-source-timestamp b/build-source-timestamp
index 140bbe8..916ce58 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1 +1 @@
-SOURCE_TIMESTAMP="2885"
+SOURCE_TIMESTAMP="2888"
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index dc38617..f05bbcd 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcf1b5d26f0f4b5fcfbb01e0f6aba4c5f88ccbf996f88b2b5111e9b0ad4ce888
-size 56837
+oid sha256:7e5fbe2d2a5e3a74f661dc0c17a58aab8d7b1f4450a4e6a8a8d47b09658fa308
+size 33481
diff --git a/samba-3.6.10.tar.bz2 b/samba-3.6.10.tar.bz2
new file mode 100644
index 0000000..783fe9c
--- /dev/null
+++ b/samba-3.6.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:088a47f77e45475f679bbccf715e126375e2fe490011e86c63e32ee7a24e26d1
+size 29484832
diff --git a/samba-3.6.9.tar.bz2 b/samba-3.6.9.tar.bz2
deleted file mode 100644
index 7be29bc..0000000
--- a/samba-3.6.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2334793a8cce439638499754ffaee3dad04417cdcd50bc653715157af480e68b
-size 29486630
diff --git a/samba-doc.spec b/samba-doc.spec
index 07293e0..ee0727d 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -89,7 +89,7 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.9
+%define	samba_ver 3.6.10
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -126,9 +126,9 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2885
+%define SOURCE_TIMESTAMP 2888
 %define BRANCH 3.6.9
-Version:        3.6.9
+Version:        3.6.10
 Release:        0
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
diff --git a/samba.changes b/samba.changes
index f4aa691..ab03275 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec 10 11:24:52 UTC 2012 - lmuelle@suse.com
+
+- Update to 3.6.10.
+  + Respond correctly to FILE_STREAM_INFO requests; (bso#9460).
+  + Fix segfault when "default devmode" is disabled; (bso#9433).
+  + Fix segfaults in "log level = 10" on Solaris; (bso#9390).
+
 -------------------------------------------------------------------
 Sat Dec  8 18:57:16 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 48cd723..2521598 100644
--- a/samba.spec
+++ b/samba.spec
@@ -89,7 +89,7 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.9
+%define	samba_ver 3.6.10
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -126,9 +126,9 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2885
+%define SOURCE_TIMESTAMP 2888
 %define BRANCH 3.6.9
-Version:        3.6.9
+Version:        3.6.10
 Release:        0
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 92532c3..fba11f9 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f2d6142906066b778303932a37ef3d57930831f7cb44345ff67ad1e3ab33558
-size 53460
+oid sha256:061cce9a03ac3f48dd968e141ed6129a3fa8308f8ec83bc6840a20f209fa2350
+size 53384