From e70530495b0ac321bcc7ccf6a40889b4f7876431 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 25 2018 09:30:06 +0000 Subject: import rear-2.00-4.el7_4 --- diff --git a/SOURCES/rear-bz1532676-pr1685.patch b/SOURCES/rear-bz1532676-pr1685.patch new file mode 100644 index 0000000..f252f5a --- /dev/null +++ b/SOURCES/rear-bz1532676-pr1685.patch @@ -0,0 +1,14 @@ +diff --git a/usr/share/rear/verify/NETFS/default/550_check_backup_archive.sh b/usr/share/rear/verify/NETFS/default/550_check_backup_archive.sh +index a7bb31f..57f7537 100644 +--- a/usr/share/rear/verify/NETFS/default/550_check_backup_archive.sh ++++ b/usr/share/rear/verify/NETFS/default/550_check_backup_archive.sh +@@ -26,7 +26,9 @@ for restoreinput in "${RESTORE_ARCHIVES[@]}" ; do + if is_true "$BACKUP_INTEGRITY_CHECK" && test -f $restoreinput.md5 ; then + if ! test -f "$backup_splitted_file" ; then + LogPrint "Checking integrity of $restoreinput_filename" ++ pushd ${restoreinput%/*} + md5sum -c $restoreinput.md5 || Error "Integrity check failed. Restore aborted because BACKUP_INTEGRITY_CHECK is enabled." ++ popd + fi + fi + done diff --git a/SPECS/rear.spec b/SPECS/rear.spec index 1746bee..c39ba30 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.00 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ @@ -10,6 +10,7 @@ URL: http://relax-and-recover.org/ # as GitHub stopped with download section we need to go back to Sourceforge for downloads Source0: https://sourceforge.net/projects/rear/files/rear/2.00/%{version}/rear-%{version}.tar.gz Patch0: pr-1481.patch +Patch1: rear-bz1532676-pr1685.patch #Patch0: 0001-Added-PRE-POST-backup-scripts-in-order-to-be-able-to.patch #Patch1: 0002-Solved-error-with-exit-tasks-on-PRE-POST-backup-scri.patch #Patch2: 0003-Added-some-explanation-of-PRE-POST-backup-scripts-in.patch @@ -96,7 +97,7 @@ fi %prep %setup %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 #%patch2 -p1 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron @@ -127,6 +128,10 @@ echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >re %{_sbindir}/rear %changelog +* Fri Jan 12 2018 Pavel Cahyna - 2.00-4 +- cd to the correct directory before md5sum to fix BACKUP_INTEGRITY_CHECK. + Upstream PR#1685, bz1532676 + * Wed Sep 13 2017 Pavel Cahyna - 2.00-3 - Fix rear mkrescue on systems w/o UEFI. Upstream PR#1481 issue#1478 - Resolves: #1479002