[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.3, 1.4 migrate-ds.pl.in, 1.3, 1.4 setup-ds.pl.in, 1.7, 1.8 template-ns-newpwpolicy.pl.in, 1.4, 1.5

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9035/ldapserver/ldap/admin/src/scripts

Modified Files:
	DSCreate.pm.in migrate-ds.pl.in setup-ds.pl.in 
	template-ns-newpwpolicy.pl.in 
Log Message:
Resolves: bug 250535
Bug Description: improve perldap script execution ability on bundled platforms
Reviewed by: nkinder (Thanks!)
Fix Description: Most platforms will just use perl from PATH.  However, on Solaris and HP-UX, we have to use special 64 bit versions to execute perldap, since perldap is 64 bit on those platforms.  Also, if bundling all of the dependent components into the single package, we need to make sure the perl library path is set correctly to find perldap.
The last step will be to build our version of perldap on the bundled platforms to use rpath to point to the correct runtime library location.
Platforms tested: RHEL4, HP-UX 11.23 IPF 64 bit
Flag Day: no
Doc impact: no



Index: DSCreate.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DSCreate.pm.in	26 Jul 2007 20:40:11 -0000	1.3
+++ DSCreate.pm.in	2 Aug 2007 14:39:01 -0000	1.4
@@ -201,7 +201,8 @@
 
 sub createInstanceScripts {
     my $inf = shift;
-    my $myperl = "!/usr/bin/env perl";
+    my $perlexec = "@perlexec@" || "/usr/bin/env perl";
+    my $myperl = "!$perlexec";
     my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
     my %maptable = (
         "DS-ROOT" => $inf->{General}->{prefix},


Index: migrate-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.pl.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- migrate-ds.pl.in	18 Jul 2007 20:37:11 -0000	1.3
+++ migrate-ds.pl.in	2 Aug 2007 14:39:01 -0000	1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
 # BEGIN COPYRIGHT BLOCK
 # This Program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -47,7 +47,7 @@
 #
 ##########################
 
-use lib '@perldir@';
+use lib qw(@perlpath@);
 
 use strict;
 


Index: setup-ds.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/setup-ds.pl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setup-ds.pl.in	18 Jul 2007 20:37:11 -0000	1.7
+++ setup-ds.pl.in	2 Aug 2007 14:39:01 -0000	1.8
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@perlexec@
 # BEGIN COPYRIGHT BLOCK
 # This Program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -37,7 +37,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib '@perldir@';
+use lib qw(@perlpath@);
 
 use strict;
 


Index: template-ns-newpwpolicy.pl.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template-ns-newpwpolicy.pl.in	12 Feb 2007 19:55:10 -0000	1.4
+++ template-ns-newpwpolicy.pl.in	2 Aug 2007 14:39:01 -0000	1.5
@@ -39,6 +39,8 @@
 # END COPYRIGHT BLOCK
 #
 
+use lib qw(@perlpath@);
+
 # enable the use of our bundled perldap with our bundled ldapsdk libraries
 # all of this nonsense can be omitted if the mozldapsdk and perldap are
 # installed in the operating system locations (e.g. /usr/lib /usr/lib/perl5)