| 1 |
--- samba.spec.jpp 2018-05-08 18:38:40.163337265 +0200 |
| 2 |
+++ samba.spec 2018-05-08 20:23:54.682747298 +0200 |
| 3 |
@@ -6,7 +6,7 @@ |
| 4 |
# ctdb is enabled by default, you can disable it with: --without clustering |
| 5 |
%bcond_without clustering |
| 6 |
|
| 7 |
-%define main_release 12 |
| 8 |
+%define main_release 12.3 |
| 9 |
|
| 10 |
%define samba_version 4.6.2 |
| 11 |
%define talloc_version 2.1.9 |
| 12 |
@@ -32,7 +32,7 @@ |
| 13 |
%global with_internal_talloc 0 |
| 14 |
%global with_internal_tevent 0 |
| 15 |
%global with_internal_tdb 0 |
| 16 |
-%global with_internal_ldb 0 |
| 17 |
+%global with_internal_ldb 1 |
| 18 |
|
| 19 |
%global with_profiling 1 |
| 20 |
|
| 21 |
@@ -56,8 +56,8 @@ |
| 22 |
%global libwbc_alternatives_suffix -64 |
| 23 |
%endif |
| 24 |
|
| 25 |
-%global with_mitkrb5 1 |
| 26 |
-%global with_dc 0 |
| 27 |
+%global with_mitkrb5 0 |
| 28 |
+%global with_dc 1 |
| 29 |
|
| 30 |
%if %{with testsuite} |
| 31 |
# The testsuite only works with a full build right now. |
| 32 |
@@ -212,7 +212,7 @@ |
| 33 |
BuildRequires: libcephfs1-devel |
| 34 |
%endif |
| 35 |
%if %{with_dc} |
| 36 |
-BuildRequires: gnutls-devel >= 3.4.7 |
| 37 |
+BuildRequires: gnutls-devel |
| 38 |
# Required by samba-tool to run tests |
| 39 |
BuildRequires: python-crypto |
| 40 |
%endif |
| 41 |
@@ -395,6 +395,7 @@ |
| 42 |
%package vfs-cephfs |
| 43 |
Summary: Samba VFS module for Ceph distributed storage system |
| 44 |
Requires: libcephfs1 |
| 45 |
+Requires: libldb |
| 46 |
Requires: %{name} = %{samba_depver} |
| 47 |
Requires: %{name}-libs = %{samba_depver} |
| 48 |
|
| 49 |
@@ -499,7 +500,7 @@ |
| 50 |
Requires: %{name}-libs = %{samba_depver} |
| 51 |
Requires: python-tevent |
| 52 |
Requires: python-tdb |
| 53 |
-Requires: pyldb |
| 54 |
+#Requires: pyldb |
| 55 |
Requires: pytalloc |
| 56 |
|
| 57 |
Provides: samba4-python = %{samba_depver} |
| 58 |
@@ -868,8 +869,8 @@ |
| 59 |
%endif |
| 60 |
|
| 61 |
install -d -m 0755 %{buildroot}%{_unitdir} |
| 62 |
-for i in nmb smb winbind ; do |
| 63 |
- cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba@g' >tmp$i.service |
| 64 |
+for i in nmb smb winbind samba; do |
| 65 |
+ cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service |
| 66 |
install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service |
| 67 |
done |
| 68 |
%if %with_clustering_support |
| 69 |
@@ -1483,6 +1484,7 @@ |
| 70 |
%{_libdir}/samba/ldb/password_hash.so |
| 71 |
%{_libdir}/samba/ldb/ranged_results.so |
| 72 |
%{_libdir}/samba/ldb/repl_meta_data.so |
| 73 |
+%{_unitdir}/samba.service |
| 74 |
%{_libdir}/samba/ldb/resolve_oids.so |
| 75 |
%{_libdir}/samba/ldb/rootdse.so |
| 76 |
%{_libdir}/samba/ldb/samba3sam.so |
| 77 |
@@ -1537,7 +1539,6 @@ |
| 78 |
%{_libdir}/samba/libdfs-server-ad-samba4.so |
| 79 |
%{_libdir}/samba/libdnsserver-common-samba4.so |
| 80 |
%{_libdir}/samba/libdsdb-module-samba4.so |
| 81 |
-%{_libdir}/samba/libntvfs-samba4.so |
| 82 |
%{_libdir}/samba/bind9/dlz_bind9_9.so |
| 83 |
%else |
| 84 |
%doc packaging/README.dc-libs |
| 85 |
@@ -2654,6 +2655,11 @@ |
| 86 |
%endif # with_clustering_support |
| 87 |
|
| 88 |
%changelog |
| 89 |
+* Tue May 08 2018 Jean-Philipe Pialasse <tests@pialasse.com> - 4.6.2-12.3.sme |
| 90 |
+- import 4.6.2-12 [SME: 10429] |
| 91 |
+- change gnutls-devel >= 3.4.7 to gnutls-devel to allow build |
| 92 |
+- import to SME the two last upstream releases [SME: 10326] |
| 93 |
+ |
| 94 |
* Fri Nov 17 2017 Andreas Schneider <asn@redhat.com> - 4.6.2-12 |
| 95 |
- resolves: #1514314 - Fix CVE-2017-14746 and CVE-2017-15275 |
| 96 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
