--- rpms/e-smith-ldap/sme10/e-smith-ldap.spec	2020/12/12 03:26:37	1.10
+++ rpms/e-smith-ldap/sme10/e-smith-ldap.spec	2023/02/06 06:31:53	1.24
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.9 2020/05/03 02:51:32 jpp Exp $
+# $Id: e-smith-ldap.spec,v 1.23 2023/02/06 06:14:12 jpp Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.6.0
-%define release 8
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,13 @@ Patch1: e-smith-ldap-5.6.0.bz9688.skipre
 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
+Patch8: e-smith-ldap-5.6.0-bz11745-log.patch
+Patch9: e-smith-ldap-5.6.0-bz11753-ldif-fix.patch
+Patch10: e-smith-ldap-5.6.0-bz12221-slapd-dropin.patch
+Patch11: e-smith-ldap-5.6.0-bz12314-alias.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -33,6 +40,33 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Mon Feb 06 2023 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-17.sme
+- remove alias for slapd [SME: 12314]
+
+* Tue Nov 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-16.sme
+- fix slapd dropin missing section [SME: 12221]
+
+* Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-15.sme
+- add support or rsshusers system group [SME: 11753]
+
+* Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-14.sme
+- redirect syslog for ldapt to /var/log/ldap/ldap.log [SME: 11745]
+
+* 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]
@@ -1030,9 +1064,15 @@ e-smith server and gateway software - LD
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
-mkdir -p root/etc/e-smith/templates/etc/openldap/ssl
+%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
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks
@@ -1044,11 +1084,13 @@ rm -f %{name}-%{version}-%{release}-file
 /sbin/e-smith/genfilelist $RPM_BUILD_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)' \
     --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 /var/log/ldap 'attr(0750,root,root)' \
+    --dir /etc/openldap/ssl 'attr(0750,root,ldap)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
 
@@ -1059,6 +1101,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %pre
+if [ -L /etc/systemd/system/slapd.service ] ; then
+  /usr/bin/unlink /etc/systemd/system/slapd.service
+fi
 if [ $1 -gt 1 ] ; then
   if [ -e /var/service/ldap/run ] ; then
        /usr/bin/sv d ldap