From 3814a3b1b1f978316e5b5121fa971807bf06b013bbfad9fae891574ecbe5781c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 21 Feb 2014 14:30:23 +0000
Subject: [PATCH] - Update to 4.1.5.   + Fix 100% CPU utilization in winbindd
 when trying to free memory in     winbindd_reinit_after_fork; (bso#10358);
 (bnc#786677).   + smbd: Fix memory overwrites; (bso#10415).

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 8163937..95b16f0 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:307f0dd91a559973b13a14bfd56ed740f8f4bf3a4d425ef3ff36a77f21fb50b9
-size 158227
+oid sha256:1882b53540b5bcae8b8746b793a9db04b6767932c53e1145c8b9e4afdd397a06
+size 128899
diff --git a/samba-4.1.4.tar.asc b/samba-4.1.4.tar.asc
deleted file mode 100644
index 023ee1b..0000000
--- a/samba-4.1.4.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iD8DBQBSz6uYbzORW2Vot+oRAgdAAJ9n0GQ8ZwsizWM6CIr5lmJXxo7zpwCfTMpg
-1eF2oc0zDz1/27DkBouoLvk=
-=tpG3
------END PGP SIGNATURE-----
diff --git a/samba-4.1.4.tar.gz b/samba-4.1.4.tar.gz
deleted file mode 100644
index 74f78a1..0000000
--- a/samba-4.1.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7
-size 23169480
diff --git a/samba-4.1.5.tar.asc b/samba-4.1.5.tar.asc
new file mode 100644
index 0000000..6aa442c
--- /dev/null
+++ b/samba-4.1.5.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAlMHHEcACgkQbzORW2Vot+pNiwCePohuvj4WvbYp0AmHW7HXkTD0
+ExgAn0Qq3LcJ2KBjX+s8gHk23yGtWA27
+=K+he
+-----END PGP SIGNATURE-----
diff --git a/samba-4.1.5.tar.gz b/samba-4.1.5.tar.gz
new file mode 100644
index 0000000..e149019
--- /dev/null
+++ b/samba-4.1.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d98c1554d6f857053557ff024c243df5d15dd9ca436d5804be4b0546ede94cc8
+size 23177512
diff --git a/samba.changes b/samba.changes
index 3142c61..13f8a90 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Feb 21 13:16:01 UTC 2014 - lmuelle@suse.com
+
+- Update to 4.1.5.
+  + Fix 100% CPU utilization in winbindd when trying to free memory in
+    winbindd_reinit_after_fork; (bso#10358); (bnc#786677).
+  + smbd: Fix memory overwrites; (bso#10415).
+
+  + s3-winbind: Improve performance of wb_fill_pwent_sid2uid_done();
+    (bso#2191).
+  + ntlm_auth sometimes returns the wrong username to mod_ntlm_auth_winbind;
+    (bso#10087).
+  + s3: smbpasswd: Fix crashes on invalid input; (bso#10320).
+  + s3: vfs_dirsort module: Allow dirsort to work when multiple simultaneous
+    directories are open; (bso#10406).
+  + Add support for Heimdal's unified krb5 and hdb plugin system, cope with
+    first element in hdb_method having a different name in different heimdal
+    versions and fix INTERNAL ERROR: Signal 11 in the kdc pid; (bso#10418).
+  + vfs_btrfs: Fix incorrect zero length server-side copy request handling;
+    (bso#10424).
+  + s3: modules: streaminfo: As we have no VFS function SMB_VFS_LLISTXATTR we
+    can't cope with a symlink when lp_posix_pathnames() is true; (bso#10429).
+  + smbd: Fix an ancient oplock bug; (bso#10436).
+  + Fix crash bug in smb2_notify code; (bso#10442).
+
 -------------------------------------------------------------------
 Tue Feb 18 13:04:37 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 8d818ba..a1bde09 100644
--- a/samba.spec
+++ b/samba.spec
@@ -114,7 +114,7 @@ BuildRequires:  dbus-1-devel
 BuildRequires:  gpg-offline
 BuildRequires:  systemd
 %endif
-%define	samba_ver 4.1.4
+%define	samba_ver 4.1.5
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -141,12 +141,12 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3183
+%define SOURCE_TIMESTAMP 3184
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
 %global with_get_printing_ticket 0
-Version:        4.1.4
+Version:        4.1.5
 Release:        0
 License:        GPL-3.0+
 Url:            http://www.samba.org/
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index b869703..f35fc8b 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:e727372c473d1a0cc0b6ca1afe1e5c8f3c4f9719cf38379bc13be12b75fd2156
-size 54202
+oid sha256:9d40cb312753d439c8a0506a1d27b820a619902086acd3a24181bcaf34784f73
+size 54143