From a5cd1e3ae67110a82546ee800c2342bc3416963b84252559ebf0799c06f1ca64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Mon, 23 Jun 2014 12:48:18 +0000
Subject: [PATCH] - Update to 4.1.9.   + Fix nmbd denial of service;
 CVE-2014-0244; (bnc#880962).   + Fix segmentation fault in
 smbd_marshall_dir_entry()'s SMB_FIND_FILE_UNIX     handler; CVE-2014-3493;
 (bnc#883758).

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 79bc862..714290d 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d25328e8460eca493aad9cad75fa033158486a5d070807f26d670cae260232dc
-size 282593
+oid sha256:6f038746898bb8f43d8865e11a324a155ce551f5d13dbe2e24c8b83f2c5a1fa8
+size 278105
diff --git a/samba-4.1.8.tar.asc b/samba-4.1.8.tar.asc
deleted file mode 100644
index 257d79a..0000000
--- a/samba-4.1.8.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iEYEABECAAYFAlONgkMACgkQbzORW2Vot+pQ7ACdG+378JopxjU9HHXt2JMiJtxk
-pdAAoIuhY45NHY8CYi3B9lSZlye5gvT4
-=2p39
------END PGP SIGNATURE-----
diff --git a/samba-4.1.8.tar.gz b/samba-4.1.8.tar.gz
deleted file mode 100644
index d4b30d4..0000000
--- a/samba-4.1.8.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f39757e629f1e866bf402da2fe08fe577b4bb71b0f4d60ca9a61e60ad81c715
-size 23192555
diff --git a/samba-4.1.9.tar.asc b/samba-4.1.9.tar.asc
new file mode 100644
index 0000000..84097c6
--- /dev/null
+++ b/samba-4.1.9.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlOm7C4ACgkQbzORW2Vot+qCIACfVBTpL0QAePV3/tI+zym4xiL6
+qrYAn36Evj5j6iz2bYb3oo/W/Eo6hi8d
+=jGMq
+-----END PGP SIGNATURE-----
diff --git a/samba-4.1.9.tar.gz b/samba-4.1.9.tar.gz
new file mode 100644
index 0000000..e6bfe91
--- /dev/null
+++ b/samba-4.1.9.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1484542db4b462bc562541412a061ad03a0e8af7199a916d74b063dd1881c6bd
+size 23192788
diff --git a/samba.changes b/samba.changes
index bfce611..7b71fa6 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 23 09:43:53 UTC 2014 - lmuelle@suse.com
+
+- Update to 4.1.9.
+  + Fix nmbd denial of service; CVE-2014-0244; (bnc#880962).
+  + Fix segmentation fault in smbd_marshall_dir_entry()'s SMB_FIND_FILE_UNIX
+    handler; CVE-2014-3493; (bnc#883758).
+
 -------------------------------------------------------------------
 Thu Jun 12 18:09:44 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index fca14ea..3c3b5ed 100644
--- a/samba.spec
+++ b/samba.spec
@@ -119,7 +119,7 @@ BuildRequires:  dbus-1-devel
 BuildRequires:  gpg-offline
 BuildRequires:  systemd
 %endif
-%define	samba_ver 4.1.8
+%define	samba_ver 4.1.9
 %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
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3254
+%define SOURCE_TIMESTAMP 3256
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.1.8
+Version:        4.1.9
 Release:        0
 License:        GPL-3.0+
 Url:            http://www.samba.org/
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 239dd54..27a2e8b 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:e5251bd67074899b948c1216815286e77b9717fda3e1406ad083ad59d37e3eac
-size 54874
+oid sha256:90c740f94c570c3d90f56d08e3510a52f0988df0ea877888846b5bf364f3b5d2
+size 54695