[Fedora-directory-commits] ldapserver/ldap/cm/newinst ns-update, 1.7, 1.8 setup.sh, 1.5, 1.6 slapd.inf, 1.6, 1.7
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Oct 21 19:21:20 UTC 2005
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27230/ldapserver/ldap/cm/newinst
Modified Files:
ns-update setup.sh slapd.inf
Log Message:
Bug(s) fixed: 171066
Bug Description: Get rid of nsperl; use perldap with system perl
Reviewed by: Noriko, Rob, Nathan (Thanks!)
Branch: HEAD
Fix Description: All perl scripts are made executable by using the
#!/usr/bin/env perl *nix trick. This means that the correct version of
perl must be in the user's PATH e.g. 5.6.1 or later. This version is
either shipped with the OS or available on all platforms. On HP/ux, it
is available as a depot which is installed in /opt/perl. For CGI perl
scripts, the PATH can be set in the admserv.conf, so we may have to do
that for HP/ux. To make perldap work, some ugly hacks are involved.
Each perl script that uses perldap has a BEGIN section that figures out
where it is in the server root, sets a server root variable, and sets
LD_LIBRARY_PATH and SHLIB_PATH to point to serverroot/shared/lib.
Perldap will be installed under serverroot/lib/perl. This directory
will have 3 subdirectories: arch - containing the binary files; auto -
containing autoloaded perl modules; and Mozilla - containing the base
perldap .pm files. The BEGIN section also sets the perl INC path to
find those modules. The directory gets rid of nsperl plus a lot of old
crufty perl building code that we do not use anymore. Those are the
removed files. The admin server code also gets rid of the perl.c wrapper.
Noriko pointed out that this does not take care of upgrade install, so I
added several more files and diffs to take care of that case.
Basically, go through the tasks in o=netscaperoot and replace
perl?scriptname with just scriptname. Also, go through all of the
template generated scripts and replace the shebang line with
#!/usr/bin/env perl, and make sure they are chmod +x. I also found a
few more places that referenced nsperl and removed them.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: ns-update
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ns-update 3 Oct 2005 19:53:54 -0000 1.7
+++ ns-update 21 Oct 2005 19:21:18 -0000 1.8
@@ -44,7 +44,7 @@
# dependencies
sroot=`echo $0 | sed s#/bin/slapd/admin/bin/.\*##g`
-PERL=$sroot/bin/slapd/admin/bin/perl
+PERL=perl # just use perl from PATH
start_server()
{
@@ -60,18 +60,6 @@
cd $cwd
}
-install_nsperl()
-{
- # the current version of nsPerl to use is defined in the slapd.inf
- nsperlinst=`grep '^NSPerlPostInstall' setup/slapd/slapd.inf | cut -f2 -d= 2> /dev/null`
- if [ "$nsperlinst" ]; then
- # run the nsperl installer
- $nsperlinst > setup/nsperl/install.log
- # use nsperl as our local copy of perl
- cp `dirname $nsperlinst`/nsperl $PERL
- fi
-}
-
wrap_security_tools()
{
cwd=`pwd`
@@ -148,8 +136,6 @@
fi
done
fi
-
- install_nsperl
fi
if [ $reconfig ] ; then
@@ -171,6 +157,8 @@
start_server $sroot $dir
echo ""
done
+ # fix any non-instance specific files - omit server instance argument
+ $PERL $sroot/bin/slapd/admin/bin/upgradeServer $sroot
fi
wrap_security_tools $sroot
Index: setup.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup.sh 3 May 2005 01:19:22 -0000 1.5
+++ setup.sh 21 Oct 2005 19:21:18 -0000 1.6
@@ -39,11 +39,5 @@
setupdir=`dirname $0`
cd ${setupdir}
-# Configure nsPerl
-if [ ! -f "./tools/perl" ]; then
- ./tools/nsPerl5.6.1/install > /dev/null
- ln -s ./nsPerl5.6.1/nsperl ./tools/perl
-fi
-
# Kick off setup script
./setup.pl $*
Index: slapd.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd.inf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slapd.inf 19 Apr 2005 22:07:20 -0000 1.6
+++ slapd.inf 21 Oct 2005 19:21:18 -0000 1.7
@@ -52,7 +52,7 @@
Security= %%%SECURITY%%%
Vendor= Fedora Project
Description= %%%SERVER_NAME%%%
-Dependencies= base/4.5, svrcore/4.5, nsperl561/1.13, perldap14/1.01
+Dependencies= base/4.5, svrcore/4.5
ProductName=Directory Server
IsDirLite=%%%IS_DIR_LITE%%%
SourcePath=slapd
@@ -65,7 +65,6 @@
Checked=True
Mandatory=False
IsLdap=True
-NSPerlPostInstall=lib/nsPerl5.6.1/install
[slapd-client]
Name= Fedora Directory Server Console
More information about the Fedora-directory-commits
mailing list