--- samba.spec.jpp 2018-05-08 18:38:40.163337265 +0200 +++ samba.spec 2018-05-08 19:55:32.890704457 +0200 @@ -6,7 +6,7 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 12 +%define main_release 12.2 %define samba_version 4.6.2 %define talloc_version 2.1.9 @@ -32,7 +32,7 @@ %global with_internal_talloc 0 %global with_internal_tevent 0 %global with_internal_tdb 0 -%global with_internal_ldb 0 +%global with_internal_ldb 1 %global with_profiling 1 @@ -56,8 +56,8 @@ %global libwbc_alternatives_suffix -64 %endif -%global with_mitkrb5 1 -%global with_dc 0 +%global with_mitkrb5 0 +%global with_dc 1 %if %{with testsuite} # The testsuite only works with a full build right now. @@ -212,7 +212,7 @@ BuildRequires: libcephfs1-devel %endif %if %{with_dc} -BuildRequires: gnutls-devel >= 3.4.7 +BuildRequires: gnutls-devel # Required by samba-tool to run tests BuildRequires: python-crypto %endif @@ -395,6 +395,7 @@ %package vfs-cephfs Summary: Samba VFS module for Ceph distributed storage system Requires: libcephfs1 +Requires: libldb Requires: %{name} = %{samba_depver} Requires: %{name}-libs = %{samba_depver} @@ -499,7 +500,7 @@ Requires: %{name}-libs = %{samba_depver} Requires: python-tevent Requires: python-tdb -Requires: pyldb +#Requires: pyldb Requires: pytalloc Provides: samba4-python = %{samba_depver} @@ -868,8 +869,8 @@ %endif install -d -m 0755 %{buildroot}%{_unitdir} -for i in nmb smb winbind ; do - cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba@g' >tmp$i.service +for i in nmb smb winbind samba; do + cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service done %if %with_clustering_support @@ -1483,6 +1484,7 @@ %{_libdir}/samba/ldb/password_hash.so %{_libdir}/samba/ldb/ranged_results.so %{_libdir}/samba/ldb/repl_meta_data.so +%{_unitdir}/samba.service %{_libdir}/samba/ldb/resolve_oids.so %{_libdir}/samba/ldb/rootdse.so %{_libdir}/samba/ldb/samba3sam.so @@ -2654,6 +2656,10 @@ %endif # with_clustering_support %changelog +* Tue May 08 2018 Jean-Philipe Pialasse - 4.6.2-12.2.sme +- import 4.6.2-12 [SME: 10429] +- import to SME the two last upstream releases [SME: 10326] + * Fri Nov 17 2017 Andreas Schneider - 4.6.2-12 - resolves: #1514314 - Fix CVE-2017-14746 and CVE-2017-15275