--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec 2010/10/27 19:51:58 1.65 +++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec 2010/12/01 19:24:58 1.84 @@ -1,10 +1,10 @@ -# $Id: e-smith-ldap.spec,v 1.64 2010/10/27 14:22:16 vip-ire Exp $ +# $Id: e-smith-ldap.spec,v 1.83 2010/12/01 03:43:48 slords Exp $ Summary: e-smith server and gateway - LDAP module %define name e-smith-ldap Name: %{name} %define version 5.2.0 -%define release 53 +%define release 72 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -61,11 +61,28 @@ Patch47: e-smith-ldap-5.2.0-allow_authen Patch48: e-smith-ldap-5.2.0-add_nobody_and_shared_in_ldap.patch Patch49: e-smith-ldap-5.2.0-fix_nobody_and_shared_group.patch Patch50: e-smith-ldap-5.2.0-add_www_move_nobody.patch +Patch51: e-smith-ldap-5.2.0-fix_ldap_update.patch +Patch52: e-smith-ldap-5.2.0-ldap-init-script.patch +Patch53: e-smith-ldap-5.2.0-enable_ldap_init.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base Requires: e-smith-lib >= 1.15.1-16 -Requires: openldap >= 2.0.0, perl(Net::LDAP) +Requires: openldap >= 2.0.0 +Requires: openldap-clients +Requires: perl(Net::LDAP) Requires: e-smith-formmagick >= 1.4.0-9 BuildRequires: e-smith-devtools >= 1.13.1-03 AutoReqProv: no @@ -74,6 +91,65 @@ AutoReqProv: no e-smith server and gateway software - LDAP module. %changelog +* 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] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-61.sme +- Apply correct patch for group descriptions/password [SME: 6337] + +* Thu Nov 4 2010 Shad L. Lords 5.2.0-60.sme +- groups don't have password, some don't have description [SME: 6337] + +* Tue Nov 2 2010 Shad L. Lords 5.2.0-59.sme +- Remove unix users/groups if ldap is master [SME: 6325] + +* Tue Nov 2 2010 Shad L. Lords 5.2.0-58.sme +- Disable ldap-delete if ldap is master [SME: 6324] + +* Tue Nov 02 2010 Daniel Berteaud 5.2.0-57.sme +- Enable the new ldap.init service [SME: 6231] + +* Sat Oct 30 2010 Daniel Berteaud 5.2.0-56.sme +- Fix a small typo in reset-ldap-bootstrap [SME: 6231] + +* Fri Oct 29 2010 Shad L. Lords 5.2.0-55.sme +- Add ldap.init script to allow update on reconfig/reboot [SME: 6231] + +* Thu Oct 28 2010 Daniel Berteaud 5.2.0-54.sme +- Fix minor errors in ldap-update [SME: 6312] + * Wed Oct 27 2010 Shad L. Lords 5.2.0-53.sme - Add www user/group to ldap [SME: 6312] @@ -940,12 +1016,25 @@ e-smith server and gateway software - LD %patch48 -p1 %patch49 -p1 %patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -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/S80ldap mkdir -p root/home/e-smith/db/ldap mkdir -p root/etc/rc.d/init.d/supervise @@ -958,6 +1047,7 @@ touch root/var/service/ldap/down mkdir -p root/var/log/bdb mkdir -p root/var/log/ldap mkdir -p root/var/service/ldap/ssl +mkdir -p root/etc/e-smith/ldap/init %install rm -rf $RPM_BUILD_ROOT