Blame SOURCES/rear-bz1652828-bz1652853.patch

3adda6
diff --git a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
3adda6
index 9c4212ae..873e244e 100644
3adda6
--- a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
3adda6
+++ b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
3adda6
@@ -54,9 +54,13 @@ Log "copy_as_is_executables = ${copy_as_is_executables[@]}"
3adda6
 # add them to the LIBS list if they are not yet included in the copied files:
3adda6
 Log "Adding required libraries of executables in all the copied files to LIBS"
3adda6
 local required_library=""
3adda6
-for required_library in $( RequiredSharedOjects "${copy_as_is_executables[@]}" ) ; do
3adda6
-    # Skip when the required library was already actually copied by 'tar' above:
3adda6
-    grep -q "$required_library" $copy_as_is_filelist_file && continue
3adda6
+for required_library in $( RequiredSharedObjects "${copy_as_is_executables[@]}" ) ; do
3adda6
+    # Skip when the required library was already actually copied by 'tar' above.
3adda6
+    # grep for a full line (copy_as_is_filelist_file contains 1 file name per line)
3adda6
+    # to avoid that libraries get skipped when their library path is a substring
3adda6
+    # of another already copied library, e.g. do not skip /path/to/lib when
3adda6
+    # /other/path/to/lib was already copied, cf. https://github.com/rear/rear/pull/1976
3adda6
+    grep -q "^${required_library}\$" $copy_as_is_filelist_file && continue
3adda6
     # Skip when the required library is already in LIBS:
3adda6
     IsInArray "$required_library" "${LIBS[@]}" && continue
3adda6
     Log "Adding required library '$required_library' to LIBS"
3adda6
diff --git a/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh b/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh
3adda6
index f7809bc7..ed02dea9 100644
3adda6
--- a/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh
3adda6
+++ b/usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh
3adda6
@@ -62,16 +62,16 @@ Log "Binaries being copied: ${all_binaries[@]}"
3adda6
 copy_binaries "$ROOTFS_DIR/bin" "${all_binaries[@]}"
3adda6
 
3adda6
 # Copy libraries:
3adda6
-# It is crucial to also have all LIBS itself in all_libs because RequiredSharedOjects()
3adda6
+# It is crucial to also have all LIBS itself in all_libs because RequiredSharedObjects()
3adda6
 # outputs only those libraries that are required by a library but not the library itself
3adda6
 # so that without all LIBS itself in all_libs those libraries in LIBS are missing that
3adda6
 # are not needed by a binary in all_binaries (all_binaries were already copied above).
3adda6
-# RequiredSharedOjects outputs the required shared objects on STDOUT.
3adda6
+# RequiredSharedObjects outputs the required shared objects on STDOUT.
3adda6
 # The output are absolute paths to the required shared objects.
3adda6
 # The output can also be symbolic links (also as absolute paths).
3adda6
 # In case of symbolic links only the link but not the link target is output.
3adda6
 # Therefore for symbolic links also the link target gets copied below.
3adda6
-local all_libs=( "${LIBS[@]}" $( RequiredSharedOjects "${all_binaries[@]}" "${LIBS[@]}" ) )
3adda6
+local all_libs=( "${LIBS[@]}" $( RequiredSharedObjects "${all_binaries[@]}" "${LIBS[@]}" ) )
3adda6
 
3adda6
 Log "Libraries being copied: ${all_libs[@]}"
3adda6
 local lib=""
3adda6
diff --git a/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh b/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh
3adda6
index 9803200d..8cb27d78 100644
3adda6
--- a/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh
3adda6
+++ b/usr/share/rear/build/OPALPBA/Linux-i386/391_list_executable_dependencies.sh
3adda6
@@ -8,7 +8,7 @@ if is_true $KEEP_BUILD_DIR; then
3adda6
     executable_dependencies_list="$TMP_DIR/executable-dependencies"
3adda6
 
3adda6
     for executable in "${executables[@]}"; do
3adda6
-        dependents=( $(RequiredSharedOjects "$ROOTFS_DIR/$executable") )
3adda6
+        dependents=( $(RequiredSharedObjects "$ROOTFS_DIR/$executable") )
3adda6
         echo "$executable: ${dependents[*]}"
3adda6
     done > "$executable_dependencies_list"
3adda6
 
3adda6
diff --git a/usr/share/rear/build/default/980_verify_rootfs.sh b/usr/share/rear/build/default/980_verify_rootfs.sh
3adda6
index f8b3e8e9..d03e5f34 100644
3adda6
--- a/usr/share/rear/build/default/980_verify_rootfs.sh
3adda6
+++ b/usr/share/rear/build/default/980_verify_rootfs.sh
3adda6
@@ -51,6 +51,11 @@ if test "$BACKUP" = "SESAM" ; then
3adda6
     # related libraries
3adda6
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SESAM_LD_LIBRARY_PATH
3adda6
 fi
3adda6
+if test "$BACKUP" = "NBU" ; then
3adda6
+    # Use a NBU-specific LD_LIBRARY_PATH to find NBU libraries
3adda6
+    # see https://github.com/rear/rear/issues/1974
3adda6
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$NBU_LD_LIBRARY_PATH
3adda6
+fi
3adda6
 # Actually test all binaries for 'not found' libraries.
3adda6
 # Find all binaries and libraries also e.g. those that are copied via COPY_AS_IS into other paths:
3adda6
 for binary in $( find $ROOTFS_DIR -type f -executable -printf '/%P\n' ); do
3adda6
diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
3adda6
index 0f0d0675..796f228a 100644
3adda6
--- a/usr/share/rear/conf/default.conf
3adda6
+++ b/usr/share/rear/conf/default.conf
3adda6
@@ -1467,7 +1467,8 @@ OBDR_BLOCKSIZE=2048
3adda6
 ##
3adda6
 #
3adda6
 COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var/auth/[mn]*.txt )
3adda6
-COPY_AS_IS_EXCLUDE_NBU=( "/usr/openv/netbackup/logs/*" "/usr/openv/netbackup/bin/bpjava*" "/usr/openv/netbackup/bin/xbp" )
3adda6
+COPY_AS_IS_EXCLUDE_NBU=( "/usr/openv/netbackup/logs/*" "/usr/openv/netbackup/bin/bpjava*" /usr/openv/netbackup/bin/xbp /usr/openv/netbackup/bin/private /usr/openv/lib/java /usr/openv/lib/shared/vddk /usr/openv/netbackup/baremetal )
3adda6
+NBU_LD_LIBRARY_PATH="/usr/openv/lib"
3adda6
 PROGS_NBU=( )
3adda6
 
3adda6
 ##
3adda6
diff --git a/usr/share/rear/lib/_input-output-functions.sh b/usr/share/rear/lib/_input-output-functions.sh
3adda6
index d5eed43e..bdbf593d 100644
3adda6
--- a/usr/share/rear/lib/_input-output-functions.sh
3adda6
+++ b/usr/share/rear/lib/_input-output-functions.sh
3adda6
@@ -324,10 +324,11 @@ function LogToSyslog () {
3adda6
 # see https://github.com/rear/rear/issues/729
3adda6
 function has_binary () {
3adda6
     for bin in $@ ; do
3adda6
-        # Suppress success output via stdout (but keep failure output via stderr):
3adda6
-        if type $bin 1>/dev/null ; then
3adda6
-            return 0
3adda6
-        fi
3adda6
+        # Suppress success output via stdout which is crucial when has_binary is called
3adda6
+        # in other functions that provide their intended function results via stdout
3adda6
+        # to not pollute intended function results with intermixed has_binary stdout
3adda6
+        # (e.g. the RequiredSharedObjects function) but keep failure output via stderr:
3adda6
+        type $bin 1>/dev/null && return 0
3adda6
     done
3adda6
     return 1
3adda6
 }
3adda6
diff --git a/usr/share/rear/lib/linux-functions.sh b/usr/share/rear/lib/linux-functions.sh
3adda6
index 6a767367..3fb44e6d 100644
3adda6
--- a/usr/share/rear/lib/linux-functions.sh
3adda6
+++ b/usr/share/rear/lib/linux-functions.sh
3adda6
@@ -100,13 +100,13 @@ function FindStorageDrivers () {
3adda6
 
3adda6
 # Determine all required shared objects (shared/dynamic libraries)
3adda6
 # for programs and/or shared objects (binaries) specified in $@.
3adda6
-# RequiredSharedOjects outputs the required shared objects on STDOUT.
3adda6
+# RequiredSharedObjects outputs the required shared objects on STDOUT.
3adda6
 # The output are absolute paths to the required shared objects.
3adda6
 # The output can also be symbolic links (also as absolute paths).
3adda6
 # In case of symbolic links only the link but not the link target is output.
3adda6
-function RequiredSharedOjects () {
3adda6
-    has_binary ldd || Error "Cannot run RequiredSharedOjects() because there is no ldd binary"
3adda6
-    Log "RequiredSharedOjects: Determining required shared objects"
3adda6
+function RequiredSharedObjects () {
3adda6
+    has_binary ldd || Error "Cannot run RequiredSharedObjects() because there is no ldd binary"
3adda6
+    Log "RequiredSharedObjects: Determining required shared objects"
3adda6
     # It uses 'ldd' to determine all required shared objects because 'ldd' outputs
3adda6
     # also transitively required shared objects i.e. libraries needed by libraries,
3adda6
     # e.g. for /usr/sbin/parted also the libraries needed by the libparted library:
3adda6
@@ -164,10 +164,11 @@ function RequiredSharedOjects () {
3adda6
     #  2. Line: "        lib (mem-addr)"                 -> virtual library
3adda6
     #  3. Line: "        lib => not found"               -> print error to stderr
3adda6
     #  4. Line: "        lib => /path/to/lib (mem-addr)" -> print $3 '/path/to/lib'
3adda6
-    #  5. Line: "        /path/to/lib (mem-addr)"        -> print $1 '/path/to/lib'
3adda6
+    #  5. Line: "        /path/to/lib => /path/to/lib2 (mem-addr)" -> print $3 '/path/to/lib2'
3adda6
+    #  6. Line: "        /path/to/lib (mem-addr)"        -> print $1 '/path/to/lib'
3adda6
     ldd "$@" | awk ' /^\t.+ => not found/ { print "Shared object " $1 " not found" > "/dev/stderr" }
3adda6
                      /^\t.+ => \// { print $3 }
3adda6
-                     /^\t\// { print $1 } ' | sort -u
3adda6
+                     /^\t\// && !/ => / { print $1 } ' | sort -u
3adda6
 }
3adda6
 
3adda6
 # Provide a shell, with custom exit-prompt and history
3adda6
diff --git a/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh b/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh
3adda6
index e01dcdbd..3cc29777 100644
3adda6
--- a/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh
3adda6
+++ b/usr/share/rear/prep/NBU/default/450_check_nbu_client_configured.sh
3adda6
@@ -5,5 +5,6 @@
3adda6
 Log "Running: /usr/openv/netbackup/bin/bplist command"
3adda6
 LANG=C /usr/openv/netbackup/bin/bplist -l -s `date -d "-5 days" \
3adda6
 	"+%m/%d/%Y"` / >/dev/null
3adda6
-[ $? -gt 0 ] && LogPrint "WARNING: Netbackup bplist check failed with error code $?.
3adda6
+rc=$?
3adda6
+[ $rc -gt 0 ] && LogPrint "WARNING: Netbackup bplist check failed with error code ${rc}.
3adda6
 See $RUNTIME_LOGFILE for more details."