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 ++-- 11 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 24245075d03955f26b6c827b123ac002ff16c012 Author: Rich Megginson rmeggins@redhat.com 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: Directory_Server_8_2_Branch 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
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}}
389-commits@lists.fedoraproject.org
-
Richard Allen Megginson