auto-import openldap-2.0.11-12 from openldap-2.0.11-12.src.rpm

This commit is contained in:
cvsdist 2004-09-09 09:29:24 +00:00
parent 7a16c4a0fc
commit 97bfc35379
2 changed files with 55 additions and 27 deletions

View File

@ -46,13 +46,11 @@ function start() {
echo echo
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
if grep -q "^replogfile" /etc/openldap/slapd.conf; then if grep -q "^replogfile" /etc/openldap/slapd.conf; then
if grep -q "replica" /etc/openldap/slapd.conf; then prog=`basename ${slurpd}`
prog=`basename ${slurpd}` echo -n $"Starting $prog: "
echo -n $"Starting $prog: " daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS
daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS RETVAL=$?
RETVAL=$? echo
echo
fi
fi fi
fi fi
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap
@ -97,6 +95,16 @@ case "$1" in
stop stop
start 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) condrestart)
if [ -f /var/lock/subsys/ldap ] ; then if [ -f /var/lock/subsys/ldap ] ; then
stop stop

View File

@ -1,8 +1,8 @@
%define migtools_ver 38 %define migtools_ver 38
Summary: The configuration files, libraries and documentation for OpenLDAP. Summary: The configuration files, libraries, and documentation for OpenLDAP.
Name: openldap Name: openldap
Version: 2.0.11 Version: 2.0.11
Release: 8 Release: 12
License: OpenLDAP License: OpenLDAP
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz 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 Patch15: MigrationTools-24-schema.patch
URL: http://www.openldap.org/ URL: http://www.openldap.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, perl, tcp_wrappers BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, pam-devel, perl, tcp_wrappers
Requires: mktemp, gdbm BuildPreReq: libtool >= 1.4
Requires: cyrus-sasl, cyrus-sasl-md5, mktemp
%description %description
OpenLDAP is an open source suite of LDAP (Lightweight Directory Access 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 protocols for accessing directory services (usually phone book style
information, but other information is possible) over the Internet, information, but other information is possible) over the Internet,
similar to the way DNS (Domain Name System) information is propagated similar to the way DNS (Domain Name System) information is propagated
over the Internet. The openldap package contains configuration files, over the Internet. The openldap package contains configuration files,
libraries and documentation for OpenLDAP. libraries, and documentation for OpenLDAP.
%package devel %package devel
Summary: OpenLDAP development libraries and header files. Summary: OpenLDAP development libraries and header files.
@ -54,7 +55,7 @@ Requires: openldap = %{version}-%{release}
%description devel %description devel
The openldap-devel package includes the development libraries and The openldap-devel package includes the development libraries and
header files needed for compiling applications that use LDAP 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 protocols for enabling directory services over the Internet. Install
this package only if you plan to develop or will need to compile this package only if you plan to develop or will need to compile
customized LDAP clients. customized LDAP clients.
@ -65,13 +66,13 @@ Prereq: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/us
Group: System Environment/Daemons Group: System Environment/Daemons
%description servers %description servers
OpenLDAP is an open source suite of LDAP (Lightweight Directory Access 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 protocols for accessing directory services (usually phone book style
information, but other information is possible) over the Internet, information, but other information is possible) over the Internet,
similar to the way DNS (Domain Name System) information is propagated similar to the way DNS (Domain Name System) information is propagated
over the Internet. This package contains the slapd and slurpd servers, over the Internet. This package contains the slapd and slurpd servers,
migration scripts and related files. migration scripts, and related files.
%package clients %package clients
Summary: Client programs for OpenLDAP. Summary: Client programs for OpenLDAP.
@ -79,12 +80,12 @@ Prereq: openldap = %{version}-%{release}
Group: Applications/Internet Group: Applications/Internet
%description clients %description clients
OpenLDAP is an open source suite of LDAP (Lightweight Directory Access 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 protocols for accessing directory services (usually phone book style
information, but other information is possible) over the Internet, information, but other information is possible) over the Internet,
similar to the way DNS (Domain Name System) information is propagated 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. programs needed for accessing and modifying OpenLDAP directories.
%prep %prep
@ -99,7 +100,7 @@ programs needed for accessing and modifying OpenLDAP directories.
%patch7 -p1 -b .ldaprc %patch7 -p1 -b .ldaprc
%patch8 -p1 -b .debug %patch8 -p1 -b .debug
%patch9 -p1 -b .libtool %patch9 -p1 -b .libtool
#%patch10 -p1 -b .linkage %patch10 -p1 -b .linkage
pushd MigrationTools-%{migtools_ver} pushd MigrationTools-%{migtools_ver}
%patch11 -p1 -b .instdir %patch11 -p1 -b .instdir
%patch12 -p1 -b .mktemp %patch12 -p1 -b .mktemp
@ -146,7 +147,7 @@ configure_flags='
--enable-spasswd --enable-spasswd
--libexecdir=%{_sbindir} --libexecdir=%{_sbindir}
--localstatedir=%{_var}/run' --localstatedir=/%{_var}/run'
%configure ${configure_flags} --without-slapd --with-slurpd --without-ldapd --with-threads --disable-shared --enable-static %configure ${configure_flags} --without-slapd --with-slurpd --without-ldapd --with-threads --disable-shared --enable-static
make depend make depend
@ -162,11 +163,15 @@ make
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT
# libtool loves relinking shared libraries
rm -f libraries/*/*.la
make
%makeinstall \ %makeinstall \
datadir=$RPM_BUILD_ROOT%{_datadir}/openldap \ datadir=$RPM_BUILD_ROOT%{_datadir}/openldap \
libexecdir=$RPM_BUILD_ROOT%{_sbindir} \ libexecdir=$RPM_BUILD_ROOT%{_sbindir} \
localstatedir=%{_var}/run \ localstatedir=/%{_var}/run \
sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/openldap sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/openldap $@
install -m755 slurpd.semistatic $RPM_BUILD_ROOT%{_sbindir}/slurpd install -m755 slurpd.semistatic $RPM_BUILD_ROOT%{_sbindir}/slurpd
# hack the default config files # 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.` ln -sf ${lib} `basename ${lib} | cut -f1,2 -d.`
done 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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -315,8 +325,18 @@ fi
%attr(0644,root,root) %{_mandir}/man3/* %attr(0644,root,root) %{_mandir}/man3/*
%changelog %changelog
* Thu Jul 26 2001 Nalin Dahyabhai <nalin@redhat.com> * Thu Aug 9 2001 Nalin Dahyabhai <nalin@redhat.com>
- remove "reload" option from init script, which actually stopped the servers - 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 <nalin@redhat.com>
- 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 <nalin@redhat.com>
- require cyrus-sasl-md5 (support for DIGEST-MD5 is required for RFC
compliance) by name (follows from #43079)
* Fri Jul 20 2001 Nalin Dahyabhai <nalin@redhat.com> * Fri Jul 20 2001 Nalin Dahyabhai <nalin@redhat.com>
- enable passwd back-end (noted by Alan Sparks and Sergio Kessler) - enable passwd back-end (noted by Alan Sparks and Sergio Kessler)