Inicio Explorar Axuda
Rexistro Iniciar sesión
Apq
/
389-ds-base
réplica de https://github.com/389ds/389-ds-base.git
1
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

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)
Rich Megginson %!s(int64=15) %!d(string=hai) anos
pai
9d02126770
achega
91bc19ddbd
Modificáronse 11 ficheiros con 16 adicións e 16 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 1
      ldap/admin/src/scripts/template-bak2db.in
  2. 1 1
      ldap/admin/src/scripts/template-db2bak.in
  3. 1 1
      ldap/admin/src/scripts/template-db2index.in
  4. 1 1
      ldap/admin/src/scripts/template-db2ldif.in
  5. 1 1
      ldap/admin/src/scripts/template-dbverify.in
  6. 1 1
      ldap/admin/src/scripts/template-ldif2db.in
  7. 2 2
      ldap/admin/src/scripts/template-restoreconfig.in
  8. 2 2
      ldap/admin/src/scripts/template-saveconfig.in
  9. 2 2
      ldap/admin/src/scripts/template-suffix2instance.in
  10. 2 2
      ldap/admin/src/scripts/template-upgradedb.in
  11. 2 2
      ldap/admin/src/scripts/template-vlvindex.in

+ 1 - 1
ldap/admin/src/scripts/template-bak2db.in
Ver ficheiro 

@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 
 if [ "$prefix" = "/" ] ; then
 
 if [ "$prefix" = "/" ] ; then
 
     prefix=""
 
     prefix=""
 
 fi
 
 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
 
 if [ -n "$prefix" ] ; then
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
 fi
 
 fi

+ 1 - 1
ldap/admin/src/scripts/template-db2bak.in
Ver ficheiro 

@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 
 if [ "$prefix" = "/" ] ; then
 
 if [ "$prefix" = "/" ] ; then
 
     prefix=""
 
     prefix=""
 
 fi
 
 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
 
 if [ -n "$prefix" ] ; then
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
 fi
 
 fi

+ 1 - 1
ldap/admin/src/scripts/template-db2index.in
Ver ficheiro 

@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 
 if [ "$prefix" = "/" ] ; then
 
 if [ "$prefix" = "/" ] ; then
 
     prefix=""
 
     prefix=""
 
 fi
 
 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
 
 if [ -n "$prefix" ] ; then
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
 fi
 
 fi

+ 1 - 1
ldap/admin/src/scripts/template-db2ldif.in
Ver ficheiro 

@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 
 if [ "$prefix" = "/" ] ; then
 
 if [ "$prefix" = "/" ] ; then
 
     prefix=""
 
     prefix=""
 
 fi
 
 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
 
 if [ -n "$prefix" ] ; then
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
 fi
 
 fi

+ 1 - 1
ldap/admin/src/scripts/template-dbverify.in
Ver ficheiro 

@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 
 if [ "$prefix" = "/" ] ; then
 
 if [ "$prefix" = "/" ] ; then
 
     prefix=""
 
     prefix=""
 
 fi
 
 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
 
 if [ -n "$prefix" ] ; then
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
 fi
 
 fi

+ 1 - 1
ldap/admin/src/scripts/template-ldif2db.in
Ver ficheiro 

@@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}"
 
 if [ "$prefix" = "/" ] ; then
 
 if [ "$prefix" = "/" ] ; then
 
     prefix=""
 
     prefix=""
 
 fi
 
 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
 
 if [ -n "$prefix" ] ; then
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@"
 
 fi
 
 fi

+ 2 - 2
ldap/admin/src/scripts/template-restoreconfig.in
Ver ficheiro 

@@ -1,9 +1,9 @@
 
 #!/bin/sh
 
 #!/bin/sh
 
 
 
 prefix="{{DS-ROOT}}"
 
 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
 
 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
 
 export SHLIB_PATH
 
 
 
 cd {{SERVERBIN-DIR}}
 
 cd {{SERVERBIN-DIR}}

+ 2 - 2
ldap/admin/src/scripts/template-saveconfig.in
Ver ficheiro 

@@ -1,9 +1,9 @@
 
 #!/bin/sh
 
 #!/bin/sh
 
 
 
 prefix="{{DS-ROOT}}"
 
 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
 
 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
 
 export SHLIB_PATH
 
 
 
 cd {{SERVERBIN-DIR}}
 
 cd {{SERVERBIN-DIR}}

+ 2 - 2
ldap/admin/src/scripts/template-suffix2instance.in
Ver ficheiro 

@@ -1,9 +1,9 @@
 
 #!/bin/sh
 
 #!/bin/sh
 
 
 
 prefix="{{DS-ROOT}}"
 
 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
 
 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
 
 export SHLIB_PATH
 
 
 
 cd {{SERVERBIN-DIR}}
 
 cd {{SERVERBIN-DIR}}

+ 2 - 2
ldap/admin/src/scripts/template-upgradedb.in
Ver ficheiro 

@@ -1,9 +1,9 @@
 
 #!/bin/sh
 
 #!/bin/sh
 
 
 
 prefix="{{DS-ROOT}}"
 
 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
 
 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
 
 export SHLIB_PATH
 
 
 
 cd {{SERVERBIN-DIR}}
 
 cd {{SERVERBIN-DIR}}

+ 2 - 2
ldap/admin/src/scripts/template-vlvindex.in
Ver ficheiro 

@@ -1,9 +1,9 @@
 
 #!/bin/sh
 
 #!/bin/sh
 
 
 
 prefix="{{DS-ROOT}}"
 
 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
 
 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
 
 export SHLIB_PATH
 
 
 
 cd {{SERVERBIN-DIR}}
 
 cd {{SERVERBIN-DIR}}