[packages/dump] - updated to 0.4b51; added patch for some ext2fs inode members mismatch

[qboosh]

commit 7b6fa4fbc3f457256ab443f16fa644b8591bd290
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 20 18:56:56 2025 +0200

    - updated to 0.4b51; added patch for some ext2fs inode members mismatch

 dump-ext2fs.patch | 26 ++++++++++++++++++++++++++
 dump.spec         | 30 +++++++++++++++++++++++-------
 2 files changed, 49 insertions(+), 7 deletions(-)
---
diff --git a/dump.spec b/dump.spec
index 6d55819..1b7381e 100644
--- a/dump.spec
+++ b/dump.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	kerberos	# Kerberos support (requires krcmd function)
+
 Summary:	Programs for backing up and restoring filesystems
 Summary(de.UTF-8):	Dump/Restore-Backup-System
 Summary(es.UTF-8):	Sistema de copia de seguridad dump/restore
@@ -8,24 +12,31 @@ Summary(ru.UTF-8):	Программы для резервного копиров
 Summary(tr.UTF-8):	dump/restore yedekleme sistemi
 Summary(uk.UTF-8):	Програми для резервного копіювання та відновлення файлових систем
 Name:		dump
-Version:	0.4b49
+Version:	0.4b51
 Release:	1
 License:	BSD
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/dump/%{name}-%{version}.tar.gz
-# Source0-md5:	66f524fae85a0b0c650b8cd9ef237187
-URL:		http://dump.sourceforge.net/
-BuildRequires:	autoconf >= 2.57
+Source0:	https://downloads.sourceforge.net/dump/%{name}-%{version}.tar.gz
+# Source0-md5:	9d1c8e4c6ffdf729e359737d2360040c
+Patch0:		%{name}-ext2fs.patch
+URL:		https://dump.sourceforge.net/
+BuildRequires:	autoconf >= 2.71
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	e2fsprogs-devel >= 1.20.0
+BuildRequires:	libblkid-devel
+BuildRequires:	libcom_err-devel
 BuildRequires:	libselinux-devel
+BuildRequires:	libstdc++-devel >= 6:8
+BuildRequires:	libtool >= 2:2
+BuildRequires:	libuuid-devel
 BuildRequires:	lzo-devel
-BuildRequires:	sqlite3-devel
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	openssl-devel >= 0.9.7a
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	zlib-devel
 Requires:	e2fsprogs-libs >= 1.20.0
 Requires:	rmt
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -153,15 +164,20 @@ ermt to wersja programu rmt z szyfrowaniem.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--enable-ermt \
+	%{?with_kerberos:--enable-kerberos} \
 	--enable-rmt \
 	--enable-readline \
+	--enable-selinux \
 	--disable-silent-rules
 %{__make}
 
diff --git a/dump-ext2fs.patch b/dump-ext2fs.patch
new file mode 100644
index 0000000..dddc1b6
--- /dev/null
+++ b/dump-ext2fs.patch
@@ -0,0 +1,26 @@
+--- dump-0.4b51/common/sqlite_indexer.c.orig	2025-03-18 19:31:32.000000000 +0100
++++ dump-0.4b51/common/sqlite_indexer.c	2025-04-20 18:22:22.061821947 +0200
+@@ -381,11 +381,11 @@ sqlite_addInode(struct ext2_inode_large
+ 	mts[0] = 0;
+ 	cts[0] = 0;
+ 
+-	t = dp->di_atime;
++	t = dp->i_atime;
+ 	strftime(ats, sizeof ats, "%FT%T", gmtime(&t));
+-	t = dp->di_mtime;
++	t = dp->i_mtime;
+ 	strftime(mts, sizeof ats, "%FT%T", gmtime(&t));
+-	t = dp->di_ctime;
++	t = dp->i_ctime;
+ 	strftime(cts, sizeof ats, "%FT%T", gmtime(&t));
+ 
+ 	// xattr: dp->di_extraisize != 0
+@@ -394,7 +394,7 @@ sqlite_addInode(struct ext2_inode_large
+ 
+ 	snprintf(buffer, sizeof buffer,
+ 		"insert into inode(backup_id, ino, is_deleted, mode, nlink, uid, gid, rdev, size, atime, mtime, ctime, has_xattr, has_acl, volume, recno) values(1, %d, '%s', %d, %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %lld)\n",
+-		ino, "N", dp->di_mode, dp->di_nlink, dp->di_uid, dp->di_gid, dp->di_rdev, dp->di_size, ats, mts, cts, (dp->di_extraisize == 0) ? "N" : "Y", (dp->di_file_acl != 0) ? "Y" : "N", spcl.c_volume, u_spcl_c_tapea());
++		ino, "N", dp->i_mode, dp->i_links_count, dp->i_uid, dp->i_gid, 0 /* rdev? */, dp->i_size, ats, mts, cts, (dp->i_extra_isize == 0) ? "N" : "Y", (dp->i_file_acl != 0) ? "Y" : "N", spcl.c_volume, u_spcl_c_tapea());
+ 
+ 	EXEC(db, buffer);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dump.git/commitdiff/7b6fa4fbc3f457256ab443f16fa644b8591bd290