diff --git a/dump-replacement.patch b/dump-replacement.patch new file mode 100644 index 0000000..58d3611 --- /dev/null +++ b/dump-replacement.patch @@ -0,0 +1,51 @@ +diff -urNp a/common/dumprmt.c b/common/dumprmt.c +--- a/common/dumprmt.c 2021-02-08 13:23:33.366826516 +0100 ++++ b/common/dumprmt.c 2021-02-08 13:26:13.725243819 +0100 +@@ -83,7 +83,6 @@ + #endif + + #include +-#include "dump.h" /* for X_STARTUP, X_ABORT etc */ + + #define TS_CLOSED 0 + #define TS_OPEN 1 +@@ -150,7 +149,7 @@ rmtconnaborted(UNUSED(int signo)) + } + } + if (abortifconnerr) +- exit(X_ABORT); ++ exit(3); + } + + static int +@@ -196,7 +195,7 @@ rmtgetconn(void) + *cp = '\0'; + if (!okname(tuser)) { + if (abortifconnerr) { +- exit(X_STARTUP); ++ exit(1); + } else { + return 0; + } +diff -urNp a/configure.ac b/configure.ac +--- a/configure.ac 2021-02-08 13:23:33.353826407 +0100 ++++ b/configure.ac 2021-02-08 14:44:18.373749348 +0100 +@@ -479,7 +479,6 @@ AC_CONFIG_FILES(m4_flatten([ + Makefile + common/Makefile + compat/lib/Makefile +- dump/Makefile + restore/Makefile + rmt/Makefile + ])) +diff -urNp a/Makefile.am b/Makefile.am +--- a/Makefile.am 2021-02-08 13:23:33.355826423 +0100 ++++ b/Makefile.am 2021-02-08 13:45:19.619244125 +0100 +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = compat/lib common dump restore ++SUBDIRS = compat/lib common restore + if BUILD_RMT + SUBDIRS += rmt + endif diff --git a/dump.spec b/dump.spec index e67826a..4bd1e87 100644 --- a/dump.spec +++ b/dump.spec @@ -3,11 +3,16 @@ %define _legacy_common_support 1 +%if 0%{?rhel} +Summary: Program for restoring ext2/ext3 filesystems +Name: restore +%else Summary: Programs for backing up and restoring ext2/ext3/ext4 filesystems Name: dump +%endif Epoch: 1 Version: 0.4 -Release: 0.46.%{PREVER}%{?dist} +Release: 0.47.%{PREVER}%{?dist} License: BSD URL: https://sourceforge.net/projects/dump/ Source: http://downloads.sourceforge.net/dump/dump-%{DUMP_VERSION}.tar.gz @@ -20,13 +25,28 @@ BuildRequires: lzo-devel, libtool # group is created before installation (#60461) Requires: setup Requires: rmt -Obsoletes: dump-static +%if 0%{?fedora} +Obsoletes: dump-static <= 0.4 Provides: dump-static +%endif Patch0: dump-buildfix.patch Patch1: dump-remove-lzo.patch Patch2: dump-apath.patch +%if 0%{?rhel} +# No dump package in RHEL (restore remains) +Patch101: dump-replacement.patch + +%description +The restore command performs the inverse function of dump; it can +restore a full backup of a filesystem. Subsequent incremental backups +can then be layered on top of the full backup. Single files and +directory subtrees may also be restored from full or partial backups. + +Install restore if you need restoring filesystems after backups +made by dump. +%else %description The dump package contains both dump and restore. Dump examines files in a filesystem, determines which ones need to be backed up, and @@ -38,6 +58,7 @@ directory subtrees may also be restored from full or partial backups. Install dump if you need a system for both backing up filesystems and restoring filesystems after backups. +%endif %prep %setup -q -n dump-%{DUMP_VERSION} @@ -46,6 +67,11 @@ restoring filesystems after backups. %patch1 -p1 -b .remove-lzo %patch2 -p1 -b .apath +%if 0%{?rhel} +rm -rf dump +%patch101 -p1 +%endif + %build autoreconf -fiv @@ -81,7 +107,9 @@ mkdir -p %{buildroot}%{_mandir}/man8 MANGRP=$(id -gn) pushd %{buildroot} +%if 0%{?fedora} ln -sf dump .%{_sbindir}/rdump +%endif ln -sf restore .%{_sbindir}/rrestore mkdir -p .%{_sysconfdir} > .%{_sysconfdir}/dumpdates @@ -91,16 +119,21 @@ popd %doc AUTHORS COPYING INSTALL KNOWNBUGS MAINTAINERS NEWS README REPORTING-BUGS TODO %doc dump.lsm %attr(0664,root,disk) %config(noreplace) %{_sysconfdir}/dumpdates +%if 0%{?fedora} %{_sbindir}/dump %{_sbindir}/rdump -%{_sbindir}/restore -%{_sbindir}/rrestore %{_mandir}/man8/dump.8* %{_mandir}/man8/rdump.8* +%endif +%{_sbindir}/restore +%{_sbindir}/rrestore %{_mandir}/man8/restore.8* %{_mandir}/man8/rrestore.8* %changelog +* Mon Feb 10 2021 Josef Ridky - 1:0.4-0.47.b47 +- remove dump from RHEL environment + * Mon Feb 08 2021 Jeff Makey - 1:0.4-0.46.b47 - New upstream release 0.4b47 - Update main URL.