From 97bfc353795793f5553e3dc159de790bae2ad495 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:29:24 +0000 Subject: auto-import openldap-2.0.11-12 from openldap-2.0.11-12.src.rpm --- diff --git a/ldap.init b/ldap.init index abb7363..b57f27c 100644 --- a/ldap.init +++ b/ldap.init @@ -46,13 +46,11 @@ function start() { echo if [ $RETVAL -eq 0 ]; then if grep -q "^replogfile" /etc/openldap/slapd.conf; then - if grep -q "replica" /etc/openldap/slapd.conf; then - prog=`basename ${slurpd}` - echo -n $"Starting $prog: " - daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS - RETVAL=$? - echo - fi + prog=`basename ${slurpd}` + echo -n $"Starting $prog: " + daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS + RETVAL=$? + echo fi fi [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap @@ -97,6 +95,16 @@ case "$1" in stop start ;; + reload) + killproc ${slapd} -HUP + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + if grep -q "^replogfile" /etc/openldap/slapd.conf; then + killproc ${slurpd} -HUP + RETVAL=$? + fi + fi + ;; condrestart) if [ -f /var/lock/subsys/ldap ] ; then stop diff --git a/openldap.spec b/openldap.spec index e0a9763..cf58cbd 100644 --- a/openldap.spec +++ b/openldap.spec @@ -1,8 +1,8 @@ %define migtools_ver 38 -Summary: The configuration files, libraries and documentation for OpenLDAP. +Summary: The configuration files, libraries, and documentation for OpenLDAP. Name: openldap Version: 2.0.11 -Release: 8 +Release: 12 License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz @@ -34,17 +34,18 @@ Patch14: MigrationTools-26-suffix.patch Patch15: MigrationTools-24-schema.patch URL: http://www.openldap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, perl, tcp_wrappers -Requires: mktemp, gdbm +BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, pam-devel, perl, tcp_wrappers +BuildPreReq: libtool >= 1.4 +Requires: cyrus-sasl, cyrus-sasl-md5, mktemp %description OpenLDAP is an open source suite of LDAP (Lightweight Directory Access -Protocol) applications and development tools. LDAP is a set of +Protocol) applications and development tools. LDAP is a set of protocols for accessing directory services (usually phone book style information, but other information is possible) over the Internet, similar to the way DNS (Domain Name System) information is propagated -over the Internet. The openldap package contains configuration files, -libraries and documentation for OpenLDAP. +over the Internet. The openldap package contains configuration files, +libraries, and documentation for OpenLDAP. %package devel Summary: OpenLDAP development libraries and header files. @@ -54,7 +55,7 @@ Requires: openldap = %{version}-%{release} %description devel The openldap-devel package includes the development libraries and header files needed for compiling applications that use LDAP -(Lightweight Directory Access Protocol) internals. LDAP is a set of +(Lightweight Directory Access Protocol) internals. LDAP is a set of protocols for enabling directory services over the Internet. Install this package only if you plan to develop or will need to compile customized LDAP clients. @@ -65,13 +66,13 @@ Prereq: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/us Group: System Environment/Daemons %description servers -OpenLDAP is an open source suite of LDAP (Lightweight Directory Access -Protocol) applications and development tools. LDAP is a set of +OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access +Protocol) applications and development tools. LDAP is a set of protocols for accessing directory services (usually phone book style information, but other information is possible) over the Internet, similar to the way DNS (Domain Name System) information is propagated over the Internet. This package contains the slapd and slurpd servers, -migration scripts and related files. +migration scripts, and related files. %package clients Summary: Client programs for OpenLDAP. @@ -79,12 +80,12 @@ Prereq: openldap = %{version}-%{release} Group: Applications/Internet %description clients -OpenLDAP is an open source suite of LDAP (Lightweight Directory Access -Protocol) applications and development tools. LDAP is a set of +OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access +Protocol) applications and development tools. LDAP is a set of protocols for accessing directory services (usually phone book style information, but other information is possible) over the Internet, similar to the way DNS (Domain Name System) information is propagated -over the Internet. The openldap-clients package contains the client +over the Internet. The openldap-clients package contains the client programs needed for accessing and modifying OpenLDAP directories. %prep @@ -99,7 +100,7 @@ programs needed for accessing and modifying OpenLDAP directories. %patch7 -p1 -b .ldaprc %patch8 -p1 -b .debug %patch9 -p1 -b .libtool -#%patch10 -p1 -b .linkage +%patch10 -p1 -b .linkage pushd MigrationTools-%{migtools_ver} %patch11 -p1 -b .instdir %patch12 -p1 -b .mktemp @@ -146,7 +147,7 @@ configure_flags=' --enable-spasswd --libexecdir=%{_sbindir} - --localstatedir=%{_var}/run' + --localstatedir=/%{_var}/run' %configure ${configure_flags} --without-slapd --with-slurpd --without-ldapd --with-threads --disable-shared --enable-static make depend @@ -162,11 +163,15 @@ make %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT +# libtool loves relinking shared libraries +rm -f libraries/*/*.la +make %makeinstall \ datadir=$RPM_BUILD_ROOT%{_datadir}/openldap \ libexecdir=$RPM_BUILD_ROOT%{_sbindir} \ - localstatedir=%{_var}/run \ - sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/openldap + localstatedir=/%{_var}/run \ + sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/openldap $@ + install -m755 slurpd.semistatic $RPM_BUILD_ROOT%{_sbindir}/slurpd # hack the default config files @@ -217,6 +222,11 @@ for lib in ../../lib/lib*.so.*.* ; do ln -sf ${lib} `basename ${lib} | cut -f1,2 -d.` done +# tweak permissions +chmod +rx $RPM_BUILD_ROOT/lib/lib*.so* $RPM_BUILD_ROOT/%{_libdir}/lib*.so* +chmod +r $RPM_BUILD_ROOT/%{_libdir}/lib*.*a +chmod -x $RPM_BUILD_ROOT/%{_libdir}/lib*.*a + %clean rm -rf $RPM_BUILD_ROOT @@ -315,8 +325,18 @@ fi %attr(0644,root,root) %{_mandir}/man3/* %changelog -* Thu Jul 26 2001 Nalin Dahyabhai -- remove "reload" option from init script, which actually stopped the servers +* Thu Aug 9 2001 Nalin Dahyabhai +- don't attempt to create a cert at install-time, it's usually going + to get the wrong CN (#51352) + +* Mon Aug 6 2001 Nalin Dahyabhai +- add a build-time requirement on pam-devel +- add a build-time requirement on a sufficiently-new libtool to link + shared libraries to other shared libraries + +* Fri Aug 3 2001 Nalin Dahyabhai +- require cyrus-sasl-md5 (support for DIGEST-MD5 is required for RFC + compliance) by name (follows from #43079) * Fri Jul 20 2001 Nalin Dahyabhai - enable passwd back-end (noted by Alan Sparks and Sergio Kessler)