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
This commit is contained in:
2017-03-24 13:30:38 +00:00
committed by Git OBS Bridge
parent b71b411b66
commit 8c1ef5b501
3 changed files with 6 additions and 7 deletions

View File

@@ -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} \