rpms/openldap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
cvsdist 2004-09-09 09:28:57 +00:00
parent a239df8677
commit 7a16c4a0fc
10 changed files with 3466 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.cvsignore
View File

@ -1,2 +1,3 @@
MigrationTools-36.tar.gz MigrationTools-38.tar.gz
openldap-2.0.7.tgz autoconf-2.13.1.tar.gz
openldap-2.0.11.tgz

4
MigrationTools-26-suffix.patch
View File

@ -1,4 +1,6 @@
--- MigrationTools-26/migrate_all_online.sh.suffix Wed Oct 25 16:27:02 2000 Try adding the top-level object, which may be missing, but don't worry if
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:30:11 2000 +++ MigrationTools-26/migrate_all_online.sh Wed Oct 25 16:30:11 2000
@@ -179,5 +179,30 @@ @@ -179,5 +179,30 @@
echo "Migrating netgroups (by host)..." echo "Migrating netgroups (by host)..."

38
MigrationTools-27-simple.patch
View File

@ -1,4 +1,6 @@
--- MigrationTools-27/migrate_all_online.sh.simple Tue Oct 31 17:01:24 2000 Allow the calling user to pass in arguments to ldapadd/ldapmodify.
--- MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:01:24 2000
+++ MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:03:19 2000 +++ MigrationTools-27/migrate_all_online.sh Tue Oct 31 17:03:19 2000
@@ -181,13 +181,11 @@ @@ -181,13 +181,11 @@
@ -12,90 +14,90 @@
- $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
echo "$LDAPADD: returned non-zero exit status" echo "$LDAPADD: returned non-zero exit status"
--- MigrationTools-27/migrate_all_nis_online.sh.simple Tue Oct 31 17:01:24 2000 --- MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:01:24 2000
+++ MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:02:51 2000 +++ MigrationTools-27/migrate_all_nis_online.sh Tue Oct 31 17:02:51 2000
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
ypcat $DOMFLAG networks > $ETC_NETWORKS ypcat $DOMFLAG networks > $ETC_NETWORKS
#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
--- MigrationTools-27/migrate_all_offline.sh.simple Tue Oct 31 17:02:00 2000 --- MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:02:00 2000
+++ MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:03:12 2000 +++ MigrationTools-27/migrate_all_offline.sh Tue Oct 31 17:03:12 2000
@@ -137,9 +137,9 @@ @@ -137,9 +137,9 @@
$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB $PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
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=$?
--- MigrationTools-27/migrate_all_nis_offline.sh.simple Tue Oct 31 17:02:05 2000 --- MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:05 2000
+++ MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:49 2000 +++ MigrationTools-27/migrate_all_nis_offline.sh Tue Oct 31 17:02:49 2000
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
ypcat $DOMFLAG networks > $ETC_NETWORKS ypcat $DOMFLAG networks > $ETC_NETWORKS
#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
--- MigrationTools-27/migrate_all_nisplus_online.sh.simple Tue Oct 31 17:02:11 2000 --- MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:11 2000
+++ MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:59 2000 +++ MigrationTools-27/migrate_all_nisplus_online.sh Tue Oct 31 17:02:59 2000
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
niscat networks.org_dir > $ETC_NETWORKS niscat networks.org_dir > $ETC_NETWORKS
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
--- MigrationTools-27/migrate_all_netinfo_online.sh.simple Tue Oct 31 17:02:17 2000 --- MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:17 2000
+++ MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:46 2000 +++ MigrationTools-27/migrate_all_netinfo_online.sh Tue Oct 31 17:02:46 2000
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
nidump networks $DOM > $ETC_NETWORKS nidump networks $DOM > $ETC_NETWORKS
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
--- MigrationTools-27/migrate_all_netinfo_offline.sh.simple Tue Oct 31 17:02:22 2000 --- MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:22 2000
+++ MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:43 2000 +++ MigrationTools-27/migrate_all_netinfo_offline.sh Tue Oct 31 17:02:43 2000
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
nidump networks $DOM > $ETC_NETWORKS nidump networks $DOM > $ETC_NETWORKS
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
--- MigrationTools-27/migrate_all_nisplus_offline.sh.simple Tue Oct 31 17:02:27 2000 --- MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:27 2000
+++ MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:56 2000 +++ MigrationTools-27/migrate_all_nisplus_offline.sh Tue Oct 31 17:02:56 2000
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
niscat networks.org_dir > $ETC_NETWORKS niscat networks.org_dir > $ETC_NETWORKS
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

18
MigrationTools-36-mktemp.patch
View File

@ -1,4 +1,6 @@
--- MigrationTools-36/migrate_all_netinfo_offline.sh.mktemp Mon Feb 5 11:39:14 2001 Use mktemp to generate temporary files.
--- MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001 +++ MigrationTools-36/migrate_all_netinfo_offline.sh Mon Feb 5 11:39:14 2001
@@ -41,15 +41,15 @@ @@ -41,15 +41,15 @@
INSTDIR=/usr/share/openldap/migration/ INSTDIR=/usr/share/openldap/migration/
@ -25,7 +27,7 @@
EXIT=no EXIT=no
question="Enter the NetInfo domain to import from [/]:" question="Enter the NetInfo domain to import from [/]:"
--- MigrationTools-36/migrate_all_netinfo_online.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001 +++ MigrationTools-36/migrate_all_netinfo_online.sh Mon Feb 5 11:39:14 2001
@@ -41,15 +41,15 @@ @@ -41,15 +41,15 @@
INSTDIR=/usr/share/openldap/migration/ INSTDIR=/usr/share/openldap/migration/
@ -52,7 +54,7 @@
EXIT=no EXIT=no
question="Enter the NetInfo domain to import from [/]:" question="Enter the NetInfo domain to import from [/]:"
--- MigrationTools-36/migrate_all_nisplus_offline.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:43:23 2001 +++ MigrationTools-36/migrate_all_nisplus_offline.sh Mon Feb 5 11:43:23 2001
@@ -41,16 +41,16 @@ @@ -41,16 +41,16 @@
INSTDIR=/usr/share/openldap/migration/ INSTDIR=/usr/share/openldap/migration/
@ -81,7 +83,7 @@
EXIT=no EXIT=no
question="Enter the NIS+ domain to import from (optional): " question="Enter the NIS+ domain to import from (optional): "
--- MigrationTools-36/migrate_all_nisplus_online.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:45:18 2001 +++ MigrationTools-36/migrate_all_nisplus_online.sh Mon Feb 5 11:45:18 2001
@@ -41,16 +41,16 @@ @@ -41,16 +41,16 @@
INSTDIR=/usr/share/openldap/migration/ INSTDIR=/usr/share/openldap/migration/
@ -110,7 +112,7 @@
EXIT=no EXIT=no
question="Enter the NIS+ domain to import from (optional): " question="Enter the NIS+ domain to import from (optional): "
--- MigrationTools-36/migrate_all_offline.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001 +++ MigrationTools-36/migrate_all_offline.sh Mon Feb 5 11:39:14 2001
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
# #
@ -121,7 +123,7 @@
if [ "X$ETC_ALIASES" = "X" ]; then if [ "X$ETC_ALIASES" = "X" ]; then
ETC_ALIASES=/etc/aliases ETC_ALIASES=/etc/aliases
--- MigrationTools-36/migrate_all_online.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001 +++ MigrationTools-36/migrate_all_online.sh Mon Feb 5 11:39:14 2001
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
@ -132,7 +134,7 @@
if [ "X$ETC_ALIASES" = "X" ]; then if [ "X$ETC_ALIASES" = "X" ]; then
ETC_ALIASES=/etc/aliases ETC_ALIASES=/etc/aliases
--- MigrationTools-36/migrate_all_nis_offline.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001 +++ MigrationTools-36/migrate_all_nis_offline.sh Mon Feb 5 11:39:14 2001
@@ -41,15 +41,15 @@ @@ -41,15 +41,15 @@
INSTDIR=/usr/share/openldap/migration/ INSTDIR=/usr/share/openldap/migration/
@ -159,7 +161,7 @@
EXIT=no EXIT=no
question="Enter the NIS domain to import from (optional): " question="Enter the NIS domain to import from (optional): "
--- MigrationTools-36/migrate_all_nis_online.sh.mktemp Mon Feb 5 11:39:14 2001 --- MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001
+++ MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001 +++ MigrationTools-36/migrate_all_nis_online.sh Mon Feb 5 11:39:14 2001
@@ -41,15 +41,15 @@ @@ -41,15 +41,15 @@
INSTDIR=/usr/share/openldap/migration/ INSTDIR=/usr/share/openldap/migration/

421
MigrationTools-38-instdir.patch Normal file
View File

@ -0,0 +1,421 @@
We know where these scripts are going to be installed, so add the necessary
magic to let them be called from anywhere.
--- MigrationTools-38/migrate_all_netinfo_offline.sh Thu Jul 16 07:51:12 1998
+++ MigrationTools-38/migrate_all_netinfo_offline.sh Wed Jun 20 18:19:17 2001
@@ -38,6 +38,7 @@
PATH=$PATH:.
export PATH
+INSTDIR=/usr/share/openldap/migration/
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -68,7 +69,7 @@
nidump networks $DOM > $ETC_NETWORKS
nidump aliases $DOM > $ETC_ALIASES
-. migrate_all_offline.sh
+. ${INSTDIR}migrate_all_offline.sh
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
--- MigrationTools-38/migrate_all_netinfo_online.sh Thu Jul 16 07:51:12 1998
+++ MigrationTools-38/migrate_all_netinfo_online.sh Wed Jun 20 18:19:17 2001
@@ -38,6 +38,7 @@
PATH=$PATH:.
export PATH
+INSTDIR=/usr/share/openldap/migration/
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -68,7 +69,7 @@
nidump networks $DOM > $ETC_NETWORKS
nidump aliases $DOM > $ETC_ALIASES
-. migrate_all_online.sh
+. ${INSTDIR}migrate_all_online.sh
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
--- MigrationTools-38/migrate_all_nis_offline.sh Thu Jul 16 07:51:12 1998
+++ MigrationTools-38/migrate_all_nis_offline.sh Wed Jun 20 18:19:17 2001
@@ -38,6 +38,7 @@
PATH=$PATH:.
export PATH
+INSTDIR=/usr/share/openldap/migration/
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -70,7 +71,7 @@
ypcat $DOMFLAG networks > $ETC_NETWORKS
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
-. migrate_all_offline.sh
+. ${INSTDIR}migrate_all_offline.sh
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
--- MigrationTools-38/migrate_all_nis_online.sh Thu Jul 16 07:51:12 1998
+++ MigrationTools-38/migrate_all_nis_online.sh Wed Jun 20 18:19:17 2001
@@ -38,7 +38,7 @@
PATH=$PATH:.
export PATH
-
+INSTDIR=/usr/share/openldap/migration/
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -71,7 +71,7 @@
ypcat $DOMFLAG networks > $ETC_NETWORKS
#ypcat $DOMFLAG -k aliases > $ETC_ALIASES
-. migrate_all_online.sh
+. ${INSTDIR}migrate_all_online.sh
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
--- MigrationTools-38/migrate_all_nisplus_offline.sh Fri Feb 2 09:20:56 2001
+++ MigrationTools-38/migrate_all_nisplus_offline.sh Wed Jun 20 18:19:17 2001
@@ -38,6 +38,7 @@
PATH=$PATH:/usr/lib/nis:.
export PATH
+INSTDIR=/usr/share/openldap/migration/
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -72,7 +73,7 @@
nisaddent -d netgroup $DOM > $ETC_NETGROUP
niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
-. migrate_all_offline.sh
+. ${INSTDIR}migrate_all_offline.sh
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
--- MigrationTools-38/migrate_all_nisplus_online.sh Fri Feb 2 09:20:56 2001
+++ MigrationTools-38/migrate_all_nisplus_online.sh Wed Jun 20 18:19:17 2001
@@ -38,7 +38,7 @@
PATH=$PATH:.
export PATH
-
+INSTDIR=/usr/share/openldap/migration/
TMPDIR="/tmp"
ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -73,7 +73,7 @@
nisaddent -d netgroup $DOM > $ETC_NETGROUP
niscat mail_aliases.org_dir.$DOM > $ETC_ALIASES
-. migrate_all_online.sh
+. ${INSTDIR}migrate_all_online.sh
rm -f $ETC_PASSWD
rm -f $ETC_GROUP
--- MigrationTools-38/migrate_all_offline.sh Tue Oct 17 02:33:33 2000
+++ MigrationTools-38/migrate_all_offline.sh Wed Jun 20 18:19:17 2001
@@ -41,6 +41,7 @@
# Luke Howard <lukeh@padl.com> April 1997
#
+INSTDIR=/usr/share/openldap/migration/
DB="/tmp/nis.$$.ldif"
if [ "X$ETC_ALIASES" = "X" ]; then
@@ -108,32 +109,32 @@
fi
echo "Creating naming context entries..."
-$PERL migrate_base.pl > $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_base.pl > $DB
echo "Migrating aliases..."
-$PERL migrate_aliases.pl $ETC_ALIASES >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB
#echo "Migrating fstab..."
-#$PERL migrate_fstab.pl $ETC_FSTAB >> $DB
+#$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB
echo "Migrating groups..."
-$PERL migrate_group.pl $ETC_GROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_group.pl $ETC_GROUP >> $DB
echo "Migrating hosts..."
-$PERL migrate_hosts.pl $ETC_HOSTS >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_hosts.pl $ETC_HOSTS >> $DB
echo "Migrating networks..."
-$PERL migrate_networks.pl $ETC_NETWORKS >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_networks.pl $ETC_NETWORKS >> $DB
echo "Migrating users..."
-$PERL migrate_passwd.pl $ETC_PASSWD >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_passwd.pl $ETC_PASSWD >> $DB
echo "Migrating protocols..."
-$PERL migrate_protocols.pl $ETC_PROTOCOLS >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_protocols.pl $ETC_PROTOCOLS >> $DB
echo "Migrating rpcs..."
-$PERL migrate_rpc.pl $ETC_RPC >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_rpc.pl $ETC_RPC >> $DB
echo "Migrating services..."
-$PERL migrate_services.pl $ETC_SERVICES >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_services.pl $ETC_SERVICES >> $DB
echo "Migrating netgroups..."
-$PERL migrate_netgroup.pl $ETC_NETGROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup.pl $ETC_NETGROUP >> $DB
echo "Importing into LDAP..."
echo "Migrating netgroups (by user)..."
-$PERL migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
echo "Migrating netgroups (by host)..."
-$PERL migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
echo "Preparing LDAP database..."
if [ "X$SLAPADD" = "X" ]; then
$LDIF2LDBM -i $DB
--- MigrationTools-38/migrate_all_online.sh Sat Jan 6 22:39:20 2001
+++ MigrationTools-38/migrate_all_online.sh Wed Jun 20 18:19:17 2001
@@ -38,6 +38,8 @@
SHELL=/bin/sh
export SHELL
+INSTDIR=/usr/share/openldap/migration/
+
DB=/tmp/nis.$$.ldif
if [ "X$ETC_ALIASES" = "X" ]; then
@@ -104,7 +106,7 @@
fi
if [ "X$LDAP_BASEDN" = "X" ]; then
- defaultcontext=`$PERL -e 'require "migrate_common.ph"; print \$DEFAULT_BASE';`
+ defaultcontext=`$PERL -I${INSTDIR} -e 'require "'${INSTDIR}migrate_common.ph'"; print \$DEFAULT_BASE';`
question="Enter the X.500 naming context you wish to import into: [$defaultcontext]"
echo "$question " | tr -d '\012' > /dev/tty
read LDAP_BASEDN
@@ -160,35 +162,35 @@
echo "Importing into $LDAP_BASEDN..."
echo
echo "Creating naming context entries..."
-$PERL migrate_base.pl -n > $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_base.pl -n > $DB
if [ "X$LDAP_PROFILE" = "Xyes" ]; then
echo "Creating DUAConfigProfile entry..."
- $PERL migrate_profile.pl "$LDAPHOST" >> $DB
+ $PERL -I${INSTDIR} ${INSTDIR}migrate_profile.pl "$LDAPHOST" >> $DB
fi
echo "Migrating aliases..."
-$PERL migrate_aliases.pl $ETC_ALIASES >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_aliases.pl $ETC_ALIASES >> $DB
#echo "Migrating fstab..."
-#$PERL migrate_fstab.pl $ETC_FSTAB >> $DB
+#$PERL -I${INSTDIR} ${INSTDIR}migrate_fstab.pl $ETC_FSTAB >> $DB
echo "Migrating groups..."
-$PERL migrate_group.pl $ETC_GROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_group.pl $ETC_GROUP >> $DB
echo "Migrating hosts..."
-$PERL migrate_hosts.pl $ETC_HOSTS >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_hosts.pl $ETC_HOSTS >> $DB
echo "Migrating networks..."
-$PERL migrate_networks.pl $ETC_NETWORKS >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_networks.pl $ETC_NETWORKS >> $DB
echo "Migrating users..."
-$PERL migrate_passwd.pl $ETC_PASSWD >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_passwd.pl $ETC_PASSWD >> $DB
echo "Migrating protocols..."
-$PERL migrate_protocols.pl $ETC_PROTOCOLS >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_protocols.pl $ETC_PROTOCOLS >> $DB
echo "Migrating rpcs..."
-$PERL migrate_rpc.pl $ETC_RPC >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_rpc.pl $ETC_RPC >> $DB
echo "Migrating services..."
-$PERL migrate_services.pl $ETC_SERVICES >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_services.pl $ETC_SERVICES >> $DB
echo "Migrating netgroups..."
-$PERL migrate_netgroup.pl $ETC_NETGROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup.pl $ETC_NETGROUP >> $DB
echo "Migrating netgroups (by user)..."
-$PERL migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byuser.pl $ETC_NETGROUP >> $DB
echo "Migrating netgroups (by host)..."
-$PERL migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
+$PERL -I${INSTDIR} ${INSTDIR}migrate_netgroup_byhost.pl $ETC_NETGROUP >> $DB
echo "Importing into LDAP..."
--- MigrationTools-38/migrate_aliases.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_aliases.pl Wed Jun 20 18:20:28 2001
@@ -36,7 +36,7 @@
# thanks to Dave McPike
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_aliases.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_automount.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_automount.pl Wed Jun 20 18:20:35 2001
@@ -33,7 +33,7 @@
# services migration tool
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_automount.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_base.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_base.pl Wed Jun 20 18:20:51 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_base.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_fstab.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_fstab.pl Wed Jun 20 18:20:57 2001
@@ -37,7 +37,7 @@
# They are used by MacOS X Server, however.
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_fstab.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_group.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_group.pl Wed Jun 20 18:21:01 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_group.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_hosts.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_hosts.pl Wed Jun 20 18:21:03 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_hosts.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_netgroup.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_netgroup.pl Wed Jun 20 18:21:06 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_netgroup.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_netgroup_byhost.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_netgroup_byhost.pl Wed Jun 20 18:21:09 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_netgroup_byhost.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_netgroup_byuser.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_netgroup_byuser.pl Wed Jun 20 18:21:12 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_netgroup_byuser.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_networks.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_networks.pl Wed Jun 20 18:21:14 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_networks.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_passwd.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_passwd.pl Wed Jun 20 18:21:16 2001
@@ -37,7 +37,7 @@
# Thanks to Peter Jacob Slot <peter@vision.auk.dk>.
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_passwd.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_profile.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_profile.pl Wed Jun 20 18:21:18 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_profile.pl";
--- MigrationTools-38/migrate_protocols.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_protocols.pl Wed Jun 20 18:21:21 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_protocols.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_rpc.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_rpc.pl Wed Jun 20 18:21:23 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_rpc.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_services.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_services.pl Wed Jun 20 18:21:25 2001
@@ -35,7 +35,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_services.pl";
$NAMINGCONTEXT = &getsuffix($PROGRAM);
--- MigrationTools-38/migrate_slapd_conf.pl Wed Jun 20 18:20:06 2001
+++ MigrationTools-38/migrate_slapd_conf.pl Wed Jun 20 18:21:29 2001
@@ -36,7 +36,7 @@
#
#
-require 'migrate_common.ph';
+require '/usr/share/openldap/migration/migrate_common.ph';
$PROGRAM = "migrate_slapd_conf.pl";

2838
guide.html Normal file
View File

File diff suppressed because it is too large Load Diff

30
ldap.init
View File

@ -34,7 +34,8 @@ RETVAL=0
function start() { function start() {
# Start daemons. # Start daemons.
echo -n $"Starting slapd: " prog=`basename ${slapd}`
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:///"' $OPTIONS $SLAPD_OPTIONS
RETVAL=$? RETVAL=$?
@ -45,10 +46,13 @@ 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
echo -n $"Starting slurpd: " if grep -q "replica" /etc/openldap/slapd.conf; then
daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS prog=`basename ${slurpd}`
RETVAL=$? echo -n $"Starting $prog: "
echo daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS
RETVAL=$?
echo
fi
fi fi
fi fi
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ldap
@ -57,13 +61,15 @@ function start() {
function stop() { function stop() {
# Stop daemons. # Stop daemons.
echo -n $"Stopping slapd: " prog=`basename ${slapd}`
echo -n $"Stopping $prog: "
killproc ${slapd} killproc ${slapd}
RETVAL=$? RETVAL=$?
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
echo -n $"Stopping slurpd: " prog=`basename ${slurpd}`
echo -n $"Stopping $prog: "
killproc ${slurpd} killproc ${slurpd}
RETVAL=$? RETVAL=$?
echo echo
@ -91,16 +97,6 @@ case "$1" in
stop stop
start start
;; ;;
reload)
killall -HUP ${slapd}
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
if grep -q "^replogfile" /etc/openldap/slapd.conf; then
killall -HUP ${slurpd}
RETVAL=$?
fi
fi
;;
condrestart) condrestart)
if [ -f /var/lock/subsys/ldap ] ; then if [ -f /var/lock/subsys/ldap ] ; then
stop stop

12
openldap-2.0.11-ldaprc.patch Normal file
View File

@ -0,0 +1,12 @@
--- openldap-2.0.11/libraries/libldap/init.c Tue Jul 3 16:17:14 2001
+++ openldap-2.0.11/libraries/libldap/init.c Tue Jul 3 16:17:22 2001
@@ -278,9 +278,6 @@
if(path != NULL) {
LDAP_FREE(path);
}
-
- /* try file */
- openldap_ldap_init_w_conf(file, 1);
}
static void openldap_ldap_init_w_env(

200
openldap.spec
View File

@ -1,37 +1,40 @@
%define migtools_ver 36 %define migtools_ver 38
%define __libtoolize echo
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.7 Version: 2.0.11
Release: 14a 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: ldap.init Source1: ftp.openldap.org:/pub/tools/autoconf-2.13.1.tar.gz
Source2: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_ver}.tar.gz Source2: ldap.init
Source3: migration-tools.txt Source3: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_ver}.tar.gz
Source4: migrate_automount.pl Source4: migration-tools.txt
Source5: rfc822-MailMember.schema Source5: rfc822-MailMember.schema
Source6: autofs.schema Source6: autofs.schema
Source7: kerberosobject.schema Source7: kerberosobject.schema
Source8: README.upgrading Source8: README.upgrading
Source9: README.sendbuf Source9: README.sendbuf
Patch0: openldap-2.0.7-config.patch Source10: http://www.OpenLDAP.org/doc/admin/guide.html
Patch0: openldap-2.0.11-config.patch
Patch1: openldap-2.0.3-redhat.patch Patch1: openldap-2.0.3-redhat.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.0.3-syslog.patch
Patch4: openldap-2.0.3-krb5-1.1.patch Patch4: openldap-2.0.3-krb5-1.1.patch
Patch5: openldap-2.0.1-fast.patch Patch5: openldap-2.0.1-fast.patch
Patch6: openldap-2.0.7-norbert.patch Patch6: openldap-2.0.7-sendbuf.patch
Patch7: openldap-2.0.7-sendbuf.patch Patch7: openldap-2.0.11-ldaprc.patch
Patch8: MigrationTools-34-instdir.patch Patch8: openldap-2.0.11-debug.patch
Patch9: MigrationTools-36-mktemp.patch Patch9: openldap-2.0.11-libtool.patch
Patch10: MigrationTools-27-simple.patch Patch10: openldap-2.0.11-linkage.patch
Patch11: MigrationTools-26-suffix.patch Patch11: MigrationTools-38-instdir.patch
Patch12: MigrationTools-24-schema.patch Patch12: MigrationTools-36-mktemp.patch
Patch13: MigrationTools-27-simple.patch
Patch14: MigrationTools-26-suffix.patch
Patch15: MigrationTools-24-schema.patch
URL: http://www.openldap.org/ URL: http://www.openldap.org/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, perl BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, perl, tcp_wrappers
Requires: mktemp, gdbm Requires: mktemp, gdbm
%description %description
@ -46,7 +49,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} 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
@ -58,7 +61,7 @@ customized LDAP clients.
%package servers %package servers
Summary: OpenLDAP servers and related files. Summary: OpenLDAP servers and related files.
Prereq: fileutils, openldap = %{version}-%{release}, /usr/sbin/useradd Prereq: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd
Group: System Environment/Daemons Group: System Environment/Daemons
%description servers %description servers
@ -85,43 +88,50 @@ 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 2 %setup -q -a 1 -a 3
%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
%patch4 -p1 -b .krb5-1.1 %patch4 -p1 -b .krb5-1.1
%patch5 -p1 -b .fast %patch5 -p1 -b .fast
%patch6 -p1 -b .norbert %patch6 -p1 -b .sendbuf
%patch7 -p1 -b .sendbuf %patch7 -p1 -b .ldaprc
%patch8 -p1 -b .debug
%patch9 -p1 -b .libtool
#%patch10 -p1 -b .linkage
pushd MigrationTools-%{migtools_ver} pushd MigrationTools-%{migtools_ver}
%patch8 -p1 -b .instdir %patch11 -p1 -b .instdir
%patch9 -p1 -b .mktemp %patch12 -p1 -b .mktemp
%patch10 -p1 -b .simple %patch13 -p1 -b .simple
%patch11 -p1 -b .suffix %patch14 -p1 -b .suffix
%patch12 -p2 -b .schema %patch15 -p2 -b .schema
popd popd
top=`pwd`
pushd autoconf-2.13.1
./configure --prefix=$top/build
make install
popd
PATH=${top}/build/bin:${PATH}
autoheader autoheader
autoconf autoconf
%build %build
# like libtoolize, but different
%ifarch s390 s390x
for file in config.sub config.guess ; do
for place in `find . -type f -name $file` ; do
cp -f /usr/share/libtool/$file $place
done
done
%endif
CPPFLAGS="-I/usr/kerberos/include"; export CPPFLAGS CPPFLAGS="-I/usr/kerberos/include"; export CPPFLAGS
CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS
LDFLAGS="-L/usr/kerberos/lib"; export LDFLAGS LDFLAGS="-L/usr/kerberos/lib"; export LDFLAGS
TARGET_PLATFORM=%{_target_platform}
%define _target_platform --target=${TARGET_PLATFORM}
configure_flags=' configure_flags='
--enable-ldbm
--enable-passwd
--with-ldbm-api=gdbm --with-ldbm-api=gdbm
--enable-shell --enable-shell
--enable-cldap --disable-rlookups --enable-local --enable-cldap --disable-rlookups
--with-kerberos=k5 --with-kerberos=k5
--enable-kbind --enable-kbind
@ -135,23 +145,24 @@ configure_flags='
--enable-kpasswd --enable-kpasswd
--enable-spasswd --enable-spasswd
--datadir=%{_datadir}/openldap
--libexecdir=%{_sbindir} --libexecdir=%{_sbindir}
--localstatedir=%{_var}/run' --localstatedir=%{_var}/run'
%configure ${configure_flags} --without-slapd --with-slurpd --without-ldapd --disable-shared --with-threads %configure ${configure_flags} --without-slapd --with-slurpd --without-ldapd --with-threads --disable-shared --enable-static
make depend
make make
cp servers/slurpd/slurpd slurpd.semistatic cp servers/slurpd/slurpd slurpd.semistatic
make distclean make distclean
%configure ${configure_flags} --with-slapd --without-slurpd --without-ldapd --enable-shared --without-threads %configure ${configure_flags} --with-slapd --without-slurpd --without-ldapd --without-threads --enable-shared --enable-static
make depend
make 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
%{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 \
@ -166,17 +177,16 @@ rm -f $RPM_BUILD_ROOT/etc/openldap/*.default
# install init script # install init script
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldap
# install the migration tools # install the 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_ver}/migrate_* \
$RPM_BUILD_ROOT%{_datadir}/openldap/migration $RPM_BUILD_ROOT%{_datadir}/openldap/migration
install -m 644 MigrationTools-%{migtools_ver}/README %{SOURCE3} \ install -m 644 MigrationTools-%{migtools_ver}/README %{SOURCE4} \
$RPM_BUILD_ROOT%{_datadir}/openldap/migration $RPM_BUILD_ROOT%{_datadir}/openldap/migration
install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/openldap/migration
cp MigrationTools-%{migtools_ver}/README README.migration cp MigrationTools-%{migtools_ver}/README README.migration
cp %{SOURCE3} TOOLS.migration cp %{SOURCE4} TOOLS.migration
# try to build saucer, but don't fret if we can't # try to build saucer, but don't fret if we can't
if make -C contrib/saucer ; then if make -C contrib/saucer ; then
@ -199,6 +209,14 @@ fi
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 %{SOURCE5} %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/
# juggle the shared libraries
mkdir -p $RPM_BUILD_ROOT/lib
mv $RPM_BUILD_ROOT%{_libdir}/*.so* $RPM_BUILD_ROOT/lib/
pushd $RPM_BUILD_ROOT%{_libdir}
for lib in ../../lib/lib*.so.*.* ; do
ln -sf ${lib} `basename ${lib} | cut -f1,2 -d.`
done
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -221,6 +239,24 @@ fi
%post servers %post servers
/sbin/chkconfig --add ldap /sbin/chkconfig --add ldap
exec > /dev/null 2> /dev/null
if [ ! -f %{_datadir}/ssl/certs/slapd.pem ] ; then
pushd %{_datadir}/ssl/certs
umask 077
cat << EOF | make slapd.pem
--
SomeState
SomeCity
SomeOrganization
SomeOrganizationalUnit
localhost.localdomain
root@localhost.localdomain
EOF
chown root.ldap slapd.pem
chmod 640 slapd.pem
popd
fi
exit 0
%preun servers %preun servers
if [ "$1" = "0" ] ; then if [ "$1" = "0" ] ; then
@ -238,8 +274,8 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%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 /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) /lib/lib*.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(0644,root,root) %{_datadir}/openldap/ldapfriendly
@ -247,19 +283,19 @@ fi
%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 %doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/README.sendbuf $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(0600,ldap,ldap) %config /etc/openldap/slapd.conf %attr(0600,ldap,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) %config /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 /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(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 %{_datadir}/openldap/migration/*.ph %attr(0644,root,root) %config(noreplace) %{_datadir}/openldap/migration/*.ph
%attr(0755,root,root) %{_datadir}/openldap/migration/*.pl %attr(0755,root,root) %{_datadir}/openldap/migration/*.pl
%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
@ -279,8 +315,58 @@ fi
%attr(0644,root,root) %{_mandir}/man3/* %attr(0644,root,root) %{_mandir}/man3/*
%changelog %changelog
* Fri Feb 8 2002 Phil Knirsch <pknirsch@redhat.com> * Thu Jul 26 2001 Nalin Dahyabhai <nalin@redhat.com>
- Config.guess/status fix for s390(x) - remove "reload" option from init script, which actually stopped the servers
* Fri Jul 20 2001 Nalin Dahyabhai <nalin@redhat.com>
- enable passwd back-end (noted by Alan Sparks and Sergio Kessler)
* Wed Jul 18 2001 Nalin Dahyabhai <nalin@redhat.com>
- start to prep for errata release
* Fri Jul 6 2001 Nalin Dahyabhai <nalin@redhat.com>
- link libldap with liblber
* Wed Jul 4 2001 Than Ngo <than@redhat.com> 2.0.11-6
- add symlink liblber.so libldap.so and libldap_r.so in /usr/lib
* Tue Jul 3 2001 Nalin Dahyabhai <nalin@redhat.com>
- move shared libraries to /lib
- redo init script for better internationalization (#26154)
- don't use ldaprc files in the current directory (#38402) (patch from
hps@intermeta.de)
- add BuildPrereq on tcp wrappers since we configure with
--enable-wrappers (#43707)
- don't overflow debug buffer in mail500 (#41751)
- don't call krb5_free_creds instead of krb5_free_cred_contents any
more (#43159)
* Mon Jul 2 2001 Nalin Dahyabhai <nalin@redhat.com>
- make config files noreplace (#42831)
* Tue Jun 26 2001 Nalin Dahyabhai <nalin@redhat.com>
- actually change the default config to use the dummy cert
- update to MigrationTools 38
* Mon Jun 25 2001 Nalin Dahyabhai <nalin@redhat.com>
- build dummy certificate in %%post, use it in default config
- configure-time shenanigans to help a confused configure script
* Wed Jun 20 2001 Nalin Dahyabhai <nalin@redhat.com>
- tweak migrate_automount and friends so that they can be run from anywhere
* Thu May 24 2001 Nalin Dahyabhai <nalin@redhat.com>
- update to 2.0.11
* Wed May 23 2001 Nalin Dahyabhai <nalin@redhat.com>
- update to 2.0.10
* Mon May 21 2001 Nalin Dahyabhai <nalin@redhat.com>
- update to 2.0.9
* Tue May 15 2001 Nalin Dahyabhai <nalin@redhat.com>
- update to 2.0.8
- drop patch which came from upstream
* Fri Mar 2 2001 Nalin Dahyabhai <nalin@redhat.com> * Fri Mar 2 2001 Nalin Dahyabhai <nalin@redhat.com>
- rebuild in new environment - rebuild in new environment
@ -394,7 +480,7 @@ fi
* Sun Aug 13 2000 Nalin Dahyabhai <nalin@redhat.com> * Sun Aug 13 2000 Nalin Dahyabhai <nalin@redhat.com>
- adjust permissions in files lists - adjust permissions in files lists
- move libexecdir from %{_prefix}/sbin to %{_sbindir} - move libexecdir from %%{_prefix}/sbin to %%{_sbindir}
* Fri Aug 11 2000 Nalin Dahyabhai <nalin@redhat.com> * Fri Aug 11 2000 Nalin Dahyabhai <nalin@redhat.com>
- add migrate_automount.pl to the migration scripts set - add migrate_automount.pl to the migration scripts set
@ -463,7 +549,7 @@ fi
- update to 1.2.10 - update to 1.2.10
- add revamped version of patch from kos@bastard.net to allow execution as - add revamped version of patch from kos@bastard.net to allow execution as
any non-root user any non-root user
- remove test suite from %build because of weirdness in the build system - remove test suite from %%build because of weirdness in the build system
* Wed Apr 12 2000 Nalin Dahyabhai <nalin@redhat.com> * Wed Apr 12 2000 Nalin Dahyabhai <nalin@redhat.com>
- move the defaults for databases and whatnot to /var/lib/ldap (bug #10714) - move the defaults for databases and whatnot to /var/lib/ldap (bug #10714)

5
sources
View File

@ -1,2 +1,3 @@
54b1a5493cf7514970c47d3e0f42fc8c MigrationTools-36.tar.gz 056e2efa8e5d247a5df0a8eedf5bb732 MigrationTools-38.tar.gz
e772449b0fcc64dc4e7bf20c2853dd10 openldap-2.0.7.tgz 5a9e617c1d5339d3c90c545c93e30949 autoconf-2.13.1.tar.gz
e51b06374012b9e7077e1f3e9f65ccd0 openldap-2.0.11.tgz