auto-import changelog data from openldap-2.1.22-8.src.rpm
* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-8 - add another section to the ABI note for the TLS libdb so that it's marked as not needing an executable stack (from Arjan Van de Ven) * Thu Oct 16 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-7 - force bundled libdb to not use O_DIRECT by making it forget that we have it * Wed Oct 15 2003 Nalin Dahyabhai <nalin@redhat.com> - build bundled libdb for slapd dynamically to make the package smaller, among other things - on tls-capable arches, build libdb both with and without shared posix mutexes, otherwise just without - disable posix mutexes unconditionally for db 4.0, which shouldn't need them for the migration cases where it's used - update to MigrationTools 45 * Fri Sep 12 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-6 - drop rfc822-MailMember.schema, merged into upstream misc.schema at some point * Wed Aug 27 2003 Nalin Dahyabhai <nalin@redhat.com> - actually require newer libtool, as was intended back in 2.1.22-0, noted as missed by Jim Richardson * Fri Jul 25 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-5 - enable rlookups, they don't cost anything unless also enabled in slapd's configuration file * Tue Jul 22 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-4 - rebuild * Thu Jul 17 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-3 - rebuild * Wed Jul 16 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-2 - rebuild * Tue Jul 15 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-1 - build * Mon Jul 14 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-0 - 2.1.22 now badged stable - be more aggressive in what we index by default - use/require libtool 1.5 * Mon Jun 30 2003 Nalin Dahyabhai <nalin@redhat.com> - update to 2.1.22 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> - rebuilt * Tue Jun 03 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-1 - update to 2.1.21 - enable ldap, meta, monitor, null, rewrite in slapd * Mon May 19 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-1 - update to 2.1.20 * Thu May 08 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-1 - update to 2.1.19 * Mon May 05 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.17-1 - switch to db with crypto * Fri May 02 2003 Nalin Dahyabhai <nalin@redhat.com> - install the db utils for the bundled libdb as %{_sbindir}/slapd_db_* - install slapcat/slapadd from 2.0.x for migration purposes * Wed Apr 30 2003 Nalin Dahyabhai <nalin@redhat.com> - update to 2.1.17 - disable the shell backend, not expected to work well with threads - drop the kerberosSecurityObject schema, the krbName attribute it contains is only used if slapd is built with v2 kbind support
This commit is contained in:
parent
2649de128c
commit
fa9c485527
@ -1,3 +1,7 @@
|
|||||||
MigrationTools-44.tar.gz
|
MigrationTools-45.tar.gz
|
||||||
|
autoconf-2.13.1.tar.gz
|
||||||
|
automake-1.4a.tar.gz
|
||||||
db-4.0.14.tar.gz
|
db-4.0.14.tar.gz
|
||||||
|
db-4.1.25.tar.gz
|
||||||
openldap-2.0.27.tgz
|
openldap-2.0.27.tgz
|
||||||
|
openldap-2.1.22.tgz
|
||||||
|
@ -2,34 +2,35 @@ Try adding the top-level object, which may be missing, but don't worry if
|
|||||||
the add operation fails.
|
the add operation fails.
|
||||||
--- MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:27:02 2000
|
--- MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:27:02 2000
|
||||||
+++ MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:30:11 2000
|
+++ MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:30:11 2000
|
||||||
@@ -179,5 +179,30 @@
|
@@ -179,5 +179,31 @@
|
||||||
echo "Migrating netgroups (by host)..."
|
echo "Migrating netgroups (by host)..."
|
||||||
$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
|
$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
|
||||||
|
|
||||||
+# Try to add the top-level object, because it's usually missing.
|
+# Try to add the top-level object, because it's frequently missing.
|
||||||
+TYPE=`echo $LDAP_BASEDN | cut -f1 -d=`
|
+NAMINGATTRNAME=`echo $LDAP_BASEDN | cut -f1 -d=`
|
||||||
+TOP=`echo $LDAP_BASEDN | cut -f1 -d, | cut -f2 -d=`
|
+NAMINGATTRVALUE=`echo $LDAP_BASEDN | cut -f1 -d, | cut -f2 -d=`
|
||||||
+CLASS=$TYPE
|
+OBJECTCLASS=
|
||||||
+if [ "$CLASS" = "dc" ] ; then
|
+case "$NAMINGATTRNAME" in
|
||||||
+ CLASS=domain
|
+ dc) OBJECTCLASS=domain;;
|
||||||
+elif [ "$CLASS" = "o" ] ; then
|
+ o) OBJECTCLASS=organization;;
|
||||||
+ CLASS=organization
|
+ l) OBJECTCLASS=locality;;
|
||||||
+elif [ "$CLASS" = "l" ] ; then
|
+ c) OBJECTCLASS=country;;
|
||||||
+ CLASS=locality
|
+ nismapname) OBJECTCLASS=nisMap;;
|
||||||
+elif [ "$CLASS" = "c" ] ; then
|
+ cn) OBJECTCLASS=container;;
|
||||||
+ CLASS=country
|
+esac
|
||||||
+elif [ "$CLASS" = "nismapname" ] ; then
|
|
||||||
+ CLASS=nisMap
|
|
||||||
+elif [ "$CLASS" = "cn" ] ; then
|
|
||||||
+ CLASS=container
|
|
||||||
+fi
|
|
||||||
+
|
+
|
||||||
|
+if test -n "$NAMINGATTRNAME" ; then
|
||||||
|
+if test -n "$NAMINGATTRVALUE" ; then
|
||||||
|
+if test -n "$OBJECTCLASS" ; then
|
||||||
+cat << EOF | $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -x -w "$LDAP_BINDCRED"
|
+cat << EOF | $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -x -w "$LDAP_BINDCRED"
|
||||||
+dn: $LDAP_BASEDN
|
+dn: $LDAP_BASEDN
|
||||||
+$TYPE: $TOP
|
+$NAMINGATTRNAME: $NAMINGATTRVALUE
|
||||||
+objectClass: top
|
+objectClass: top
|
||||||
+objectClass: $CLASS
|
+objectClass: $OBJECTCLASS
|
||||||
+EOF
|
+EOF
|
||||||
|
+fi
|
||||||
|
+fi
|
||||||
|
+fi
|
||||||
+
|
+
|
||||||
echo "Importing into LDAP..."
|
echo "Importing into LDAP..."
|
||||||
|
|
||||||
|
@ -14,9 +14,9 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
- $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
|
- $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" -f $DB
|
||||||
- fi
|
- fi
|
||||||
+if [ `basename $LDAPADD` = "slapadd" ]; then
|
+if [ `basename $LDAPADD` = "slapadd" ]; then
|
||||||
+ $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" $@ -f $DB
|
+ $LDAPADD -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
|
||||||
+else
|
+else
|
||||||
+ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" $@ -f $DB
|
+ $LDAPADD -x -h $LDAPHOST -D "$LDAP_BINDDN" -w "$LDAP_BINDCRED" "$@" -f $DB
|
||||||
+fi
|
+fi
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
@ -28,7 +28,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
|
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
|
||||||
|
|
||||||
-. ${INSTDIR}migrate_all_online.sh
|
-. ${INSTDIR}migrate_all_online.sh
|
||||||
+. ${INSTDIR}migrate_all_online.sh $@
|
+. ${INSTDIR}migrate_all_online.sh "$@"
|
||||||
|
|
||||||
rm -f $ETC_PASSWD
|
rm -f $ETC_PASSWD
|
||||||
rm -f $ETC_GROUP
|
rm -f $ETC_GROUP
|
||||||
@ -39,10 +39,10 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
echo "Preparing LDAP database..."
|
echo "Preparing LDAP database..."
|
||||||
if [ "X$SLAPADD" = "X" ]; then
|
if [ "X$SLAPADD" = "X" ]; then
|
||||||
- $LDIF2LDBM -i $DB
|
- $LDIF2LDBM -i $DB
|
||||||
+ $LDIF2LDBM -i $DB $@
|
+ $LDIF2LDBM -i $DB "$@"
|
||||||
else
|
else
|
||||||
- $SLAPADD -l $DB
|
- $SLAPADD -l $DB
|
||||||
+ $SLAPADD -l $DB $@
|
+ $SLAPADD -l $DB "$@"
|
||||||
fi
|
fi
|
||||||
EXITCODE=$?
|
EXITCODE=$?
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
|
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
|
||||||
|
|
||||||
-. ${INSTDIR}migrate_all_offline.sh
|
-. ${INSTDIR}migrate_all_offline.sh
|
||||||
+. ${INSTDIR}migrate_all_offline.sh $@
|
+. ${INSTDIR}migrate_all_offline.sh "$@"
|
||||||
|
|
||||||
rm -f $ETC_PASSWD
|
rm -f $ETC_PASSWD
|
||||||
rm -f $ETC_GROUP
|
rm -f $ETC_GROUP
|
||||||
@ -64,7 +64,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
niscat mail_aliases.org_dir > $ETC_ALIASES
|
niscat mail_aliases.org_dir > $ETC_ALIASES
|
||||||
|
|
||||||
-. ${INSTDIR}migrate_all_online.sh
|
-. ${INSTDIR}migrate_all_online.sh
|
||||||
+. ${INSTDIR}migrate_all_online.sh $@
|
+. ${INSTDIR}migrate_all_online.sh "$@"
|
||||||
|
|
||||||
rm -f $ETC_PASSWD
|
rm -f $ETC_PASSWD
|
||||||
rm -f $ETC_GROUP
|
rm -f $ETC_GROUP
|
||||||
@ -75,7 +75,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
nidump aliases $DOM > $ETC_ALIASES
|
nidump aliases $DOM > $ETC_ALIASES
|
||||||
|
|
||||||
-. ${INSTDIR}migrate_all_online.sh
|
-. ${INSTDIR}migrate_all_online.sh
|
||||||
+. ${INSTDIR}migrate_all_online.sh $@
|
+. ${INSTDIR}migrate_all_online.sh "$@"
|
||||||
|
|
||||||
rm -f $ETC_PASSWD
|
rm -f $ETC_PASSWD
|
||||||
rm -f $ETC_GROUP
|
rm -f $ETC_GROUP
|
||||||
@ -86,7 +86,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
nidump aliases $DOM > $ETC_ALIASES
|
nidump aliases $DOM > $ETC_ALIASES
|
||||||
|
|
||||||
-. ${INSTDIR}migrate_all_offline.sh
|
-. ${INSTDIR}migrate_all_offline.sh
|
||||||
+. ${INSTDIR}migrate_all_offline.sh $@
|
+. ${INSTDIR}migrate_all_offline.sh "$@"
|
||||||
|
|
||||||
rm -f $ETC_PASSWD
|
rm -f $ETC_PASSWD
|
||||||
rm -f $ETC_GROUP
|
rm -f $ETC_GROUP
|
||||||
@ -97,7 +97,7 @@ Allow the calling user to pass in arguments to ldapadd/ldapmodify.
|
|||||||
niscat mail_aliases.org_dir > $ETC_ALIASES
|
niscat mail_aliases.org_dir > $ETC_ALIASES
|
||||||
|
|
||||||
-. ${INSTDIR}migrate_all_offline.sh
|
-. ${INSTDIR}migrate_all_offline.sh
|
||||||
+. ${INSTDIR}migrate_all_offline.sh $@
|
+. ${INSTDIR}migrate_all_offline.sh "$@"
|
||||||
|
|
||||||
rm -f $ETC_PASSWD
|
rm -f $ETC_PASSWD
|
||||||
rm -f $ETC_GROUP
|
rm -f $ETC_GROUP
|
||||||
|
@ -1,15 +1,10 @@
|
|||||||
The OpenLDAP on-disk format has changed between the 1.2.x and 2.0.x releases.
|
The OpenLDAP on-disk format has changed between the 2.0.x and 2.1.x releases.
|
||||||
|
|
||||||
You will very likely need to dump out your directory to a text file using
|
If you are upgrading a server from OpenLDAP 2.0.x, you will very need to dump
|
||||||
"ldbmcat -n" before upgrading and re-import the entries into the new format
|
out your directory to a text file using "slapcat -n" before upgrading and
|
||||||
using "slapadd" after the upgrade.
|
re-import the entries into the new format using "slapadd" after the upgrade.
|
||||||
|
|
||||||
Because schema checking is now available and enabled by default, some entries
|
Because schema checking is now more restrictive, some entries may not import
|
||||||
may not import cleanly. In particular, if you have used previous versions of
|
cleanly. In particular, if you have used previous versions of the migration
|
||||||
the migration scripts, some of the entries (particularly oncRpc objects) may
|
scripts, some of the entries (particularly oncRpc objects) may be missing
|
||||||
be missing "description" attributes which are now required by the schema.
|
"description" attributes which are now required by the schema.
|
||||||
|
|
||||||
If this is the case, you will need to either edit the LDIF files prior to
|
|
||||||
importing them, or add "schemacheck off" to your new slapd.conf file to disable
|
|
||||||
schema checking while the entries are being imported. (Disabling schema
|
|
||||||
checking on your server is strongly discouraged, however.)
|
|
||||||
|
1287
guide.html
1287
guide.html
File diff suppressed because it is too large
Load Diff
@ -37,10 +37,10 @@ function start() {
|
|||||||
prog=`basename ${slapd}`
|
prog=`basename ${slapd}`
|
||||||
echo -n $"Starting $prog: "
|
echo -n $"Starting $prog: "
|
||||||
if grep -q ^TLS /etc/openldap/slapd.conf ; then
|
if grep -q ^TLS /etc/openldap/slapd.conf ; then
|
||||||
daemon ${slapd} -u ldap -h '"ldap:/// ldaps:///"' $OPTIONS $SLAPD_OPTIONS
|
daemon ${slapd} -u ldap -h '"ldap:/// ldaps:///"' -l daemon $OPTIONS $SLAPD_OPTIONS
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
else
|
else
|
||||||
daemon ${slapd} -u ldap $OPTIONS $SLAPD_OPTIONS
|
daemon ${slapd} -u ldap -h "ldap:///" -l daemon $OPTIONS $SLAPD_OPTIONS
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
fi
|
fi
|
||||||
echo
|
echo
|
||||||
|
21
nptl-abi-note.S
Normal file
21
nptl-abi-note.S
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
/* Gleaned from glibc, though I suppose it's documented in the specs, too.
|
||||||
|
NPTL requires support that isn't in kernels prior to 2.4.20 (or 2.5.36 if
|
||||||
|
you're not using a backported TLS implementation in your kernel), but ld.so
|
||||||
|
will try to use this library on an insufficiently-new system unless we make
|
||||||
|
a note of the required kernel version here.
|
||||||
|
We also add in a section which marks the library as not needing an
|
||||||
|
executable stack to avoid unintentionally disabling exec-shield and the
|
||||||
|
like (thanks Arjan!). */
|
||||||
|
.section ".note.ABI-tag", "a"
|
||||||
|
.p2align 2
|
||||||
|
.long 1f - 0f
|
||||||
|
.long 3f - 2f
|
||||||
|
.long 1
|
||||||
|
0: .asciz "GNU"
|
||||||
|
1: .p2align 2
|
||||||
|
2: .long 0
|
||||||
|
.long 2,4,20
|
||||||
|
3: .p2align 2
|
||||||
|
|
||||||
|
.section .note.GNU-stack, "", @progbits
|
||||||
|
.previous
|
501
openldap.spec
501
openldap.spec
@ -1,44 +1,46 @@
|
|||||||
%define migtools_ver 44
|
%define migtools_version 45
|
||||||
%define db_version 4.0.14
|
%define db_version 4.1.25
|
||||||
%define ldbm_backend gdbm
|
%define db_version_40 4.0.14
|
||||||
#%define ldbm_backend berkeley
|
%define ldbm_backend berkeley
|
||||||
|
%define version_20 2.0.27
|
||||||
|
%define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
|
||||||
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.27
|
Version: 2.1.22
|
||||||
Release: 8
|
Release: 8
|
||||||
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
|
||||||
Source1: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz
|
Source1: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_20}.tgz
|
||||||
Source2: ldap.init
|
Source2: ftp://ftp.OpenLDAP.org/pub/tools/autoconf-2.13.1.tar.gz
|
||||||
Source3: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_ver}.tar.gz
|
Source3: ftp://ftp.OpenLDAP.org/pub/tools/automake-1.4a.tar.gz
|
||||||
Source4: migration-tools.txt
|
Source4: http://www.sleepycat.com/update/snapshot/db-%{db_version}.tar.gz
|
||||||
Source5: rfc822-MailMember.schema
|
Source5: http://www.sleepycat.com/update/snapshot/db-%{db_version_40}.tar.gz
|
||||||
Source6: autofs.schema
|
Source6: ldap.init
|
||||||
Source7: kerberosobject.schema
|
Source7: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz
|
||||||
Source8: README.upgrading
|
Source8: migration-tools.txt
|
||||||
Source9: README.sendbuf
|
Source10: autofs.schema
|
||||||
Source10: http://www.OpenLDAP.org/doc/admin/guide.html
|
Source11: README.upgrading
|
||||||
Patch0: openldap-2.0.16-config.patch
|
Source12: http://www.OpenLDAP.org/doc/admin/guide.html
|
||||||
Patch1: openldap-2.0.12-redhat.patch
|
Source13: nptl-abi-note.S
|
||||||
|
Patch0: openldap-2.1.17-config.patch
|
||||||
|
Patch1: openldap-2.1.17-string.patch
|
||||||
Patch2: openldap-1.2.11-cldap.patch
|
Patch2: openldap-1.2.11-cldap.patch
|
||||||
Patch3: openldap-2.0.3-syslog.patch
|
Patch3: openldap-2.1.17-syslog.patch
|
||||||
Patch6: openldap-2.0.23-sendbuf.patch
|
Patch4: openldap-2.0.11-ldaprc.patch
|
||||||
Patch7: openldap-2.0.11-ldaprc.patch
|
Patch5: openldap-2.1.17-susesec.patch
|
||||||
Patch8: openldap-2.0.11-debug.patch
|
Patch11: http://www.sleepycat.com/update/4.1.25/patch.4.1.25.1
|
||||||
Patch9: openldap-2.0.11-libtool.patch
|
Patch12: db-4.0.14-disable-mutex.patch
|
||||||
Patch10: openldap-2.0.11-linkage.patch
|
Patch13: db-4.0.14-libobjs.patch
|
||||||
Patch21: MigrationTools-38-instdir.patch
|
Patch21: MigrationTools-38-instdir.patch
|
||||||
Patch22: MigrationTools-36-mktemp.patch
|
Patch22: MigrationTools-36-mktemp.patch
|
||||||
Patch23: MigrationTools-27-simple.patch
|
Patch23: MigrationTools-27-simple.patch
|
||||||
Patch24: MigrationTools-26-suffix.patch
|
Patch24: MigrationTools-26-suffix.patch
|
||||||
Patch25: MigrationTools-44-schema.patch
|
Patch25: MigrationTools-44-schema.patch
|
||||||
Patch26: openldap-2.0.27-susesec.patch
|
|
||||||
URL: http://www.openldap.org/
|
URL: http://www.openldap.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildPreReq: cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel
|
BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5, krb5-devel
|
||||||
BuildPreReq: pam-devel, perl, pkgconfig >= 0.14.0-3, tcp_wrappers
|
BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers
|
||||||
BuildPreReq: libtool >= 1.4
|
|
||||||
Requires: cyrus-sasl, cyrus-sasl-md5, mktemp
|
Requires: cyrus-sasl, cyrus-sasl-md5, mktemp
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -53,7 +55,7 @@ libraries, and documentation for OpenLDAP.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: OpenLDAP development libraries and header files.
|
Summary: OpenLDAP development libraries and header files.
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: openldap = %{version}-%{release}
|
Requires: openldap = %{version}-%{release}, cyrus-sasl-devel >= 2.1
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The openldap-devel package includes the development libraries and
|
The openldap-devel package includes the development libraries and
|
||||||
@ -92,57 +94,185 @@ 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
|
||||||
%setup -q -a 1 -a 3
|
%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 7
|
||||||
|
|
||||||
%patch0 -p1 -b .config
|
%patch0 -p1 -b .config
|
||||||
%patch1 -p1 -b .redhat
|
%patch1 -p1 -b .redhat
|
||||||
%patch2 -p1 -b .cldap
|
%patch2 -p1 -b .cldap
|
||||||
%patch3 -p1 -b .syslog
|
%patch3 -p1 -b .syslog
|
||||||
%patch6 -p1 -b .sendbuf
|
%patch4 -p1 -b .ldaprc
|
||||||
%patch7 -p1 -b .ldaprc
|
%patch5 -p1 -b .susesec
|
||||||
%patch8 -p1 -b .debug
|
|
||||||
%patch9 -p1 -b .libtool
|
pushd db-%{db_version}
|
||||||
%patch10 -p1 -b .linkage
|
%patch11 -p0 -b .bdb
|
||||||
pushd MigrationTools-%{migtools_ver}
|
popd
|
||||||
|
pushd db-%{db_version_40}
|
||||||
|
%patch12 -p1 -b .disable-mutex
|
||||||
|
%patch13 -p1 -b .libobj
|
||||||
|
cd dist
|
||||||
|
./s_config
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd MigrationTools-%{migtools_version}
|
||||||
%patch21 -p1 -b .instdir
|
%patch21 -p1 -b .instdir
|
||||||
%patch22 -p1 -b .mktemp
|
%patch22 -p1 -b .mktemp
|
||||||
%patch23 -p1 -b .simple
|
%patch23 -p1 -b .simple
|
||||||
%patch24 -p1 -b .suffix
|
%patch24 -p1 -b .suffix
|
||||||
%patch25 -p1 -b .schema
|
%patch25 -p1 -b .schema
|
||||||
popd
|
popd
|
||||||
%patch26 -p0 -b .susesec
|
|
||||||
|
|
||||||
mkdir build-gdbm
|
pushd openldap-%{version_20}
|
||||||
ln -s ../configure build-gdbm
|
for subdir in build-gdbm build-db ; do
|
||||||
mkdir build-berkeley
|
mkdir $subdir
|
||||||
ln -s ../configure build-berkeley
|
ln -s ../configure $subdir
|
||||||
mkdir build-krb5
|
done
|
||||||
ln -s ../configure build-krb5
|
popd
|
||||||
mkdir build-clients
|
|
||||||
ln -s ../configure build-clients
|
for subdir in build-servers build-clients ; do
|
||||||
|
mkdir $subdir
|
||||||
|
ln -s ../configure $subdir
|
||||||
|
done
|
||||||
|
|
||||||
cp %{_datadir}/libtool/config.{sub,guess} build/
|
cp %{_datadir}/libtool/config.{sub,guess} build/
|
||||||
|
|
||||||
|
autodir=`pwd`/auto-instroot
|
||||||
|
pushd autoconf-2.13.1
|
||||||
|
./configure --prefix=$autodir
|
||||||
|
make all install
|
||||||
|
popd
|
||||||
|
pushd automake-1.4a
|
||||||
|
./configure --prefix=$autodir
|
||||||
|
make all install
|
||||||
|
popd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
autodir=`pwd`/auto-instroot
|
||||||
dbdir=`pwd`/db-instroot
|
dbdir=`pwd`/db-instroot
|
||||||
|
dbdir40=`pwd`/db-instroot-4.0
|
||||||
|
libtool='%{_bindir}/libtool'
|
||||||
|
tagname=CC; export tagname
|
||||||
|
|
||||||
|
PATH=${autodir}/bin:${PATH}
|
||||||
|
|
||||||
%ifarch ia64
|
%ifarch ia64
|
||||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Set CFLAGS to incorporate RPM_OPT_FLAGS.
|
||||||
|
CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
|
||||||
|
|
||||||
|
# Build the 2.0 server tools for dumping out old on-disk databases. This
|
||||||
|
# requires Berkeley DB 4.0.x (which we must build) and gdbm.
|
||||||
|
pushd db-%{db_version_40}/dist
|
||||||
|
./configure -C \
|
||||||
|
--with-pic \
|
||||||
|
--disable-shared \
|
||||||
|
--with-uniquename=_openldap_rhl_40 \
|
||||||
|
--prefix=${dbdir40} \
|
||||||
|
--libdir=${dbdir40}/%{_lib}
|
||||||
|
make %{_smp_mflags}
|
||||||
|
make install
|
||||||
|
popd
|
||||||
|
|
||||||
|
CPPFLAGS="-I${dbdir40}/include" ; export CPPFLAGS
|
||||||
|
LDFLAGS="-L${dbdir40}/%{_lib}" ; export LDFLAGS
|
||||||
|
|
||||||
|
pushd openldap-%{version_20}
|
||||||
|
pushd build-gdbm
|
||||||
|
./configure \
|
||||||
|
--prefix=%{_prefix} \
|
||||||
|
--disable-shared \
|
||||||
|
--without-cyrus-sasl \
|
||||||
|
--without-kerberos \
|
||||||
|
--without-threads \
|
||||||
|
--without-tls \
|
||||||
|
--enable-ldbm \
|
||||||
|
--with-ldbm-api=gdbm \
|
||||||
|
--program-suffix=-slapd-2.0-gdbm
|
||||||
|
make %{_smp_mflags}
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd build-db
|
||||||
|
LIBS=-lpthread \
|
||||||
|
./configure \
|
||||||
|
--prefix=%{_prefix} \
|
||||||
|
--disable-shared \
|
||||||
|
--without-cyrus-sasl \
|
||||||
|
--without-kerberos \
|
||||||
|
--without-threads \
|
||||||
|
--without-tls \
|
||||||
|
--enable-ldbm \
|
||||||
|
--with-ldbm-api=berkeley \
|
||||||
|
--program-suffix=-slapd-2.0-dbb
|
||||||
|
make %{_smp_mflags}
|
||||||
|
popd
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Build Berkeley DB and install it into a temporary area, isolating OpenLDAP
|
||||||
|
# from any future changes to the system-wide Berkeley DB library.
|
||||||
|
buildbdb() {
|
||||||
|
subdir=$1
|
||||||
|
shift
|
||||||
|
install -d db-%{db_version}/build-rpm${subdir:+-${subdir}}
|
||||||
|
pushd db-%{db_version}/build-rpm${subdir:+-${subdir}}
|
||||||
|
echo "${1:+db_cv_mutex=$1}" > config.cache
|
||||||
|
shift
|
||||||
|
../dist/configure -C \
|
||||||
|
--with-pic \
|
||||||
|
--disable-static \
|
||||||
|
--enable-shared \
|
||||||
|
--with-uniquename=_openldap_slapd_rhl \
|
||||||
|
--prefix=${dbdir} \
|
||||||
|
--libdir=${dbdir}/%{_lib}${subdir:+/${subdir}}
|
||||||
|
# XXX hack out O_DIRECT support in db4 for now.
|
||||||
|
perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h
|
||||||
|
if test -n "$nptl_lo" ; then
|
||||||
|
./libtool --mode=compile %{__cc} -o $nptl_lo -c $nptl_s
|
||||||
|
fi
|
||||||
|
make %{_smp_mflags} libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
|
||||||
|
make install libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
|
||||||
|
ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
# Build an NPTL libdb if we're on a Linux arch with NPTL. NPTL gives us the
|
||||||
|
# ability to share mutexes between threads in different processes, and to have
|
||||||
|
# threads in both honor those locks. We have to do this because if you build
|
||||||
|
# libdb with support for intra-process locks, it dies if you don't have it and
|
||||||
|
# the application has specified to libdb that it's multi-threaded (as slapd
|
||||||
|
# does).
|
||||||
|
%ifarch %{nptl_arches}
|
||||||
|
unset nptl_s nptl_lo
|
||||||
|
case %{_os} in
|
||||||
|
linux|Linux)
|
||||||
|
nptl_s=$RPM_SOURCE_DIR/nptl-abi-note.S
|
||||||
|
nptl_lo=nptl-abi-note.lo
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
buildbdb tls POSIX/pthreads/library
|
||||||
|
unset nptl_s nptl_lo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Build a non-NPTL libdb and tools, able to only use intra-process thread
|
||||||
|
# locks. Useless for bdb's purposes (bdb requires shared env support), but
|
||||||
|
# acceptable for ldbm.
|
||||||
|
buildbdb "" POSIX/pthreads/library/private
|
||||||
|
|
||||||
|
# Find OpenSSL's header and library dependencies.
|
||||||
if pkg-config openssl ; then
|
if pkg-config openssl ; then
|
||||||
OPENSSL_CPPFLAGS=`pkg-config --cflags openssl`
|
OPENSSL_CPPFLAGS=`pkg-config --cflags-only-I openssl`
|
||||||
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
||||||
OPENSSL_LDFLAGS=`pkg-config --libs-only-L openssl`
|
OPENSSL_LDFLAGS=`pkg-config --libs-only-L openssl`
|
||||||
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
|
|
||||||
TARGET_PLATFORM=%{_target_platform}
|
|
||||||
%define _target_platform --target=${TARGET_PLATFORM}
|
|
||||||
build() {
|
build() {
|
||||||
cat << _EOF | sed -e 's,--host=[^ ]*,,g' -e 's,--build=[^ ]*,,g' -e 's,--target=[^ ]*,,g' -e 's,%{_target_platform},,g' > run-build
|
CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
|
||||||
%configure \
|
%configure \
|
||||||
--with-slapd --with-slurpd --without-ldapd \
|
--with-slapd --with-slurpd --without-ldapd \
|
||||||
--with-threads=posix --enable-static \
|
--with-threads=posix --enable-static --enable-dynamic \
|
||||||
\
|
\
|
||||||
--enable-local --enable-cldap --disable-rlookups \
|
--enable-local --enable-cldap --enable-rlookups \
|
||||||
\
|
\
|
||||||
--with-tls \
|
--with-tls \
|
||||||
--with-cyrus-sasl \
|
--with-cyrus-sasl \
|
||||||
@ -150,7 +280,7 @@ cat << _EOF | sed -e 's,--host=[^ ]*,,g' -e 's,--build=[^ ]*,,g' -e 's,--target=
|
|||||||
--enable-wrappers \
|
--enable-wrappers \
|
||||||
\
|
\
|
||||||
--enable-passwd \
|
--enable-passwd \
|
||||||
--enable-shell \
|
\
|
||||||
--enable-cleartext \
|
--enable-cleartext \
|
||||||
--enable-crypt \
|
--enable-crypt \
|
||||||
--enable-spasswd \
|
--enable-spasswd \
|
||||||
@ -159,116 +289,109 @@ cat << _EOF | sed -e 's,--host=[^ ]*,,g' -e 's,--build=[^ ]*,,g' -e 's,--target=
|
|||||||
\
|
\
|
||||||
--libexecdir=%{_sbindir} \
|
--libexecdir=%{_sbindir} \
|
||||||
--localstatedir=/%{_var}/run \
|
--localstatedir=/%{_var}/run \
|
||||||
$@ \$@
|
$@
|
||||||
_EOF
|
make %{_smp_mflags} LIBTOOL="$libtool"
|
||||||
sh -x ./run-build %{_target_platform}
|
|
||||||
make depend %{_smp_mflags}
|
|
||||||
make %{_smp_mflags} LIBTOOL=libtool
|
|
||||||
}
|
}
|
||||||
# Build Berkeley DB and install it into a temporary area, isolating OpenLDAP
|
|
||||||
# from any future changes to the system-wide Berkeley DB library.
|
# Build the servers with Kerberos support (for password checking, mainly).
|
||||||
pushd db-%{db_version}/dist
|
CPPFLAGS="$OPENSSL_CPPFLAGS -I${dbdir}/include" ; export CPPFLAGS
|
||||||
./configure --with-pic --disable-shared --with-uniquename=_openldap_rhl --prefix=${dbdir} --libdir=${dbdir}/%{_lib}
|
LDFLAGS="$OPENSSL_LDFLAGS -L${dbdir}/%{_lib}" ; export LDFLAGS
|
||||||
make %{_smp_mflags}
|
pushd build-servers
|
||||||
make install
|
build \
|
||||||
popd
|
--enable-ldbm \
|
||||||
# Build one for tools which use gdbm.
|
--with-ldbm-api=%{ldbm_backend} \
|
||||||
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
--enable-bdb \
|
||||||
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
--enable-ldap \
|
||||||
pushd build-gdbm
|
--enable-meta \
|
||||||
build --enable-ldbm --with-ldbm-api=gdbm --disable-shared --without-kerberos
|
--enable-monitor \
|
||||||
popd
|
--enable-null \
|
||||||
# Build one for tools which use db.
|
--enable-rewrite \
|
||||||
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
--disable-shared \
|
||||||
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
--with-kerberos=k5only \
|
||||||
LIBS="-lpthread"; export LIBS
|
--with-cyrus-sasl \
|
||||||
CPPFLAGS="$CPPFLAGS -I${dbdir}/include"
|
--enable-kpasswd
|
||||||
LDFLAGS="$LDFLAGS -L${dbdir}/%{_lib}"
|
|
||||||
pushd build-berkeley
|
|
||||||
build --enable-ldbm --with-ldbm-api=berkeley --disable-shared --without-kerberos
|
|
||||||
popd
|
|
||||||
# Build the servers with Kerberos support and whichever backend we want. Even
|
|
||||||
# enable the bdb backend, which doesn't exist yet.
|
|
||||||
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
|
||||||
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
|
||||||
LIBS="-lpthread"; export LIBS
|
|
||||||
pushd build-krb5
|
|
||||||
CPPFLAGS="$CPPFLAGS -I${dbdir}/include -I%{_prefix}/kerberos/include -DHAVE_KERBEROS_V"
|
|
||||||
LDFLAGS="$LDFLAGS -L${dbdir}/%{_lib} -L%{_prefix}/kerberos/%{_lib}"
|
|
||||||
build --enable-ldbm --with-ldbm-api=%{ldbm_backend} --enable-bdb --disable-shared --with-kerberos=k5only --enable-kpasswd
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Build clients without Kerberos password-checking support, which is only
|
# Build clients without Kerberos password-checking support, which is only
|
||||||
# useful in the server anyway.
|
# useful in the server anyway, to avoid stray dependencies.
|
||||||
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
|
||||||
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
|
||||||
unset LIBS
|
unset LIBS
|
||||||
pushd build-clients
|
pushd build-clients
|
||||||
build --disable-ldbm --enable-shared --without-kerberos
|
build \
|
||||||
|
--disable-slapd \
|
||||||
|
--disable-slurpd \
|
||||||
|
--enable-shared \
|
||||||
|
--enable-static \
|
||||||
|
--without-kerberos \
|
||||||
|
--with-cyrus-sasl \
|
||||||
|
--with-pic
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
||||||
mkdir $RPM_BUILD_ROOT
|
libtool='%{_bindir}/libtool'
|
||||||
makeinstall() {
|
tagname=CC; export tagname
|
||||||
# libtool loves relinking shared libraries
|
# Install the 2.0 server tools for dumping out old on-disk databases.
|
||||||
# rm -f libraries/*/*.la
|
mkdir -p $RPM_BUILD_ROOT/%{_sbindir}/
|
||||||
make LIBTOOL=libtool
|
pushd openldap-%{version_20}
|
||||||
%makeinstall \
|
pushd build-gdbm/servers/slapd/tools
|
||||||
LIBTOOL=libtool \
|
for bin in slapadd slapcat ; do
|
||||||
datadir=$RPM_BUILD_ROOT%{_datadir}/openldap \
|
$libtool --mode=install install -m755 $bin $RPM_BUILD_ROOT/%{_sbindir}/$bin-slapd-2.0-gdbm
|
||||||
libexecdir=$RPM_BUILD_ROOT%{_sbindir} \
|
done
|
||||||
localstatedir=/%{_var}/run \
|
|
||||||
sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/openldap $@
|
|
||||||
}
|
|
||||||
|
|
||||||
# Install compatibility binaries.
|
|
||||||
pushd build-gdbm
|
|
||||||
makeinstall -C servers/slapd/tools
|
|
||||||
mv $RPM_BUILD_ROOT%{_sbindir}/slapadd $RPM_BUILD_ROOT%{_sbindir}/slapadd-gdbm
|
|
||||||
mv $RPM_BUILD_ROOT%{_sbindir}/slapcat $RPM_BUILD_ROOT%{_sbindir}/slapcat-gdbm
|
|
||||||
popd
|
popd
|
||||||
if [ %{ldbm_backend} != gdbm ] ; then
|
|
||||||
pushd build-berkeley
|
|
||||||
makeinstall -C servers/slapd/tools
|
|
||||||
mv $RPM_BUILD_ROOT%{_sbindir}/slapadd $RPM_BUILD_ROOT%{_sbindir}/slapadd-berkeley
|
|
||||||
mv $RPM_BUILD_ROOT%{_sbindir}/slapcat $RPM_BUILD_ROOT%{_sbindir}/slapcat-berkeley
|
|
||||||
popd
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install clients and libraries.
|
pushd build-db/servers/slapd/tools
|
||||||
|
for bin in slapadd slapcat ; do
|
||||||
|
$libtool --mode=install install -m755 $bin $RPM_BUILD_ROOT/%{_sbindir}/$bin-slapd-2.0-dbb
|
||||||
|
done
|
||||||
|
popd
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Install servers.
|
||||||
|
%ifarch %{nptl_arches}
|
||||||
|
pushd db-instroot/%{_lib}/tls/
|
||||||
|
install -d $RPM_BUILD_ROOT/%{_libdir}/tls/
|
||||||
|
install -m755 libslapd_db-*.*.so $RPM_BUILD_ROOT/%{_libdir}/tls/
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
pushd db-instroot/%{_lib}/
|
||||||
|
install -d $RPM_BUILD_ROOT/%{_libdir}/
|
||||||
|
install -m755 libslapd_db-*.*.so $RPM_BUILD_ROOT/%{_libdir}/
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd build-servers
|
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Install the bdb maintenance tools.
|
||||||
|
pushd db-instroot/bin
|
||||||
|
for binary in db_* ; do
|
||||||
|
install -m755 ${binary} $RPM_BUILD_ROOT/%{_sbindir}/slapd_${binary}
|
||||||
|
done
|
||||||
|
popd
|
||||||
|
|
||||||
|
# Install clients and shared libraries.
|
||||||
pushd build-clients
|
pushd build-clients
|
||||||
makeinstall
|
make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Install servers with Kerberos support.
|
|
||||||
pushd build-krb5
|
|
||||||
makeinstall -C servers
|
|
||||||
popd
|
|
||||||
|
|
||||||
# Set the right set of slap... tools for the server.
|
|
||||||
ln -f $RPM_BUILD_ROOT%{_sbindir}/slapadd-%{ldbm_backend} $RPM_BUILD_ROOT%{_sbindir}/slapadd
|
|
||||||
ln -f $RPM_BUILD_ROOT%{_sbindir}/slapcat-%{ldbm_backend} $RPM_BUILD_ROOT%{_sbindir}/slapcat
|
|
||||||
|
|
||||||
# Install the padl.com migration tools.
|
# Install the padl.com migration tools.
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/migration
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/migration
|
||||||
install -m 755 MigrationTools-%{migtools_ver}/migrate_* \
|
install -m 755 MigrationTools-%{migtools_version}/migrate_* \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/openldap/migration
|
$RPM_BUILD_ROOT%{_datadir}/openldap/migration/
|
||||||
install -m 644 MigrationTools-%{migtools_ver}/README %{SOURCE4} \
|
install -m 644 MigrationTools-%{migtools_version}/README \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/openldap/migration
|
$RPM_SOURCE_DIR/migration-tools.txt \
|
||||||
cp MigrationTools-%{migtools_ver}/README README.migration
|
$RPM_BUILD_ROOT%{_datadir}/openldap/migration/
|
||||||
cp %{SOURCE4} TOOLS.migration
|
cp MigrationTools-%{migtools_version}/README README.migration
|
||||||
|
cp $RPM_SOURCE_DIR/migration-tools.txt TOOLS.migration
|
||||||
# try to build saucer, but don't fret if we can't
|
|
||||||
if make -C contrib/saucer ; then
|
|
||||||
./libtool install -m755 contrib/saucer/saucer $RPM_BUILD_ROOT%{_bindir}/
|
|
||||||
./libtool install -m644 contrib/saucer/saucer.1 $RPM_BUILD_ROOT%{_mandir}/man1/
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create the data directory.
|
# Create the data directory.
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/lib/ldap
|
mkdir -p $RPM_BUILD_ROOT/var/lib/ldap
|
||||||
|
|
||||||
# Hack the build root out of the default config files.
|
# Hack the build root out of the default config files.
|
||||||
perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.conf
|
perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/*.conf
|
||||||
|
|
||||||
# Get the buildroot out of the man pages.
|
# Get the buildroot out of the man pages.
|
||||||
perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/*/*.*
|
perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/*/*.*
|
||||||
@ -278,7 +401,7 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/*.default
|
|||||||
|
|
||||||
# Install an init script for the server.
|
# Install an init script for the server.
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
||||||
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
|
install -m 755 $RPM_SOURCE_DIR/ldap.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
|
||||||
|
|
||||||
# If ldapadd and ldapmodify are the same binary, make them a hard link
|
# If ldapadd and ldapmodify are the same binary, make them a hard link
|
||||||
if cmp $RPM_BUILD_ROOT%{_bindir}/ldapadd $RPM_BUILD_ROOT%{_bindir}/ldapmodify ; then
|
if cmp $RPM_BUILD_ROOT%{_bindir}/ldapadd $RPM_BUILD_ROOT%{_bindir}/ldapmodify ; then
|
||||||
@ -287,13 +410,15 @@ fi
|
|||||||
|
|
||||||
# Add some more schema for the sake of migration scripts.
|
# Add some more schema for the sake of migration scripts.
|
||||||
install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat
|
install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat
|
||||||
install -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/
|
install -m644 \
|
||||||
|
$RPM_SOURCE_DIR/autofs.schema \
|
||||||
|
$RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/
|
||||||
|
|
||||||
# Tweak permissions on the libraries to make sure they're correct.
|
# Tweak permissions on the libraries to make sure they're correct.
|
||||||
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
|
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so*
|
||||||
chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
|
chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
|
||||||
|
|
||||||
# Remove files we don't want packaged.
|
# Remove files which we don't want packaged.
|
||||||
rm -f $RPM_BUILD_ROOT/%{_datadir}/openldap/migration/*.{instdir,simple,schema,mktemp,suffix}
|
rm -f $RPM_BUILD_ROOT/%{_datadir}/openldap/migration/*.{instdir,simple,schema,mktemp,suffix}
|
||||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||||
|
|
||||||
@ -318,6 +443,7 @@ if /usr/sbin/useradd -c "LDAP User" -u 55 \
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%post servers
|
%post servers
|
||||||
|
/sbin/ldconfig
|
||||||
/sbin/chkconfig --add ldap
|
/sbin/chkconfig --add ldap
|
||||||
exec > /dev/null 2> /dev/null
|
exec > /dev/null 2> /dev/null
|
||||||
if [ ! -f %{_datadir}/ssl/certs/slapd.pem ] ; then
|
if [ ! -f %{_datadir}/ssl/certs/slapd.pem ] ; then
|
||||||
@ -355,24 +481,25 @@ fi
|
|||||||
%doc ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README doc/rfc
|
%doc ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README doc/rfc
|
||||||
%attr(0755,root,root) %dir /etc/openldap
|
%attr(0755,root,root) %dir /etc/openldap
|
||||||
%attr(0644,root,root) %config(noreplace) /etc/openldap/ldap*.conf
|
%attr(0644,root,root) %config(noreplace) /etc/openldap/ldap*.conf
|
||||||
%attr(0755,root,root) %{_libdir}/lib*.so.*
|
%attr(0755,root,root) %{_libdir}/libl*.so.*
|
||||||
%attr(0644,root,root) %{_mandir}/man5/*
|
%attr(0644,root,root) %{_mandir}/man5/*
|
||||||
%attr(0755,root,root) %dir %{_datadir}/openldap
|
%attr(0755,root,root) %dir %{_datadir}/openldap
|
||||||
%attr(0644,root,root) %{_datadir}/openldap/ldapfriendly
|
%attr(0755,root,root) %dir %{_datadir}/openldap/ucdata
|
||||||
|
%attr(0644,root,root) %dir %{_datadir}/openldap/ucdata/*
|
||||||
|
|
||||||
%files servers
|
%files servers
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc README.migration TOOLS.migration
|
%doc README.migration TOOLS.migration
|
||||||
%doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/README.sendbuf $RPM_SOURCE_DIR/guide.html
|
%doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/guide.html
|
||||||
%attr(0755,root,root) %config /etc/rc.d/init.d/ldap
|
%attr(0755,root,root) %config /etc/rc.d/init.d/ldap
|
||||||
%attr(0640,root,ldap) %config(noreplace) /etc/openldap/slapd.conf
|
%attr(0640,root,ldap) %config(noreplace) /etc/openldap/slapd.conf
|
||||||
%attr(0755,root,root) %dir /etc/openldap/schema
|
%attr(0755,root,root) %dir /etc/openldap/schema
|
||||||
|
%attr(0644,root,root) %dir /etc/openldap/schema/README*
|
||||||
%attr(0644,root,root) %config(noreplace) /etc/openldap/schema/*.schema*
|
%attr(0644,root,root) %config(noreplace) /etc/openldap/schema/*.schema*
|
||||||
%attr(0755,root,root) %dir /etc/openldap/schema/redhat
|
%attr(0755,root,root) %dir /etc/openldap/schema/redhat
|
||||||
%attr(0644,root,root) %config(noreplace) /etc/openldap/schema/redhat/*.schema*
|
%attr(0644,root,root) %config(noreplace) /etc/openldap/schema/redhat/*.schema*
|
||||||
%attr(0755,root,root) %{_sbindir}/*
|
%attr(0755,root,root) %{_sbindir}/*
|
||||||
%attr(0644,root,root) %{_mandir}/man8/*
|
%attr(0644,root,root) %{_mandir}/man8/*
|
||||||
%attr(0644,root,root) %{_datadir}/openldap/*.help
|
|
||||||
%attr(0755,root,root) %dir %{_datadir}/openldap/migration
|
%attr(0755,root,root) %dir %{_datadir}/openldap/migration
|
||||||
%attr(0644,root,root) %{_datadir}/openldap/migration/README
|
%attr(0644,root,root) %{_datadir}/openldap/migration/README
|
||||||
%attr(0644,root,root) %config(noreplace) %{_datadir}/openldap/migration/*.ph
|
%attr(0644,root,root) %config(noreplace) %{_datadir}/openldap/migration/*.ph
|
||||||
@ -380,6 +507,10 @@ fi
|
|||||||
%attr(0755,root,root) %{_datadir}/openldap/migration/*.sh
|
%attr(0755,root,root) %{_datadir}/openldap/migration/*.sh
|
||||||
%attr(0644,root,root) %{_datadir}/openldap/migration/*.txt
|
%attr(0644,root,root) %{_datadir}/openldap/migration/*.txt
|
||||||
%attr(0700,ldap,ldap) %dir /var/lib/ldap
|
%attr(0700,ldap,ldap) %dir /var/lib/ldap
|
||||||
|
%attr(0755,root,root) %{_libdir}/libslapd_db-*.*.so
|
||||||
|
%ifarch %{nptl_arches}
|
||||||
|
%attr(0755,root,root) %{_libdir}/tls/libslapd_db-*.*.so
|
||||||
|
%endif
|
||||||
|
|
||||||
%files clients
|
%files clients
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -389,16 +520,88 @@ fi
|
|||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc doc/drafts
|
%doc doc/drafts
|
||||||
%attr(0755,root,root) %{_libdir}/lib*.so
|
%attr(0755,root,root) %{_libdir}/libl*.so
|
||||||
%attr(0644,root,root) %{_libdir}/lib*.a
|
%attr(0644,root,root) %{_libdir}/libl*.a
|
||||||
%attr(0644,root,root) %{_includedir}/*
|
%attr(0644,root,root) %{_includedir}/*
|
||||||
%attr(0644,root,root) %{_mandir}/man3/*
|
%attr(0644,root,root) %{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-8
|
||||||
|
- add another section to the ABI note for the TLS libdb so that it's marked as
|
||||||
|
not needing an executable stack (from Arjan Van de Ven)
|
||||||
|
|
||||||
|
* Thu Oct 16 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-7
|
||||||
|
- force bundled libdb to not use O_DIRECT by making it forget that we have it
|
||||||
|
|
||||||
|
* Wed Oct 15 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||||
|
- build bundled libdb for slapd dynamically to make the package smaller,
|
||||||
|
among other things
|
||||||
|
- on tls-capable arches, build libdb both with and without shared posix
|
||||||
|
mutexes, otherwise just without
|
||||||
|
- disable posix mutexes unconditionally for db 4.0, which shouldn't need
|
||||||
|
them for the migration cases where it's used
|
||||||
|
- update to MigrationTools 45
|
||||||
|
|
||||||
|
* Fri Sep 12 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-6
|
||||||
|
- drop rfc822-MailMember.schema, merged into upstream misc.schema at some point
|
||||||
|
|
||||||
|
* Wed Aug 27 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||||
|
- actually require newer libtool, as was intended back in 2.1.22-0, noted as
|
||||||
|
missed by Jim Richardson
|
||||||
|
|
||||||
|
* Fri Jul 25 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-5
|
||||||
|
- enable rlookups, they don't cost anything unless also enabled in slapd's
|
||||||
|
configuration file
|
||||||
|
|
||||||
|
* Tue Jul 22 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-4
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Thu Jul 17 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-3
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Wed Jul 16 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-2
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Tue Jul 15 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-1
|
||||||
|
- build
|
||||||
|
|
||||||
|
* Mon Jul 14 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-0
|
||||||
|
- 2.1.22 now badged stable
|
||||||
|
- be more aggressive in what we index by default
|
||||||
|
- use/require libtool 1.5
|
||||||
|
|
||||||
|
* Mon Jun 30 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||||
|
- update to 2.1.22
|
||||||
|
|
||||||
|
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
|
* Tue Jun 3 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-1
|
||||||
|
- update to 2.1.21
|
||||||
|
- enable ldap, meta, monitor, null, rewrite in slapd
|
||||||
|
|
||||||
|
* Mon May 19 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-1
|
||||||
|
- update to 2.1.20
|
||||||
|
|
||||||
|
* Thu May 8 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-1
|
||||||
|
- update to 2.1.19
|
||||||
|
|
||||||
|
* Mon May 5 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.17-1
|
||||||
|
- switch to db with crypto
|
||||||
|
|
||||||
|
* Fri May 2 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||||
|
- install the db utils for the bundled libdb as %%{_sbindir}/slapd_db_*
|
||||||
|
- install slapcat/slapadd from 2.0.x for migration purposes
|
||||||
|
|
||||||
|
* Wed Apr 30 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||||
|
- update to 2.1.17
|
||||||
|
- disable the shell backend, not expected to work well with threads
|
||||||
|
- drop the kerberosSecurityObject schema, the krbName attribute it
|
||||||
|
contains is only used if slapd is built with v2 kbind support
|
||||||
|
|
||||||
* Mon Feb 10 2003 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-8
|
* Mon Feb 10 2003 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-8
|
||||||
- back down to db 4.0.x, which 2.0.x can compile with in ldbm-over-db setups
|
- back down to db 4.0.x, which 2.0.x can compile with in ldbm-over-db setups
|
||||||
- tweak SuSE patch to fix a few copy-paste errors and a NULL dereference
|
- tweak SuSE patch to fix a few copy-paste errors and a NULL dereference
|
||||||
- temporarily require an exact version of pkg-config (or pkgconfig, if you prefer)
|
|
||||||
|
|
||||||
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
||||||
- rebuilt
|
- rebuilt
|
||||||
|
6
sources
6
sources
@ -1,3 +1,7 @@
|
|||||||
2cc51cbf0276c161724626c70b59f0b1 MigrationTools-44.tar.gz
|
2355e54f17a1fdc87b0d56ed9ea3e115 MigrationTools-45.tar.gz
|
||||||
|
5a9e617c1d5339d3c90c545c93e30949 autoconf-2.13.1.tar.gz
|
||||||
|
0faee50993f7e4fe00f4b921b640b84d automake-1.4a.tar.gz
|
||||||
12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz
|
12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz
|
||||||
|
df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz
|
||||||
a1e6508c471dd47205a3492cf57110a6 openldap-2.0.27.tgz
|
a1e6508c471dd47205a3492cf57110a6 openldap-2.0.27.tgz
|
||||||
|
391512053eded93e73ffa0d377ce272a openldap-2.1.22.tgz
|
||||||
|
Loading…
Reference in New Issue
Block a user