From 9c52287cf9c91f8508460b470750ea7e72dc92eae95062029a518777a8cd2d16 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.com>
Date: Wed, 30 Jul 2014 12:35:13 +0000
Subject: [PATCH 1/5] - Fix "net time" segfault; (bso#10728); (bnc#889539).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=423
---
 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 65df9c5..da89d17 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76c9513a13add84281371545dd86fa3d3f1694d18eb3c2ba92ebc20773f77f68
-size 278706
+oid sha256:14ef314677f005f6ed1a83adc8a405ae4044a19c05417677a2d7847a0728fb93
+size 278668
diff --git a/samba.changes b/samba.changes
index 1ca91e8..71d766f 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 30 11:39:30 UTC 2014 - ddiss@suse.com
+
+- Fix "net time" segfault; (bso#10728); (bnc#889539).
+
 -------------------------------------------------------------------
 Mon Jul 28 10:12:04 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 67b358e..80807b3 100644
--- a/samba.spec
+++ b/samba.spec
@@ -148,7 +148,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3266
+%define SOURCE_TIMESTAMP 3267
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index ca91eb1..9550a30 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:e5a4080e7b16e5fa906252ef1755c3c383991c48cf29f539799b1eca4385ceb7
-size 54622
+oid sha256:5ef45c18f8f2dab306efde74d13930eee70a5644960e20e6abfaf28b5ceaafdc
+size 54506

From f5d33ada5f0bb02aa44c2ff435d34667f1a460f9c7eb4e212f2a91da23a990c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 1 Aug 2014 12:28:26 +0000
Subject: [PATCH 2/5] - Update to 4.1.11.   + A malicious browser can send
 packets that may overwrite the heap of the     target nmbd NetBIOS name
 services daemon; CVE-2014-3560; (bnc#889429).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=424
---
 patches.tar.bz2      | 4 ++--
 samba-4.1.10.tar.asc | 7 -------
 samba-4.1.10.tar.gz  | 3 ---
 samba-4.1.11.tar.asc | 7 +++++++
 samba-4.1.11.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.10.tar.asc
 delete mode 100644 samba-4.1.10.tar.gz
 create mode 100644 samba-4.1.11.tar.asc
 create mode 100644 samba-4.1.11.tar.gz

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index da89d17..00ffd87 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14ef314677f005f6ed1a83adc8a405ae4044a19c05417677a2d7847a0728fb93
-size 278668
+oid sha256:e05fcc4a1749f69915bc8680fd81d7c8ae80a372a32ff8426840c669d5bbf987
+size 279873
diff --git a/samba-4.1.10.tar.asc b/samba-4.1.10.tar.asc
deleted file mode 100644
index 9f1f5c5..0000000
--- a/samba-4.1.10.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlPV/M8ACgkQbzORW2Vot+pvVACfem/PeNo4Fwa6RsD4PC8Pe+n9
-yloAnRAeBmfMocFwM5WC09FPmbTcCsyX
-=eM9N
------END PGP SIGNATURE-----
diff --git a/samba-4.1.10.tar.gz b/samba-4.1.10.tar.gz
deleted file mode 100644
index 6788434..0000000
--- a/samba-4.1.10.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3404f0004f6ed20be7de38aae05e46c7828c53437ae4c015567aeff2988f8675
-size 19510997
diff --git a/samba-4.1.11.tar.asc b/samba-4.1.11.tar.asc
new file mode 100644
index 0000000..f188b61
--- /dev/null
+++ b/samba-4.1.11.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlPaPr0ACgkQbzORW2Vot+pTpgCgonGsTFo5cw+4C2nIbhkrxG0s
+CwMAoLrNdPvJQy33Bs5KNtg0M7YVILdI
+=6InX
+-----END PGP SIGNATURE-----
diff --git a/samba-4.1.11.tar.gz b/samba-4.1.11.tar.gz
new file mode 100644
index 0000000..ad86515
--- /dev/null
+++ b/samba-4.1.11.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:565e663a28eb785e00b0df3086319bb0b328ed2b1b8765c3d962757d3897ecfe
+size 19510128
diff --git a/samba.changes b/samba.changes
index 71d766f..11e0b6d 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug  1 13:42:19 UTC 2014 - lmuelle@suse.com
+
+- Update to 4.1.11.
+  + A malicious browser can send packets that may overwrite the heap of the
+    target nmbd NetBIOS name services daemon; CVE-2014-3560; (bnc#889429).
+
 -------------------------------------------------------------------
 Wed Jul 30 11:39:30 UTC 2014 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 80807b3..1a3f962 100644
--- a/samba.spec
+++ b/samba.spec
@@ -121,7 +121,7 @@ BuildRequires:  gpg-offline
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
-%define	samba_ver 4.1.10
+%define	samba_ver 4.1.11
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -148,11 +148,11 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3267
+%define SOURCE_TIMESTAMP 3270
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.1.10
+Version:        4.1.11
 Release:        0
 Url:            http://www.samba.org/
 Provides:       samba-gplv3 = %{version}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 9550a30..4c90cae 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:5ef45c18f8f2dab306efde74d13930eee70a5644960e20e6abfaf28b5ceaafdc
-size 54506
+oid sha256:d6bfd1070ef0a8b8638b1dc3c134ffd073efb5097ee8f50a37e98c116d512ba6
+size 54721

From 2d2bbac97970898760bc35c894b5525ae38a5923814138add85e7ff686ed64e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 1 Aug 2014 16:22:06 +0000
Subject: [PATCH 3/5] lib/param: change the default for "winbind expand groups"
 to "0".

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=425
---
 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 00ffd87..563379e 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e05fcc4a1749f69915bc8680fd81d7c8ae80a372a32ff8426840c669d5bbf987
-size 279873
+oid sha256:a7f9eaf1d47b67309c1fa309e931ce3583475c0cb8de8c14b3ffa5d840724375
+size 280987
diff --git a/samba.changes b/samba.changes
index 11e0b6d..fa17a75 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug  1 13:47:57 UTC 2014 - lmuelle@suse.com
+
+- lib/param: change the default for "winbind expand groups" to "0".
+
 -------------------------------------------------------------------
 Fri Aug  1 13:42:19 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 1a3f962..c8825b5 100644
--- a/samba.spec
+++ b/samba.spec
@@ -148,7 +148,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3270
+%define SOURCE_TIMESTAMP 3271
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 4c90cae..e74ea26 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:d6bfd1070ef0a8b8638b1dc3c134ffd073efb5097ee8f50a37e98c116d512ba6
-size 54721
+oid sha256:44a5bd1078f35a2075f53f1a7bdd7467fab9c504a34e3c307e297f6481aaace6
+size 54686

From 013b88368dde2fdb403be7337acc0b81abcf13e0d992477b3b1cfa06f9026e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 1 Aug 2014 16:38:52 +0000
Subject: [PATCH 4/5] - Fix winbind service parameter usage; (bnc#890005). -
 lib/param: change the default for "winbind expand groups" to "0";  
 (bnc#890008).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=426
---
 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 563379e..64a0484 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7f9eaf1d47b67309c1fa309e931ce3583475c0cb8de8c14b3ffa5d840724375
-size 280987
+oid sha256:e32d426a71644dce9e1d7fede7679c7621701f7b77976185555b58e180d73a36
+size 281055
diff --git a/samba.changes b/samba.changes
index fa17a75..83c30ee 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,7 +1,13 @@
+-------------------------------------------------------------------
+Fri Aug  1 16:34:44 UTC 2014 - ddiss@suse.com
+
+- Fix winbind service parameter usage; (bnc#890005).
+
 -------------------------------------------------------------------
 Fri Aug  1 13:47:57 UTC 2014 - lmuelle@suse.com
 
-- lib/param: change the default for "winbind expand groups" to "0".
+- lib/param: change the default for "winbind expand groups" to "0";
+  (bnc#890008).
 
 -------------------------------------------------------------------
 Fri Aug  1 13:42:19 UTC 2014 - lmuelle@suse.com
diff --git a/samba.spec b/samba.spec
index c8825b5..5579218 100644
--- a/samba.spec
+++ b/samba.spec
@@ -148,7 +148,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3271
+%define SOURCE_TIMESTAMP 3273
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index e74ea26..effd2e9 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:44a5bd1078f35a2075f53f1a7bdd7467fab9c504a34e3c307e297f6481aaace6
-size 54686
+oid sha256:55964e62954fd531287eb933af007dcb495b38c04642178b15ccb29005caf6a1
+size 54651

From 7745ce7da0613dac9c7e9bb70248c39eb2b1215be6955b1e7d7b2426080b1de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 1 Aug 2014 19:13:15 +0000
Subject: [PATCH 5/5] - Remove man page patch as we genererate the man pages
 from the xml input. - Add the missing bnc reference in the series file too.

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 64a0484..a431ccc 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e32d426a71644dce9e1d7fede7679c7621701f7b77976185555b58e180d73a36
-size 281055
+oid sha256:b1d7aef655bfcf783d078f8dc200c676a435dc91f54b96f519cd61745d141908
+size 280856
diff --git a/samba.spec b/samba.spec
index 5579218..c6a50b8 100644
--- a/samba.spec
+++ b/samba.spec
@@ -148,7 +148,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3273
+%define SOURCE_TIMESTAMP 3274
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index effd2e9..b83577b 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:55964e62954fd531287eb933af007dcb495b38c04642178b15ccb29005caf6a1
-size 54651
+oid sha256:07e26efe1f46b9dd9cd561516465f7b79f85f07589d709f647c740cd58dfd0a1
+size 54734