--- rpms/e-smith-samba/sme10/e-smith-samba.spec	2021/04/20 03:47:27	1.23
+++ rpms/e-smith-samba/sme10/e-smith-samba.spec	2024/04/13 04:55:50	1.30
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.22 2021/04/17 02:00:19 jpp Exp $
+# $Id: e-smith-samba.spec,v 1.29 2022/11/29 21:28:31 jpp Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.6.0
-%define release 22
+%define release 28
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -23,6 +23,11 @@ Patch9: e-smith-samba-2.6.0-bz11118-bz11
 Patch10: e-smith-samba-2.6.0-bz11348-user-create-profiledir.patch
 Patch11: e-smith-samba-2.6.0-bz11349-logging.patch
 Patch12: e-smith-samba-2.6.0-bz11555.patch
+Patch13: e-smith-samba-2.6.0.bz11725.create_v6_profile_dir.patch
+Patch14: e-smith-samba-2.6.0.bz11725.delete_v6_profile_dir.patch
+Patch15: e-smith-samba-2.6.0.bz11725.fix_typo_v6_profile_dir.patch
+Patch16:  e-smith-samba-2.6.0-bz12231-account-reuse.patch 
+Patch17: e-smith-samba-2.6.0-bz12462.patch
 
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -52,7 +57,23 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
-* Mon Apr 19 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-22.sme
+* Sat Apr 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 2.6.0-28.sme
+- fix regex for SID [SME: 12462]
+
+* Tue Nov 29 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-27.sme
+- Fix fail to join the domain [SME: 12231]
+  patch from  bunkobugsy ; Fix from Nico Tiana
+
+* Wed Nov 03 2021 Terry Fage <terry@fage.id.au> 2.6.0-26.sme
+- samba fix typo in delete v6 profile dir win10 [SME: 11725]
+
+* Tue Nov 02 2021 Terry Fage <terry@fage.id.au> 2.6.0-25.sme
+- samba delete v6 profile dir win10 [SME: 11725]
+
+* Mon Nov 01 2021 Terry Fage <terry@fage.id.au> 2.6.0-24.sme
+- samba create v6 profile dir win10 [SME: 11725]
+
+* Mon Apr 19 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-23.sme
 - netlogon.bat +x [SME: 11566]
 
 * Fri Apr 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-21.sme
@@ -288,7 +309,7 @@ AutoReqProv: no
 * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-19.sme
 - Add slapd support [SME: 6228]
 
-* Wed Jul 08 2010 Shad L. Lords <slords@mail.com> 2.2.0-18.sme
+* Thu Jul 08 2010 Shad L. Lords <slords@mail.com> 2.2.0-18.sme
 - Remove require strong key part of regedit file [SME: 6119]
 
 * Wed Jun 23 2010 Shad L. Lords <slords@mail.com> 2.2.0-17.sme
@@ -389,7 +410,7 @@ AutoReqProv: no
 * Wed Oct 10 2007 Charlie Brady <charlie_brady@mitel.com> 1.14.0-31
 - Delete printer tdb file on printer delete. [SME: 3336]
 
-* Thu Jun 2 2007 Shad L. Lords <slords@mail.com> 1.14.0-30
+* Sat Jun 2 2007 Shad L. Lords <slords@mail.com> 1.14.0-30
 - revert last change.  Breaks sme8 and is caught by pass check lib.
 
 * Sat Jun 2 2007 Shad L. Lords <slords@mail.com> 1.14.0-29
@@ -1319,6 +1340,11 @@ rm -rf root/service root/var/service roo
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 perl createlinks
@@ -1329,7 +1355,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/e-smith/genfilelist \
     --file '/sbin/e-smith/systemd/nmbd-prepare' 'attr(0554,root,root)' \
     --file '/sbin/e-smith/systemd/smbd-prepare' 'attr(0554,root,root)' \
-    --file '/home/e-smith/files/samba/netlogon/netlogon.bat'  'attr(0755,admin,admin)' \
     --dir '/var/log/smbd' 'attr(2750,smelog,smelog)' \
     --dir '/var/log/nmbd' 'attr(2750,smelog,smelog)' \
     --file '/sbin/e-smith/samba_check_password' 'attr(0555,root,root)' \