--- rpms/e-smith-ldap/sme10/e-smith-ldap.spec 2021/05/31 03:58:58 1.15 +++ 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.14 2021/03/22 03:12:12 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 11 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -17,6 +17,11 @@ Patch3: e-smith-ldap-5.6.0-bz10936-TLS-a 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 @@ -35,6 +40,24 @@ AutoReqProv: no e-smith server and gateway software - LDAP module. %changelog +* Mon Feb 06 2023 Jean-Philippe Pialasse 5.6.0-17.sme +- remove alias for slapd [SME: 12314] + +* Tue Nov 22 2022 Jean-Philippe Pialasse 5.6.0-16.sme +- fix slapd dropin missing section [SME: 12221] + +* Sun Apr 17 2022 Jean-Philippe Pialasse 5.6.0-15.sme +- add support or rsshusers system group [SME: 11753] + +* Fri Feb 18 2022 Jean-Philippe Pialasse 5.6.0-14.sme +- redirect syslog for ldapt to /var/log/ldap/ldap.log [SME: 11745] + +* Wed Jun 09 2021 Jean-Philippe Pialasse 5.6.0-13.sme +- fix ssl-update reload instead of restart ldap [SME: 11598] + +* Thu Jun 03 2021 Jean-Philippe Pialasse 5.6.0-12.sme +- fix wrong path for templates.metadata [SME: 11595] + * Sun May 30 2021 Jean-Philippe Pialasse 5.6.0-11.sme - use template for ssl pem [SME: 11595] @@ -1045,6 +1068,11 @@ e-smith server and gateway software - LD 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 @@ -1061,7 +1089,7 @@ rm -f %{name}-%{version}-%{release}-file --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 @@ -1073,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