--- rpms/samba/sme10/samba.spec.patch	2017/03/02 16:33:57	1.2
+++ rpms/samba/sme10/samba.spec.patch	2018/05/08 18:00:56	1.6
@@ -1,9 +1,24 @@
---- samba.spec.original	2016-10-02 16:23:04.356835288 -0700
-+++ samba.spec	2016-10-02 16:31:38.311833030 -0700
-@@ -38,1 +38,1 @@
+--- 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
-@@ -59,8 +59,8 @@
+ 
+ %global with_profiling 1
+ 
+@@ -56,8 +56,8 @@
  %global libwbc_alternatives_suffix -64
  %endif
  
@@ -14,21 +29,33 @@
  
  %if %{with testsuite}
  # The testsuite only works with a full build right now.
-@@ -399,2 +399,3 @@
- Summary: Samba libraries
- Group: Applications/System
+@@ -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
-@@ -463,7 +464,7 @@
+ 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
-+Buildrequires: gnutls-devel
  Requires: pytalloc
  
  Provides: samba4-python = %{samba_depver}
-@@ -864,8 +865,8 @@
+@@ -868,8 +869,8 @@
  %endif
  
  install -d -m 0755 %{buildroot}%{_unitdir}
@@ -39,15 +66,22 @@
      install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
  done
  %if %with_clustering_support
-@@ -1481,1 +1481,2 @@
- %{_mandir}/man8/samba-tool.8*
+@@ -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
- %else # with_dc
-@@ -1738,6 +1743,7 @@
- %{_libdir}/samba/libHDB-SAMBA4-samba4.so
- %{_libdir}/samba/libasn1-samba4.so.8
- %{_libdir}/samba/libasn1-samba4.so.8.0.0
-+#%{_libdir}/samba/libdfs_server_ad.so
- %{_libdir}/samba/libgssapi-samba4.so.2
- %{_libdir}/samba/libgssapi-samba4.so.2.0.0
- %{_libdir}/samba/libhcrypto-samba4.so.5
+ %{_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 <tests@pialasse.com> - 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 <asn@redhat.com> - 4.6.2-12
+ - resolves: #1514314 - Fix CVE-2017-14746 and CVE-2017-15275
+