Accepting request 1231756 from Archiving

OBS-URL: https://build.opensuse.org/request/show/1231756
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dump?expand=0&rev=27

dump-0.4b43-include.patch

@@ -1,11 +1,13 @@
---- dump/main.c
-+++ dump/main.c
-@@ -67,6 +67,8 @@
+Index: b/dump/main.c
+===================================================================
+--- a/dump/main.c
++++ b/dump/main.c
+@@ -60,6 +60,8 @@
  #include <ext2fs/ext2fs.h>
  #include <sys/stat.h>
  #include <bsdcompat.h>
 +
 +#define pgoff_t unsigned long
  #include <linux/fs.h>	/* for definition of BLKFLSBUF */
- #elif defined sunos
- #include <sys/vnode.h>
+ 
+ #include <protocols/dumprestore.h>

dump-0.4b46-pathnames.patch

@@ -1,8 +1,8 @@
-Index: dump-0.4b46/dump/dump.8.in
+Index: b/dump/dump.8.in
 ===================================================================
---- dump-0.4b46.orig/dump/dump.8.in
-+++ dump-0.4b46/dump/dump.8.in
-@@ -199,7 +199,7 @@ exist, dump doesn't create a new remote
+--- a/dump/dump.8.in
++++ b/dump/dump.8.in
+@@ -211,7 +211,7 @@ exist, dump doesn't create a new remote
  The default path name of the remote
  .BR rmt (8)
  program is
@@ -11,10 +11,10 @@ Index: dump-0.4b46/dump/dump.8.in
  this can be overridden by the environment variable
  .BR RMT .
  .TP
-Index: dump-0.4b46/dump/Makefile.am
+Index: b/dump/Makefile.am
 ===================================================================
---- dump-0.4b46.orig/dump/Makefile.am
-+++ dump-0.4b46/dump/Makefile.am
+--- a/dump/Makefile.am
++++ b/dump/Makefile.am
 @@ -5,7 +5,6 @@ EXTRA_DIST =
  man_MANS = dump.8
  DISTCLEANFILES += dump.8
@@ -31,10 +31,10 @@ Index: dump-0.4b46/dump/Makefile.am
  
  uninstall-hook:
  	$(RM) -f $(DESTDIR)$(sbindir)/rdump
-Index: dump-0.4b46/restore/Makefile.am
+Index: b/restore/Makefile.am
 ===================================================================
---- dump-0.4b46.orig/restore/Makefile.am
-+++ dump-0.4b46/restore/Makefile.am
+--- a/restore/Makefile.am
++++ b/restore/Makefile.am
 @@ -5,7 +5,6 @@ EXTRA_DIST =
  man_MANS = restore.8
  DISTCLEANFILES += restore.8

dump-0.4b46-rmt-ermt.patch

@@ -5,10 +5,10 @@ References:
 Upstream: submitted
 
 
-Index: dump-0.4b46/rmt/Makefile.am
+Index: b/rmt/Makefile.am
 ===================================================================
---- dump-0.4b46.orig/rmt/Makefile.am
-+++ dump-0.4b46/rmt/Makefile.am
+--- a/rmt/Makefile.am
++++ b/rmt/Makefile.am
 @@ -1,17 +1,23 @@
  AM_CPPFLAGS = -I$(top_srcdir)/compat/include
  DISTCLEANFILES =
@@ -36,7 +36,7 @@ Index: dump-0.4b46/rmt/Makefile.am
 -DISTCLEANFILES += rmt.8
 -EXTRA_DIST += rmt.8.in
 -
- rmt_SOURCES = rmt.c
+ rmt_SOURCES = rmt.c rmt.h
  rmt_LDADD = ../compat/lib/libcompat.la $(EXT2FS_LIBS)
  
 @@ -22,3 +28,8 @@ rmt.8: rmt.8.in
@@ -48,13 +48,13 @@ Index: dump-0.4b46/rmt/Makefile.am
 +	sed -e "s|__DATE__|$(DATE)|g" \
 +	    -e "s|__VERSION__|$(VERSION)|g" $< > $@
 +
-Index: dump-0.4b46/configure.ac
+Index: b/configure.ac
 ===================================================================
---- dump-0.4b46.orig/configure.ac
-+++ dump-0.4b46/configure.ac
-@@ -80,9 +80,6 @@ AC_MSG_CHECKING([whether to build ermt])
+--- a/configure.ac
++++ b/configure.ac
+@@ -87,9 +87,6 @@ AC_MSG_CHECKING([whether to build ermt])
  BUILD_ERMT=no
- AC_ARG_ENABLE([ermt], [AC_HELP_STRING([--enable-ermt], [compile ermt, an encrypting version of rmt @<:@default=no@:>@])])
+ AC_ARG_ENABLE([ermt], [AS_HELP_STRING([--enable-ermt],[compile ermt, an encrypting version of rmt @<:@default=no@:>@])])
  if test "$enable_ermt" = "yes"; then
 -	if test "$BUILD_RMT" != "yes"; then
 -		AC_MSG_ERROR([ermt requires --enable-rmt])
@@ -62,18 +62,18 @@ Index: dump-0.4b46/configure.ac
  	BUILD_ERMT=yes
  fi
  AM_CONDITIONAL([BUILD_ERMT], [test "$BUILD_ERMT" = "yes"])
-Index: dump-0.4b46/Makefile.am
+Index: b/Makefile.am
 ===================================================================
---- dump-0.4b46.orig/Makefile.am
-+++ dump-0.4b46/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,9 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
--SUBDIRS = compat/lib common dump restore
+-SUBDIRS = compat/lib common dump restore faketape
 -if BUILD_RMT
 -SUBDIRS += rmt
 -endif
-+SUBDIRS = compat/lib common dump restore rmt
++SUBDIRS = compat/lib common dump restore rmt faketape
  
  EXTRA_DIST = \
  	dump.lsm KNOWNBUGS MAINTAINERS REPORTING-BUGS \

dump-0.4b47.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d021acde4fbbed3d93ebad981422f671f48d66b29ec88d7de83642ecfbff4fd0
-size 583380

dump.changes

@@ -1,3 +1,67 @@
+-------------------------------------------------------------------
+Tue Dec 17 20:03:34 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 0.4b49:
+  * Reworking of regression tests and test harness
+  * Import some patches from the Debian package.
+  * restore -N should never change the fs. Fixes #154
+  * Support outputting list of files from restore -t with '\0' separator
+    (Patch from debian bug 703564 by Heiko Schlittermann)
+  * Fix reading of QFA file when listing tape.
+  * Support restoring to filesystems with a blocksize that isn't a multiple
+    of TP_BSIZE (debian bug 995992). This is a different fix to the one
+    currently in debian. The advantage of using a common multiple, if
+    available, is that every FS block will only be written to once.
+    Fixed an issue where the alignment between blocksize and writing pos
+    becomes misaligned when a sparse hole doesn't occupy a full fs block
+    (happens when restoring to a FS with a different, larger blocksize than
+    the one the dump was taken on.
+  * Numerous other minor patches from the Debian package
+  * Don't read off end of buffer when restoring symlinks
+  * Fix some weirdness around dumping a subdirectory. Do not include the
+    inodes for all of the items in the subdirectories - which then give a
+    restore error "inode not found on tape"
+  * Fix EA problem when EAs blocks are read immediately before a tape change.
+  * Allow compressed dumps to work when -b blocksize setting is the maximum
+    a tape drive supports.
+  * Remove code added for building on systems other than __linux__
+  * Major reworking of how reading from disk and tape works. Dump now
+    supports writing a compressed dump to a file and then writing that to
+    tape. There is now only one "read" function. We do not have separate
+    functions for reading tapes, files, compressed tapes, compressed files.
+  * Improve the efficiency of TS_ADDR (and TS_INODE) record for
+    representing larger files. A single TS_ADDR record can now represent up
+    to 4GB of file rather than just 512K. Dumps written by 0.4b49 cannot be
+    restored using 0.4b48 and before.
+- 0.4b48 changelog:
+  * Handle fs with more than 2^32 blocks (Greg Oster)
+  * Handle EA stored in blocks with address >2^32.
+  * Handle the case were EAs are stored across two blocks. Fixes several
+    reported bugs regarding the restore of directory attributes.
+    Additionally, now restore -C passes too. Originally restore -C was
+    patched for files, but not directories, in debian bug#940473 by
+    Alexander Zangerl.  Substantially redone and extended to directory
+    attributes here.
+  * Do not record garbage data in dump for files with
+    EXT2_EXTENT_FLAGS_UNINIT set indicating that the disk block has not
+    been written to and should be assumed to be all zeros.
+  * Dump small files on ext4 partitions with -O inline-data set.
+  * Major performance enhancements on the restoring and verifying of very
+    sparse files.
+  * Handle dumps that are over 2^32 (tape) blocks long (>4T)
+  * Handle restoring sparse files that start with a hole from dump versions
+    0.4b42/43. Previously they were restored but corrupted as some of the
+    initial hole was moved to the end.
+  * Many cleanups. Move to autoconf v0.71. Remove need to build with
+    -fcommon. Build with -W -Wall and without compiler warnings. Add some
+    compile time checks for structures that are written to tape and must
+    not change.
+  * Extensive regression tests. Every bug fixed by 0.4b48 release is now
+    covered by a regression test along with testing the restore of a historical
+    dump created by the previous versions from 0.4b5 through 0.4b47.
+- Use autopatch
+- Refresh patches
+
 -------------------------------------------------------------------
 Mon Feb 26 07:54:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

dump.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dump
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           dump
-Version:        0.4b47
+Version:        0.4b49
 Release:        0
 Summary:        Programs for backing up and restoring ext2/3/4 filesystems
 License:        BSD-3-Clause
@@ -57,7 +57,7 @@ restore a full backup of a file system.
 Summary:        Provides certain programs with access to remote tape devices
 Group:          Productivity/Archiving/Backup
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Provides:       rmt
 
 %description	rmt
@@ -68,9 +68,7 @@ restoring files from a backup), tar (an archiving program) and cpio.
 %prep
 %setup -q
 cp %{SOURCE1} rmt/
-%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 3
+%autopatch -p1
 
 %build
 autoreconf -fiv