From 8e187130c4055afb35081fee3576059660f6a3bb54f3368e5fbf259496196c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 19 Jan 2015 18:33:31 +0000
Subject: [PATCH 1/4] - Fix libsmbclient DFS referral handling.   + Reuse
 connections derived from DFS referrals; (bso#10123); (fate#316512).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=448
---
 patches.tar.bz2      | 4 ++--
 samba.changes        | 6 ++++++
 samba.spec           | 2 +-
 vendor-files.tar.bz2 | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 430a1fe..036b89f 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1d19f1357be061cd1176364f2e6c5f7716d3ed5311d0f26d17db2c4286af84e
-size 328975
+oid sha256:cee66a97e797af2bd0969bf63251e5a639b1db2762ca2f13ed6ee420fa2501c1
+size 330950
diff --git a/samba.changes b/samba.changes
index f9a57b6..e09106b 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 19 17:15:19 UTC 2015 - ddiss@suse.com
+
+- Fix libsmbclient DFS referral handling.
+  + Reuse connections derived from DFS referrals; (bso#10123); (fate#316512).
+
 -------------------------------------------------------------------
 Tue Jan 13 13:28:31 UTC 2015 - mpluskal@suse.com
 
diff --git a/samba.spec b/samba.spec
index 71a9e95..abc0e18 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,7 +146,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3346
+%define SOURCE_TIMESTAMP 3348
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index df939de..13888f4 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:866a645731f364b4ebde5efeadd60801850b306abd4a5570cbabef29f33cb2d3
-size 54529
+oid sha256:0fc027bc506bd4b26808915c6f03df460b092927fca0871e15401112099c500c
+size 54572

From 5d0ce19b3a863bf0f7d5411f7aa97089b26d0e674f996f35557c6e443a7d303e Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.com>
Date: Thu, 22 Jan 2015 12:23:30 +0000
Subject: [PATCH 2/4] Set domain/workgroup based on authentication callback
 value; (bso#11059).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=449
---
 patches.tar.bz2      | 4 ++--
 samba.changes        | 1 +
 samba.spec           | 2 +-
 vendor-files.tar.bz2 | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 036b89f..ac41957 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cee66a97e797af2bd0969bf63251e5a639b1db2762ca2f13ed6ee420fa2501c1
-size 330950
+oid sha256:c224c39b61a0e74c3032e4a6c7aa89bedd61608e1607a0509586ab9dc552f0b0
+size 332059
diff --git a/samba.changes b/samba.changes
index e09106b..1c3a68d 100644
--- a/samba.changes
+++ b/samba.changes
@@ -3,6 +3,7 @@ Mon Jan 19 17:15:19 UTC 2015 - ddiss@suse.com
 
 - Fix libsmbclient DFS referral handling.
   + Reuse connections derived from DFS referrals; (bso#10123); (fate#316512).
+  + Set domain/workgroup based on authentication callback value; (bso#11059).
 
 -------------------------------------------------------------------
 Tue Jan 13 13:28:31 UTC 2015 - mpluskal@suse.com
diff --git a/samba.spec b/samba.spec
index abc0e18..9de439e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,7 +146,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3348
+%define SOURCE_TIMESTAMP 3355
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 13888f4..f2664f5 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:0fc027bc506bd4b26808915c6f03df460b092927fca0871e15401112099c500c
-size 54572
+oid sha256:a032cb1e5c1eb4aa1875d43e360074e009c9c20a54a6f7ca02f81d7b4e27ec69
+size 54271

From 5bfbe1678b2b41d8e94300e8b0e8ef8895c24b7a5089b96562a7e353a3bd81d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Thu, 22 Jan 2015 13:05:59 +0000
Subject: [PATCH 3/4] - Update to 4.1.16.   + dsdb-samldb: Check for extended
 access rights before we allow changes to     userAccountControl; (bso#10993);
 CVE-2014-8143; (boo#914279).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=450
---
 patches.tar.bz2      | 4 ++--
 samba-4.1.15.tar.asc | 7 -------
 samba-4.1.15.tar.gz  | 3 ---
 samba-4.1.16.tar.asc | 7 +++++++
 samba-4.1.16.tar.gz  | 3 +++
 samba.changes        | 7 +++++++
 samba.spec           | 6 +++---
 vendor-files.tar.bz2 | 4 ++--
 8 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 samba-4.1.15.tar.asc
 delete mode 100644 samba-4.1.15.tar.gz
 create mode 100644 samba-4.1.16.tar.asc
 create mode 100644 samba-4.1.16.tar.gz

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index ac41957..e552247 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c224c39b61a0e74c3032e4a6c7aa89bedd61608e1607a0509586ab9dc552f0b0
-size 332059
+oid sha256:0b7e0333e808cb28217579f5b08b4693f509db65ba588f17ed4cfbe174d7bc92
+size 331991
diff --git a/samba-4.1.15.tar.asc b/samba-4.1.15.tar.asc
deleted file mode 100644
index 836ec35..0000000
--- a/samba-4.1.15.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlSze44ACgkQbzORW2Vot+puPQCePxfVfx8zsExKxh3CFg1t2s7Z
-Ls4AnirSogO7nhbk2ixYeRzYa6k7k8go
-=p+KL
------END PGP SIGNATURE-----
diff --git a/samba-4.1.15.tar.gz b/samba-4.1.15.tar.gz
deleted file mode 100644
index b0b5383..0000000
--- a/samba-4.1.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d84112124512428ddc9cc0d9975524bab730b9a598a9ff90458666afb3f42f4
-size 19530544
diff --git a/samba-4.1.16.tar.asc b/samba-4.1.16.tar.asc
new file mode 100644
index 0000000..92266ad
--- /dev/null
+++ b/samba-4.1.16.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlS0Me8ACgkQbzORW2Vot+rNSwCeIcyXGjSZbZbIQF1nD2GSnFzp
+KeIAniilFAaGNlBrpIhewZImFLcvZLWm
+=ICvU
+-----END PGP SIGNATURE-----
diff --git a/samba-4.1.16.tar.gz b/samba-4.1.16.tar.gz
new file mode 100644
index 0000000..973366e
--- /dev/null
+++ b/samba-4.1.16.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12a09c167bfa25f50b82775bcbeda94c71c5d71d3b0d1210f6dae0f23020a87b
+size 19534236
diff --git a/samba.changes b/samba.changes
index 1c3a68d..59f5379 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 22 12:40:18 UTC 2015 - lmuelle@suse.com
+
+- Update to 4.1.16.
+  + dsdb-samldb: Check for extended access rights before we allow changes to
+    userAccountControl; (bso#10993); CVE-2014-8143; (boo#914279).
+
 -------------------------------------------------------------------
 Mon Jan 19 17:15:19 UTC 2015 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 9de439e..a49136c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -122,7 +122,7 @@ BuildRequires:  libavahi-devel
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
-%define	samba_ver 4.1.15
+%define	samba_ver 4.1.16
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -146,11 +146,11 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3355
+%define SOURCE_TIMESTAMP 3356
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.1.15
+Version:        4.1.16
 Release:        0
 Url:            http://www.samba.org/
 Provides:       samba-gplv3 = %{version}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index f2664f5..68f0549 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:a032cb1e5c1eb4aa1875d43e360074e009c9c20a54a6f7ca02f81d7b4e27ec69
-size 54271
+oid sha256:9aaaceafcf209c560f8ad7479b96f6bd6a03816fb508c8b08dfd6af56aab38c9
+size 54526

From b53d44ec93759391ed6451c4e67382e4512e59173cd8e864ca4d9b4e60a03531 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.com>
Date: Thu, 22 Jan 2015 15:57:46 +0000
Subject: [PATCH 4/4] - Fix vfs_snapper DBus string handling; (bso#11055);
 (bnc#913238).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=451
---
 patches.tar.bz2      | 4 ++--
 samba.changes        | 5 +++++
 samba.spec           | 2 +-
 vendor-files.tar.bz2 | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index e552247..f5a2ad9 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b7e0333e808cb28217579f5b08b4693f509db65ba588f17ed4cfbe174d7bc92
-size 331991
+oid sha256:ecebfac71eff40a893f12f8667e995995efd087d005051141bb7370e5b8d12c6
+size 335649
diff --git a/samba.changes b/samba.changes
index 59f5379..59cc9f9 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 22 14:03:52 UTC 2015 - ddiss@suse.com
+
+- Fix vfs_snapper DBus string handling; (bso#11055); (bnc#913238).
+
 -------------------------------------------------------------------
 Thu Jan 22 12:40:18 UTC 2015 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index a49136c..ce427f7 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,7 +146,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3356
+%define SOURCE_TIMESTAMP 3357
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 68f0549..737d724 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:9aaaceafcf209c560f8ad7479b96f6bd6a03816fb508c8b08dfd6af56aab38c9
-size 54526
+oid sha256:21fe60031951e7a0b823780c1d0c41ca8bf3867d6d736f0f2ad1c7c62a25e187
+size 54211