diff --git a/dump-restore-rmdir.patch b/dump-restore-rmdir.patch new file mode 100644 index 0000000..121847a --- /dev/null +++ b/dump-restore-rmdir.patch @@ -0,0 +1,13 @@ +diff --git a/restore/restore.c b/restore/restore.c +index c773d90..8f89729 100644 +--- a/restore/restore.c ++++ b/restore/restore.c +@@ -593,7 +593,7 @@ findunreflinks(void) + if (np->e_type == LEAF) { + removeleaf(np); + freeentry(np); +- } else { ++ } else if (np->e_ino != 0){ + np->e_flags |= TMPNAME; + deleteino(np->e_ino); + np->e_next = removelist; diff --git a/dump.spec b/dump.spec index 1871e05..57ffb08 100644 --- a/dump.spec +++ b/dump.spec @@ -1,16 +1,16 @@ %define PREVER b44 %define VERSION 0.4%{PREVER} -Summary: Programs for backing up and restoring ext2/ext3 filesystems -Name: dump -Epoch: 1 -Version: 0.4 -Release: 0.25.%{PREVER}%{?dist} -License: BSD -Group: Applications/Archiving -URL: http://dump.sourceforge.net/ -Source: http://downloads.sourceforge.net/dump/dump-%{VERSION}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Programs for backing up and restoring ext2/ext3 filesystems +Name: dump +Epoch: 1 +Version: 0.4 +Release: 0.26.%{PREVER}%{?dist} +License: BSD +Group: Applications/Archiving +URL: http://dump.sourceforge.net/ +Source: http://downloads.sourceforge.net/dump/dump-%{VERSION}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: zlib-devel, bzip2-devel, automake BuildRequires: device-mapper-devel, libselinux-devel @@ -18,16 +18,17 @@ BuildRequires: lzo-minilzo BuildRequires: lzo-devel # This Requires is now mandatory because we need to ensure the "disk" # group is created before installation (#60461) -Requires: setup -Requires: rmt -Obsoletes: dump-static -Provides: dump-static +Requires: setup +Requires: rmt +Obsoletes: dump-static +Provides: dump-static -Patch0: dump-buildfix.patch -Patch1: dump-rh664616.patch -Patch2: dump-aarch64.patch -Patch3: dump-rmt-moved-star.patch -Patch4: dump-remove-lzo.patch +Patch0: dump-buildfix.patch +Patch1: dump-rh664616.patch +Patch2: dump-aarch64.patch +Patch3: dump-rmt-moved-star.patch +Patch4: dump-remove-lzo.patch +Patch5: dump-restore-rmdir.patch %description The dump package contains both dump and restore. Dump examines files @@ -49,6 +50,7 @@ restoring filesystems after backups. %patch2 -p1 -b .aarch64 %patch3 -p1 -b .rmt-moved-star %patch4 -p1 -b .remove-lzo +%patch5 -p1 -b .restore-rmdir for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do iconv -f iso-8859-1 -t utf-8 $i -o $i.new @@ -119,6 +121,10 @@ rm -rf %{buildroot} %{_mandir}/man8/rrestore.8* %changelog +* Fri Sep 25 2015 Petr Hracek - 1:0.4-0.26.b44 +- Fix hang restoring incrementals which remove directories (#972370) +- Thanks to Jason Tibbitts + * Wed Jun 17 2015 Fedora Release Engineering - 1:0.4-0.25.b44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild