From 93417315ecf206efdc5333bcf7bdc6fb2a226aea176ea00e6d2421e4f66e1351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 21 Jun 2013 14:38:15 +0000
Subject: [PATCH] - Update to 3.6.16.   + Fix crash bug during Win8 sync;
 (bso#9822).   + Properly handle Oplock breaks in compound requests;
 (bso#9722).

- Fix crash bug during Win8 sync; (bso#9822).
- Check for system libtevent and link dbwrap_tool and dbwrap_torture against
  it; (bso#9881).
- errno gets overwritten in call to check_parent_exists(); (bso#9927).
- Fix a bug of drvupgrade of smbcontrol; (bso#9941).

- Document idmap_ad rfc2307 attribute requirements; (bso#9880); (bnc#820531).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=313
---
 patches.tar.bz2      |  4 ++--
 samba-3.6.15.tar.bz2 |  3 ---
 samba-3.6.16.tar.bz2 |  3 +++
 samba-doc.spec       |  6 +++---
 samba.changes        | 21 +++++++++++++++++++++
 samba.spec           | 10 +++++++---
 vendor-files.tar.bz2 |  4 ++--
 7 files changed, 38 insertions(+), 13 deletions(-)
 delete mode 100644 samba-3.6.15.tar.bz2
 create mode 100644 samba-3.6.16.tar.bz2

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 264f144..966679b 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48c72d7a61e3e15e501f0008c844b5f345ea24aab84273dc8fc786bfdf73cb99
-size 39835
+oid sha256:3be2a94b268e37165b0a369c1d6e91ff110506073d4de83abee52e3934cbd5c8
+size 37565
diff --git a/samba-3.6.15.tar.bz2 b/samba-3.6.15.tar.bz2
deleted file mode 100644
index ca68f7c..0000000
--- a/samba-3.6.15.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:431029eed2693827d1760efff3fd818b4994e84c3bb07b2bc30104091accdc97
-size 29595023
diff --git a/samba-3.6.16.tar.bz2 b/samba-3.6.16.tar.bz2
new file mode 100644
index 0000000..6718159
--- /dev/null
+++ b/samba-3.6.16.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff33515a3f18bfcb36a24cd6a819b296c2adc617a7452950601f3c1e1f98ec8e
+size 29593021
diff --git a/samba-doc.spec b/samba-doc.spec
index 4a0b7c9..c38ba72 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.15
+%define	samba_ver 3.6.16
 %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 3017
+%define SOURCE_TIMESTAMP 3022
 %define BRANCH %{version}
-Version:        3.6.15
+Version:        3.6.16
 Release:        0
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
diff --git a/samba.changes b/samba.changes
index 9fb0118..577aee5 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Jun 21 13:47:37 UTC 2013 - lmuelle@suse.com
+
+- Update to 3.6.16.
+  + Fix crash bug during Win8 sync; (bso#9822).
+  + Properly handle Oplock breaks in compound requests; (bso#9722).
+
+-------------------------------------------------------------------
+Fri Jun 21 10:30:16 UTC 2013 - lmuelle@suse.com
+
+- Fix crash bug during Win8 sync; (bso#9822).
+- Check for system libtevent and link dbwrap_tool and dbwrap_torture against
+  it; (bso#9881).
+- errno gets overwritten in call to check_parent_exists(); (bso#9927).
+- Fix a bug of drvupgrade of smbcontrol; (bso#9941).
+
+-------------------------------------------------------------------
+Tue Jun 18 17:14:00 UTC 2013 - ddiss@suse.com
+
+- Document idmap_ad rfc2307 attribute requirements; (bso#9880); (bnc#820531).
+
 -------------------------------------------------------------------
 Fri Jun 14 09:59:26 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 8b9bbed..2583ed2 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.15
+%define	samba_ver 3.6.16
 %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 3017
+%define SOURCE_TIMESTAMP 3022
 %define BRANCH %{version}
-Version:        3.6.15
+Version:        3.6.16
 Release:        0
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
@@ -876,6 +876,9 @@ make test_nss_modules
 make test_pam_modules
 popd
 pushd testsuite/libsmbclient/src
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
+	LD_LIBRARY_PATH=../../../source3/bin/ \
+%endif
 make
 popd
 
@@ -1690,6 +1693,7 @@ fi
 %files -n libtevent-devel
 %defattr(-,root,root)
 %{_includedir}/tevent.h
+%{_includedir}/tevent_internal.h
 %{_libdir}/libtevent.so
 %{_libdir}/pkgconfig/tevent.pc
 
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index fcea630..7726d91 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:23f2fd43101156f9a4fdb34444e016eec7a1a0f4d24e86bd1f02139201f265fc
-size 53705
+oid sha256:c59ddbb834963b4d08f57b46f93dbe1591ebd01f5495bb08c70ab228cd343c4c
+size 53554