diff --git a/SOURCES/rear-bz1700807.patch b/SOURCES/rear-bz1700807.patch new file mode 100644 index 0000000..e957de2 --- /dev/null +++ b/SOURCES/rear-bz1700807.patch @@ -0,0 +1,12 @@ +diff -up rear-2.4/usr/share/rear/conf/default.conf.nbu rear-2.4/usr/share/rear/conf/default.conf +--- rear-2.4/usr/share/rear/conf/default.conf.nbu 2019-09-17 08:35:47.461915240 +0200 ++++ rear-2.4/usr/share/rear/conf/default.conf 2019-09-17 08:35:47.467915240 +0200 +@@ -1470,7 +1470,7 @@ OBDR_BLOCKSIZE=2048 + # + COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var/auth/[mn]*.txt ) + 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 ) +-NBU_LD_LIBRARY_PATH="/usr/openv/lib" ++NBU_LD_LIBRARY_PATH="/usr/openv/lib:/usr/openv/netbackup/sec/at/lib/" + PROGS_NBU=( ) + + ## diff --git a/SPECS/rear.spec b/SPECS/rear.spec index d7e8634..7e11e95 100644 --- a/SPECS/rear.spec +++ b/SPECS/rear.spec @@ -2,7 +2,7 @@ Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool Name: rear Version: 2.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ @@ -21,6 +21,7 @@ Patch15: rear-bz1685166.patch Patch16: rear-bz1655956.patch Patch17: rear-bz1732328.patch Patch18: rear-bz1726982.patch +Patch20: rear-bz1700807.patch ExcludeArch: s390x ExcludeArch: s390 @@ -118,6 +119,7 @@ fi %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch20 -p1 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron @@ -152,6 +154,11 @@ TZ=UTC %{__make} -C doc %{_sbindir}/rear %changelog +* Tue Aug 27 2019 Pavel Cahyna - 2.4-10 +- Apply upstream PR2122: add additional NBU library path to fix support for + NetBackup 8. + Resolves: rhbz1700807 + * Wed Jul 31 2019 Pavel Cahyna - 2.4-9 - Apply upstream PR2173 - Cannot restore using Bacula method due to "bconsole" not showing its prompt