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] - 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