--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec 2010/11/05 19:02:54 1.74 +++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec 2010/12/02 00:46:05 1.87 @@ -1,10 +1,10 @@ -# $Id: e-smith-ldap.spec,v 1.73 2010/11/05 05:13:58 slords Exp $ +# $Id: e-smith-ldap.spec,v 1.86 2010/12/01 19:30:40 slords Exp $ Summary: e-smith server and gateway - LDAP module %define name e-smith-ldap Name: %{name} %define version 5.2.0 -%define release 62 +%define release 74 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -67,6 +67,16 @@ Patch53: e-smith-ldap-5.2.0-enable_ldap_ Patch54: e-smith-ldap-5.2.0-ldap-auth.patch Patch55: e-smith-ldap-5.2.0-unix-cleanup.patch Patch56: e-smith-ldap-5.2.0-group-attrs.patch +Patch57: e-smith-ldap-5.2.0-simple-ldap-update.patch +Patch58: e-smith-ldap-5.2.0-fixe_ldif_templates.patch +Patch59: e-smith-ldap-5.2.0-locked-passwd.patch +Patch60: e-smith-ldap-5.2.0-startup-order.patch +Patch61: e-smith-ldap-5.2.0-remove_bogus_junk.patch +Patch62: e-smith-ldap-5.2.0-ldapmodify.patch +Patch63: e-smith-ldap-5.2.0-fix-department.patch +Patch64: e-smith-ldap-5.2.0-update-ldap-later.patch +Patch65: e-smith-ldap-5.2.0-ldap-init.patch +Patch66: e-smith-ldap-5.2.0-replace-logic.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base @@ -82,6 +92,44 @@ AutoReqProv: no e-smith server and gateway software - LDAP module. %changelog +* Wed Dec 1 2010 Shad L. Lords 5.2.0-74.sme +- Fix replace logic in ldif-fix [SME: 6423] + +* Wed Dec 1 2010 Shad L. Lords 5.2.0-73.sme +- Fix permissions on ldif-fix script [SME: 6244] + +* Wed Dec 1 2010 Shad L. Lords 5.2.0-72.sme +- Replace convert_ldif with ldif-fix script [SME: 6244] +- Remove ldif template and expansion [SME: 6421] +- Simplify ldap-update call by calling ldif-fix [SME: 6422] + +* Tue Nov 30 2010 Shad L. Lords 5.2.0-71.sme +- Update ldap database later to pick up samba group maps [SME: 6419] + +* Tue Nov 30 2010 Shad L. Lords 5.2.0-70.sme +- Use correct field (Dept) for ou ldap field [SME: 6417] + +* Tue Nov 30 2010 Shad L. Lords 5.2.0-69.sme +- Add rfc2739.schem back in and include in config so upgrades work [SME: 5159] + +* Tue Nov 30 2010 Daniel Berteaud 5.2.0-68.sme +- Use ldapmodify to load ldif, add -a if no changetype [SME: 6413] + +* Tue Nov 23 2010 Daniel Berteaud 5.2.0-67.sme +- Remove bogus junk attribute from ldif templates [SME: 6396] + +* Mon Nov 22 2010 Shad L. Lords 5.2.0-66.sme +- Change startup order for ldap [SME: 6390] + +* Thu Nov 11 2010 Shad L. Lords 5.2.0-65.sme +- Store locked password instead of expired password [SME: 6360] + +* Wed Nov 10 2010 Daniel Berteaud 5.2.0-64.sme +- Fixed ldif templates error [SME: 6356] + +* Mon Nov 8 2010 Shad L. Lords 5.2.0-63.sme +- Simplify ldap-update for most events [SME: 6354] + * Fri Nov 5 2010 Shad L. Lords 5.2.0-62.sme - Adjust call to ldap-update later create/modify/delete [SME: 6284] @@ -981,12 +1029,20 @@ e-smith server and gateway software - LD %patch54 -p1 %patch55 -p1 %patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 %build mkdir -p root/etc/e-smith/tests perl createlinks -mkdir -p root/etc/rc.d/rc7.d -ln -s /etc/rc.d/init.d/e-smith-service root/etc/rc.d/rc7.d/S77ldap mkdir -p root/home/e-smith/db/ldap mkdir -p root/etc/rc.d/init.d/supervise @@ -1008,7 +1064,7 @@ rm -f %{name}-%{version}-%{release}-file /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 /var/service/ldap/convert_ldif 'attr(0750,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)' \