From ea4075d3006c0bf5a0b65fa3e44dcb7a47a4fbf86913716f2484b9cda90241a1 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.com>
Date: Thu, 22 May 2014 16:00:31 +0000
Subject: [PATCH 1/2] - Fix printer job purging; (bso#10612); (bnc#879390).

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index cb9357a..b979c11 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:438657e46dffa748713b79e7475fe3f7e475e31941fbedebc8173ca8677a8bb8
-size 279095
+oid sha256:0c03b53b580324a9af666250f9f263482a72b4860e9e954fe372ea2ff2a0d0ff
+size 280320
diff --git a/samba.changes b/samba.changes
index ee790f3..6c26d69 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 22 13:08:13 UTC 2014 - ddiss@suse.com
+
+- Fix printer job purging; (bso#10612); (bnc#879390).
+
 -------------------------------------------------------------------
 Sun May 18 12:07:03 UTC 2014 - lmuelle@suse.com
 
@@ -95,7 +100,8 @@ Fri Apr 11 12:21:48 UTC 2014 - lmuelle@suse.com
 -------------------------------------------------------------------
 Fri Apr 11 12:09:23 UTC 2014 - ddiss@suse.com
 
-- Fix malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; (bnc#872396).
+- Fix malformed FSCTL_SRV_ENUMERATE_SNAPSHOTS response; CVE-2014-0178;
+  (bso#10549); (bnc#872396).
 
 -------------------------------------------------------------------
 Fri Apr 11 11:50:08 UTC 2014 - nopower@suse.de
diff --git a/samba.spec b/samba.spec
index 9e9b034..666716e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3238
+%define SOURCE_TIMESTAMP 3240
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index b330a05..8c285f9 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:12fb831da686f015503c21f476435401f080390d3e0ed61baa7f78b41588bb07
-size 54674
+oid sha256:c0735100535d31ed817510ba54923129f0180e1d208c8f09615220e1038ed6d3
+size 54410

From b4f19102aa370f45f441af30f97db7128f0207676aa64daf8a1e428cd977d238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 23 May 2014 11:53:37 +0000
Subject: [PATCH 2/2] examples/libsmbclient: avoid some compiler warnings;
 (bso#10624).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=412
---
 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 b979c11..ae404df 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c03b53b580324a9af666250f9f263482a72b4860e9e954fe372ea2ff2a0d0ff
-size 280320
+oid sha256:027e048d6802818bb0e695acc1da3b9124c8fb05431f69bf2d1d68deafc7cf4a
+size 288101
diff --git a/samba.changes b/samba.changes
index 6c26d69..d65cac0 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 23 10:41:11 UTC 2014 - lmuelle@suse.com
+
+- examples/libsmbclient: avoid some compiler warnings; (bso#10624).
+
 -------------------------------------------------------------------
 Thu May 22 13:08:13 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 666716e..6bc7e61 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3240
+%define SOURCE_TIMESTAMP 3243
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 8c285f9..29d34fe 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:c0735100535d31ed817510ba54923129f0180e1d208c8f09615220e1038ed6d3
-size 54410
+oid sha256:4e717beae1b5c7ae669daa7fcacea183b98020eed7cd32c4830714ce06465cd2
+size 54847