- Fix CVE-2017-7494 remote code execution from a writable share;

(bso#12780); (bsc#1038231).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=561

samba.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package samba
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -26,7 +26,7 @@
 %define         build_ceph 1
 %endif
 %endif
-%define		vendor_files_git_vers git.9d8643a
+%define		vendor_files_git_vers git.b446743
 
 Name:           samba
 BuildRequires:  autoconf
@@ -104,12 +104,12 @@ BuildRequires:  fdupes
 %endif
 BuildRequires:  %{pkgconfig_req}
 BuildRequires:  libldb-devel
-BuildRequires:  python-ldb-devel
 BuildRequires:  libtalloc-devel
-BuildRequires:  python-talloc-devel
 BuildRequires:  libtdb-devel
-BuildRequires:  python-tdb
 BuildRequires:  libtevent-devel
+BuildRequires:  python-ldb-devel
+BuildRequires:  python-talloc-devel
+BuildRequires:  python-tdb
 BuildRequires:  python-tevent
 # to generate the man pages
 BuildRequires:  docbook-xsl-stylesheets
@@ -147,11 +147,11 @@ BuildRequires:  librados-devel
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.6.3+git.21.0735c828d4f
+Version:        4.6.3+git.25.0c154becb13
 Release:        0
 Url:            https://www.samba.org/
-Obsoletes:      samba-gplv3 < %{version}
 Obsoletes:      samba-32bit < %{version}
+Obsoletes:      samba-gplv3 < %{version}
 %if 0%{?suse_version} > 1030
 Recommends:     cron
 Recommends:     logrotate
@@ -250,8 +250,8 @@ Summary:        Samba Client Utilities
 License:        GPL-3.0+
 Group:          Productivity/Networking/Samba
 Provides:       smbfs
-Obsoletes:      samba-gplv3-client < %{version}
 Obsoletes:      samba-client-gplv2 < %{version}
+Obsoletes:      samba-gplv3-client < %{version}
 %if 0%{?suse_version} < 1221
 Requires:       %{?insserv_prereq}
 Requires:       /sbin/chkconfig
@@ -296,7 +296,6 @@ Source Timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}
 %endif
 
-
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
 
 %package doc
@@ -305,8 +304,8 @@ License:        GPL-3.0+
 Group:          Documentation/Other
 Requires:       coreutils
 Requires:       findutils
-Obsoletes:      samba-gplv3-doc < %{version}
 Obsoletes:      samba-doc-gplv2 < %{version}
+Obsoletes:      samba-gplv3-doc < %{version}
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
@@ -325,8 +324,8 @@ Branch:         %{BRANCH}
 Summary:        Samba libraries
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
-Requires:       krb5
 Requires:       /sbin/ldconfig
+Requires:       krb5
 %if 0%{?suse_version} > 1210 &&  0%{?suse_version} < 1315
 Requires:       libfam0-gamin
 %endif
@@ -379,9 +378,9 @@ Branch:         %{BRANCH}
 Summary:        Testing tools for Samba servers and clients
 License:        GPL-3.0+
 Group:          Applications/System
+Requires:       /sbin/ldconfig
 Requires:       samba = %{version}
 Requires:       samba-winbind = %{version}
-Requires:       /sbin/ldconfig
 
 %description test
 samba-test provides testing tools for both the server and client
@@ -463,7 +462,6 @@ clients to view and capture detailed real-time performance metrics for
 one or more cluster nodes.
 %endif
 
-
 %package -n ctdb-tests
 Summary:        CTDB clustered database test suite
 License:        GPL-3.0+
@@ -1038,7 +1036,6 @@ distributed file system. A Ceph CTDB lock helper binary is included so
 that RADOS locks can be used for CTDB split-brain avoidance.
 %endif
 
-
 %prep
 %setup -n samba-%{version} -q
 # vendor-files (config, scripts, tools)
@@ -2206,7 +2203,6 @@ fi
 %dir %{_datadir}/ctdb
 %{_datadir}/ctdb/tests
 
-
 %files -n libdcerpc-binding0
 %defattr(-,root,root)
 %_libdir/libdcerpc-binding.so.0*