SPECS: openldap.spec - rel 3 - don't change openldap lib config fi...

[baggins]

Author: baggins                      Date: Tue Nov  6 18:09:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3
- don't change openldap lib config file location
- provide proper lib config file (/etc/openldap/ldap.conf)
- add package -nss-config with /etc/ldap.conf for nss_ldap and pam_ldap
- add 'TLSVerifyClient never' to slapd.comf (as per admin guide)

---- Files affected:
SPECS:
   openldap.spec (1.276 -> 1.277) 

---- Diffs:

================================================================
Index: SPECS/openldap.spec
diff -u SPECS/openldap.spec:1.276 SPECS/openldap.spec:1.277
--- SPECS/openldap.spec:1.276	Tue Nov  6 13:47:30 2007
+++ SPECS/openldap.spec	Tue Nov  6 19:09:00 2007
@@ -29,7 +29,7 @@
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
 Version:	2.4.6
-Release:	2
+Release:	3
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
@@ -38,27 +38,27 @@
 # Source1-md5:	718082e7e35fc48478a2334b0bc4cd11
 Source2:	ldap.init
 Source3:	%{name}.sysconfig
-Source4:	ldap.conf
+Source4:	%{name}.conf
+Source5:	ldap.conf
 Source100:	%{name}-README.evolution
 Patch0:		%{name}-make_man_link.patch
-Patch1:		%{name}-conffile.patch
-Patch2:		%{name}-config.patch
-Patch3:		%{name}-fast.patch
-Patch4:		%{name}-cldap.patch
-Patch5:		%{name}-ldapi_FHS.patch
-Patch6:		%{name}-install.patch
-Patch7:		%{name}-backend_libs.patch
-Patch8:		%{name}-perl.patch
-Patch9:		%{name}-pic.patch
-Patch10:	%{name}-ltinstall-mode.patch
-Patch11:	%{name}-whowhere.patch
-Patch12:	%{name}-ldaprc.patch
-Patch13:	%{name}-setugid.patch
-Patch14:	%{name}-nosql.patch
-Patch15:	%{name}-smbk5pwd.patch
-Patch16:	%{name}-ldapc++.patch
-Patch17:	%{name}-pie.patch
-Patch18:	%{name}-gethostbyXXXX_r.patch
+Patch1:		%{name}-config.patch
+Patch2:		%{name}-fast.patch
+Patch3:		%{name}-cldap.patch
+Patch4:		%{name}-ldapi_FHS.patch
+Patch5:		%{name}-install.patch
+Patch6:		%{name}-backend_libs.patch
+Patch7:		%{name}-perl.patch
+Patch8:		%{name}-pic.patch
+Patch9:		%{name}-ltinstall-mode.patch
+Patch10:	%{name}-whowhere.patch
+Patch11:	%{name}-ldaprc.patch
+Patch12:	%{name}-setugid.patch
+Patch13:	%{name}-nosql.patch
+Patch14:	%{name}-smbk5pwd.patch
+Patch15:	%{name}-ldapc++.patch
+Patch16:	%{name}-pie.patch
+Patch17:	%{name}-gethostbyXXXX_r.patch
 # Patch for the evolution library
 Patch100:	%{name}-ntlm.diff
 URL:		http://www.openldap.org/
@@ -125,6 +125,17 @@
 %description -l uk.UTF-8
 Зразки клієнтів, що поставляються з LDAP.
 
+%package nss-config
+Summary:	Common configuration for nss_ldap and pam_ldap
+Summary(pl.UTF-8):	Wspólna konfiguracja dla nss_ldap i pam_ldap
+Group:		Base
+
+%description nss-config
+Common configuration for nss_ldap and pam_ldap.
+
+%description nss-config -l pl.UTF-8
+Wspólna konfiguracja dla nss_ldap i pam_ldap.
+
 %package libs
 Summary:	LDAP shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone LDAP
@@ -804,7 +815,6 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
 
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays/smbk5pwd.c
 cd ..
@@ -1033,11 +1043,14 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/ldap
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
+# Config for openldap library
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/ldap.conf
+# Config for nss_ldap and pam_ldap
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
 
 echo "localhost" > $RPM_BUILD_ROOT%{_sysconfdir}/openldap/ldapserver
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/openldap/{*.{default,example},ldap.conf,schema/README}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/openldap/{*.{default,example},schema/README}
 
 # Standard schemas should not be changed by users
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/* $RPM_BUILD_ROOT%{_datadir}/openldap/schema
@@ -1292,13 +1305,17 @@
 %doc %{name}-%{version}/doc/{drafts,rfc}
 %dir %{_sysconfdir}/openldap
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/ldapserver
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ldap.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/ldap.conf
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/openldap
 %{_mandir}/man1/ldap*.1*
 %{_mandir}/man5/ldap.conf.5*
 %{_mandir}/man5/ldif.5*
 
+%files nss-config
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ldap.conf
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/liblber-2.4.so.*.*.*
@@ -1567,6 +1584,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.277  2007/11/06 18:09:00  baggins
+- rel 3
+- don't change openldap lib config file location
+- provide proper lib config file (/etc/openldap/ldap.conf)
+- add package -nss-config with /etc/ldap.conf for nss_ldap and pam_ldap
+- add 'TLSVerifyClient never' to slapd.comf (as per admin guide)
+
 Revision 1.276  2007/11/06 12:47:30  baggins
 - rel 2
 - fixed internal db build due to openldap using internal/non-public functions
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openldap.spec?r1=1.276&r2=1.277&f=u