2 commits - ldap/admin Makefile.am Makefile.in wrappers/migratecred.in wrappers/mmldif.in wrappers/pwdhash.in

[Richard Allen Megginson]

 Makefile.am                                        |    2 ++
 Makefile.in                                        |    2 ++
 ldap/admin/src/scripts/start-dirsrv.in             |    4 ++--
 ldap/admin/src/scripts/template-bak2db.in          |    2 +-
 ldap/admin/src/scripts/template-db2bak.in          |    2 +-
 ldap/admin/src/scripts/template-db2index.in        |    2 +-
 ldap/admin/src/scripts/template-db2ldif.in         |    2 +-
 ldap/admin/src/scripts/template-dbverify.in        |    2 +-
 ldap/admin/src/scripts/template-ldif2db.in         |    2 +-
 ldap/admin/src/scripts/template-restoreconfig.in   |    4 ++--
 ldap/admin/src/scripts/template-saveconfig.in      |    4 ++--
 ldap/admin/src/scripts/template-suffix2instance.in |    4 ++--
 ldap/admin/src/scripts/template-upgradedb.in       |    4 ++--
 ldap/admin/src/scripts/template-vlvindex.in        |    4 ++--
 wrappers/migratecred.in                            |    2 +-
 wrappers/mmldif.in                                 |    2 +-
 wrappers/pwdhash.in                                |    2 +-
 17 files changed, 25 insertions(+), 21 deletions(-)

New commits:
commit 91bc19ddbd2b5f8bed2bf74fcfad7ddbd150a133
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Thu Feb 25 20:18:56 2010 -0700

    Bug 568196 - Install DS8.2 on Solaris fails - part 2
    
    https://bugzilla.redhat.com/show_bug.cgi?id=568196
    Resolves: bug 568196
    Bug Description: Install DS8.2 on Solaris fails - part 2
    Reviewed by: self
    Branch: HEAD
    Fix Description: Add pcre_libdir to all script wrappers that
    call ns-slapd, such as ldif2db, etc.
    Platforms tested: RHEL5 x86_64
    Flag Day: no
    Doc impact: no
    (cherry picked from commit 24245075d03955f26b6c827b123ac002ff16c012)

diff --git a/ldap/admin/src/scripts/template-bak2db.in
b/ldap/admin/src/scripts/template-bak2db.in
index 90ef464..12d46ca 100755
--- a/ldap/admin/src/scripts/template-bak2db.in
+++ b/ldap/admin/src/scripts/template-bak2db.in
@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
diff --git a/ldap/admin/src/scripts/template-db2bak.in
b/ldap/admin/src/scripts/template-db2bak.in
index 261919f..a0fe1f5 100755
--- a/ldap/admin/src/scripts/template-db2bak.in
+++ b/ldap/admin/src/scripts/template-db2bak.in
@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
diff --git a/ldap/admin/src/scripts/template-db2index.in
b/ldap/admin/src/scripts/template-db2index.in
index 8f9b0c6..e0e9a55 100755
--- a/ldap/admin/src/scripts/template-db2index.in
+++ b/ldap/admin/src/scripts/template-db2index.in
@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
diff --git a/ldap/admin/src/scripts/template-db2ldif.in
b/ldap/admin/src/scripts/template-db2ldif.in
index 2f74670..e519f3e 100755
--- a/ldap/admin/src/scripts/template-db2ldif.in
+++ b/ldap/admin/src/scripts/template-db2ldif.in
@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
diff --git a/ldap/admin/src/scripts/template-dbverify.in
b/ldap/admin/src/scripts/template-dbverify.in
index b5e56d9..0f71450 100755
--- a/ldap/admin/src/scripts/template-dbverify.in
+++ b/ldap/admin/src/scripts/template-dbverify.in
@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
diff --git a/ldap/admin/src/scripts/template-ldif2db.in
b/ldap/admin/src/scripts/template-ldif2db.in
index 83c579e..ce64193 100755
--- a/ldap/admin/src/scripts/template-ldif2db.in
+++ b/ldap/admin/src/scripts/template-ldif2db.in
@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 if [ "$prefix" = "/" ] ; then
     prefix=""
 fi
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@
 if [ -n "$prefix" ] ; then
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 fi
diff --git a/ldap/admin/src/scripts/template-restoreconfig.in
b/ldap/admin/src/scripts/template-restoreconfig.in
index dc210cb..0e5de9b 100755
--- a/ldap/admin/src/scripts/template-restoreconfig.in
+++ b/ldap/admin/src/scripts/template-restoreconfig.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export SHLIB_PATH
 
 cd {{SERVERBIN-DIR}}
diff --git a/ldap/admin/src/scripts/template-saveconfig.in
b/ldap/admin/src/scripts/template-saveconfig.in
index 1ce5d07..737c97b 100755
--- a/ldap/admin/src/scripts/template-saveconfig.in
+++ b/ldap/admin/src/scripts/template-saveconfig.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export SHLIB_PATH
 
 cd {{SERVERBIN-DIR}}
diff --git a/ldap/admin/src/scripts/template-suffix2instance.in
b/ldap/admin/src/scripts/template-suffix2instance.in
index dadb5f9..994f8af 100755
--- a/ldap/admin/src/scripts/template-suffix2instance.in
+++ b/ldap/admin/src/scripts/template-suffix2instance.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export SHLIB_PATH
 
 cd {{SERVERBIN-DIR}}
diff --git a/ldap/admin/src/scripts/template-upgradedb.in
b/ldap/admin/src/scripts/template-upgradedb.in
index ef3fdf2..9b6f03d 100755
--- a/ldap/admin/src/scripts/template-upgradedb.in
+++ b/ldap/admin/src/scripts/template-upgradedb.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export SHLIB_PATH
 
 cd {{SERVERBIN-DIR}}
diff --git a/ldap/admin/src/scripts/template-vlvindex.in
b/ldap/admin/src/scripts/template-vlvindex.in
index 4c61e0d..e6cd743 100755
--- a/ldap/admin/src/scripts/template-vlvindex.in
+++ b/ldap/admin/src/scripts/template-vlvindex.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@
 export SHLIB_PATH
 
 cd {{SERVERBIN-DIR}}


commit 9d02126770da84e2a48e9b3c0c36536131c4d71a
Author: Rich Megginson <rmeggins(a)redhat.com&gt;
Date:   Thu Feb 25 11:10:53 2010 -0700

    Bug 568196 - Install DS8.2 on Solaris fails
    
    https://bugzilla.redhat.com/show_bug.cgi?id=568196
    Resolves: bug 568196
    Bug Description: Install DS8.2 on Solaris fails
    Reviewed by: nhosoi (Thanks!)
    Branch: HEAD
    Fix Description: Add pcre_libdir to script wrappers for programs that use pcre
    Platforms tested: RHEL5 x86_64
    Flag Day: no
    Doc impact: no
    (cherry picked from commit 3d27198f45b4b25df667d3f86dce66a44f4bc65d)

diff --git a/Makefile.am b/Makefile.am
index 7b903ae..c3ec2f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1291,6 +1291,7 @@ fixupcmd = sed \
 	-e 's,@sasl_libdir\@,$(libdir),g' \
 	-e 's,@sasl_path\@,$(libdir)/sasl2,g' \
 	-e 's,@netsnmp_libdir\@,$(libdir),g' \
+	-e 's,@pcre_libdir\@,$(libdir),g' \
 	-e 's,@propertydir\@,$(propertydir),g' \
 	-e 's,@datadir\@,$(datadir),g' \
 	-e 's,@schemadir\@,$(schemadir),g' \
@@ -1344,6 +1345,7 @@ fixupcmd = sed \
 	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
 	-e 's,@sasl_path\@,@sasl_path@,g' \
 	-e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \
+	-e 's,@pcre_libdir\@,$(pcre_libdir),g' \
 	-e 's,@propertydir\@,$(propertydir),g' \
 	-e 's,@datadir\@,$(datadir),g' \
 	-e 's,@schemadir\@,$(schemadir),g' \
diff --git a/Makefile.in b/Makefile.in
index 0a8b5ab..bc4b1a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2270,6 +2270,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK) $(LIBS
 @BUNDLE_FALSE@	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
 @BUNDLE_FALSE@	-e 's,@sasl_path\@,@sasl_path@,g' \
 @BUNDLE_FALSE@	-e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \
+@BUNDLE_FALSE@	-e 's,@pcre_libdir\@,$(pcre_libdir),g' \
 @BUNDLE_FALSE@	-e 's,@propertydir\@,$(propertydir),g' \
 @BUNDLE_FALSE@	-e 's,@datadir\@,$(datadir),g' \
 @BUNDLE_FALSE@	-e 's,@schemadir\@,$(schemadir),g' \
@@ -2333,6 +2334,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK)
$(SASL_LINK) $(LIBS
 @BUNDLE_TRUE@	-e 's,@sasl_libdir\@,$(libdir),g' \
 @BUNDLE_TRUE@	-e 's,@sasl_path\@,$(libdir)/sasl2,g' \
 @BUNDLE_TRUE@	-e 's,@netsnmp_libdir\@,$(libdir),g' \
+@BUNDLE_TRUE@	-e 's,@pcre_libdir\@,$(libdir),g' \
 @BUNDLE_TRUE@	-e 's,@propertydir\@,$(propertydir),g' \
 @BUNDLE_TRUE@	-e 's,@datadir\@,$(datadir),g' \
 @BUNDLE_TRUE@	-e 's,@schemadir\@,$(schemadir),g' \
diff --git a/ldap/admin/src/scripts/start-dirsrv.in
b/ldap/admin/src/scripts/start-dirsrv.in
index fb9bfdb..46c48d7 100755
--- a/ldap/admin/src/scripts/start-dirsrv.in
+++ b/ldap/admin/src/scripts/start-dirsrv.in
@@ -22,9 +22,9 @@ start_instance() {
     fi
 
     prefix="$DS_ROOT"
-    LD_LIBRARY_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+   
LD_LIBRARY_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:@pcre_libdir@
     export LD_LIBRARY_PATH
-    SHLIB_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+   
SHLIB_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:@pcre_libdir@
     export SHLIB_PATH
 
     DS_CONFIG_DIR=$CONFIG_DIR
diff --git a/wrappers/migratecred.in b/wrappers/migratecred.in
index c1aeabf..dd44800 100755
--- a/wrappers/migratecred.in
+++ b/wrappers/migratecred.in
@@ -4,7 +4,7 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@
 BIN_DIR=@bindir@
 COMMAND=migratecred-bin
 
diff --git a/wrappers/mmldif.in b/wrappers/mmldif.in
index 3a89ce4..a11932e 100755
--- a/wrappers/mmldif.in
+++ b/wrappers/mmldif.in
@@ -4,7 +4,7 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@
 BIN_DIR=@bindir@
 COMMAND=mmldif-bin
 
diff --git a/wrappers/pwdhash.in b/wrappers/pwdhash.in
index ab84914..b3ef3fa 100755
--- a/wrappers/pwdhash.in
+++ b/wrappers/pwdhash.in
@@ -4,7 +4,7 @@
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
+LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@
 BIN_DIR=@bindir@
 COMMAND=pwdhash-bin