--- rpms/e-smith-ldap/sme10/e-smith-ldap.spec	2020/05/03 02:51:32	1.9
+++ rpms/e-smith-ldap/sme10/e-smith-ldap.spec	2021/06/09 15:59:48	1.17
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.8 2017/02/23 10:21:52 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.16 2021/06/03 14:36:13 jpp Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.6.0
-%define release 7
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,10 @@ Patch0: e-smith-ldap-5.6.0-missing_sheba
 Patch1: e-smith-ldap-5.6.0.bz9688.skipredirect.patch
 Patch2: e-smith-ldap-5.6.0-strong_encryption.patch
 Patch3: e-smith-ldap-5.6.0-bz10936-TLS-and-ciphers.patch
+Patch4: e-smith-ldap-5.6.0-bz11140-bz11099-bz11096-systemd-update.patch
+Patch5: e-smith-ldap-5.6.0-bz11480-timeoutstart.patch
+Patch6: e-smith-ldap-5.6.0-bz11595-ssl-template.patch
+Patch7: e-smith-ldap-5.6.0-bz11598.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -32,6 +36,26 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Wed Jun 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-13.sme
+- fix ssl-update reload instead of restart ldap [SME: 11598]
+
+* Thu Jun 03 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-12.sme
+- fix wrong path for templates.metadata [SME: 11595]
+
+* Sun May 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-11.sme
+- use template for ssl pem [SME: 11595]
+
+* Sun Mar 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-10.sme
+- fix ldap failing to start on initial boot [SME: 11480]
+
+* Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-9.sme
+- fix wrong alias to ldap.init [SME: 11301]
+
+* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-8.sme
+- add -update event [SME: 11140]
+- move ldap to systemd [SME: 11099]
+- move ldap.init to systemd [SME: 11096]
+
 * Sat May 02 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-7.sme
 - New protocol default as TLSv1.2  [SME: 10936]
   New property TLSProtocolMin
@@ -1023,7 +1047,12 @@ e-smith server and gateway software - LD
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-
+%patch4 -p1
+%patch5 -p1
+mkdir -p root/etc/openldap/ssl
+rm -rf root/service root/var/service root/etc/rc.d/init.d/supervise
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks
@@ -1033,14 +1062,15 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-%{release}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    --file /var/service/ldap/run 'attr(0750,root,root)' \
-    --file /var/service/ldap/log/run 'attr(0750,root,root)' \
+    --file /sbin/e-smith/systemd/ldap-certificate 'attr(0554,root,root)' \
+    --file /sbin/e-smith/systemd/ldap-prepare 'attr(0554,root,root)' \
+    --file /sbin/e-smith/systemd/ldap-finish 'attr(0554,root,root)' \
     --file /var/service/ldap/ldif-fix 'attr(0750,root,root)' \
     --file /var/service/ldap/finish 'attr(0750,root,root)' \
-    --file /var/service/ldap/control/1 'attr(0750,root,root)' \
     --dir /var/log/bdb 'attr(0700,ldap,ldap)' \
     --dir /home/e-smith/db/ldap 'attr(0750,root,ldap)' \
     --dir /var/log/ldap 'attr(0750,smelog,smelog)' \
+    --dir /etc/openldap/ssl 'attr(0750,root,ldap)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
 
@@ -1050,3 +1080,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
 
+%pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/ldap/run ] ; then
+       /usr/bin/sv d ldap
+       /usr/bin/sv d ldap/log
+  fi
+fi