--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/10/11 17:43:42	1.58
+++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec	2010/10/30 14:03:32	1.68
@@ -1,10 +1,10 @@
-# $Id: e-smith-ldap.spec,v 1.57 2010/10/02 11:15:05 vip-ire Exp $
+# $Id: e-smith-ldap.spec,v 1.67 2010/10/30 00:34:57 slords Exp $
 
 Summary: e-smith server and gateway - LDAP module
 %define name e-smith-ldap
 Name: %{name}
 %define version 5.2.0
-%define release 46
+%define release 56
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -55,11 +55,21 @@ Patch41: e-smith-ldap-5.2.0-users_acl.pa
 Patch42: e-smith-ldap-5.2.0-toggle_anonymous_access.patch
 Patch43: e-smith-ldap-5.2.0-fix_anonymous_toggle.patch
 Patch44: e-smith-ldap-5.2.0-link_ldap_update.patch
+Patch45: e-smith-ldap-5.2.0-update_group_membership_on_delete.patch
+Patch46: e-smith-ldap-5.2.0-ldap_update_later.patch
+Patch47: e-smith-ldap-5.2.0-allow_authenticated_users_to_read_attrs.patch
+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
 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
@@ -68,6 +78,36 @@ AutoReqProv: no
 e-smith server and gateway software - LDAP module.
 
 %changelog
+* Sat Oct 30 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-56.sme
+- Fix a small typo in reset-ldap-bootstrap
+
+* Fri Oct 29 2010 Shad L. Lords <slords@mail.com> 5.2.0-55.sme
+- Add ldap.init script to allow update on reconfig/reboot [SME: 6231]
+
+* Thu Oct 28 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-54.sme
+- Fix minor errors in ldap-update [SME: 6312]
+
+* Wed Oct 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-53.sme
+- Add www user/group to ldap [SME: 6312]
+
+* Wed Oct 27 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-52.sme
+- Fixes for nobody and shared groups [SME: 6310]
+
+* Wed Oct 27 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-51.sme
+- Add nobody and shared groups in LDAP [SME: 6310]
+
+* Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-50.sme
+- Allow authenticated users to read posixAccount and shadowAccount attrs [SME: 6254]
+
+* Wed Oct 13 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-49.sme
+- call ldap-update later during group and user creation [SME: 6284]
+
+* Thu Oct 7 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-48.sme
+- Update group membership for deleted accounts [SME: 6276]
+
+* Thu Oct 7 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-47.sme
+- Don't call ldap-update on deleted accounts [SME: 6239]
+
 * Thu Oct 7 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-46.sme
 - Link ldap-update scripts in needed events [SME: 6239]
 
@@ -907,12 +947,20 @@ e-smith server and gateway software - LD
 %patch42 -p1
 %patch43 -p1
 %patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -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
+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
@@ -925,6 +973,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