From 8c1ef5b50157672c5d1d569ca952ea4e6f18c8f0fc7668ad91885e749395d83c Mon Sep 17 00:00:00 2001
From: James McDonough <jmcdonough@suse.com>
Date: Fri, 24 Mar 2017 13:30:38 +0000
Subject: [PATCH] Accepting request 482503 from home:jmcdough:updateto46

Update to 4.6.1 for CVE-2017-2619 + fix build for platforms without cmocka

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 56c2690..22c877e 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7419a6feec208a90c8d35c6c7004c57932988f1b7487ada100680a3efbd1f325
-size 41563
+oid sha256:00c6fb67a6db9804131871bbd4082c51a5339de38e10e94b4422776357ff08b9
+size 41584
diff --git a/samba.spec b/samba.spec
index 8e7407e..ac808fd 100644
--- a/samba.spec
+++ b/samba.spec
@@ -34,7 +34,6 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  patch
-BuildRequires:  libcmocka-devel
 %if 0%{?suse_version} > 1300
 BuildRequires:  libarchive-devel
 %endif
@@ -151,7 +150,7 @@ BuildRequires:  libcephfs-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3755
+%define SOURCE_TIMESTAMP 3756
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1146,7 +1145,7 @@ CONFIGURE_OPTIONS="\
 %if ! %with_dc
 	--without-ad-dc \
 %endif
-	--bundled-libraries=NONE,socket_wrapper,${bundled_libraries_extra} \
+	--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
 "
 ./configure ${CONFIGURE_OPTIONS}
 make %{build_make_smp_mflags} \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 99242bf..845398c 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:5b89409086ecb36365e9a8abfe769cdffce75760e81b1c1b842669ad7bf56113
-size 55759
+oid sha256:6e7852847a61f4d70b8859d08b609ca260b2376d718ee90ee78c3f186744e39a
+size 55777