[packages/ext3grep] Rel 2

[arekm]

commit 5e26f340f6c285efe16f419613eca7728e37a0b2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:33:18 2026 +0200

    Rel 2

 ext3grep-e2fsprogs.patch | 34 ++++++++++++++++++++++++++++++++++
 ext3grep.spec            |  7 +++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/ext3grep.spec b/ext3grep.spec
index 6d75dbc..c266b38 100644
--- a/ext3grep.spec
+++ b/ext3grep.spec
@@ -1,11 +1,12 @@
 Summary:	A tool to investigate an ext3 FS for deleted content and possibly recover it
 Name:		ext3grep
 Version:	0.10.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://ext3grep.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5:	38e134734d6c8856370ed00a9c73dbee
+Patch0:		%{name}-e2fsprogs.patch
 URL:		http://code.google.com/p/ext3grep/
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libstdc++-devel
@@ -17,10 +18,12 @@ possibly recover it.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
 %configure
-%{__make}
+%{__make} \
+	CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/ext3grep-e2fsprogs.patch b/ext3grep-e2fsprogs.patch
new file mode 100644
index 0000000..05e75aa
--- /dev/null
+++ b/ext3grep-e2fsprogs.patch
@@ -0,0 +1,34 @@
+--- ext3grep-0.10.2/src/ostream_operators.cc.orig	2026-05-21 01:31:05.000000000 +0200
++++ ext3grep-0.10.2/src/ostream_operators.cc	2026-05-21 01:31:15.000000000 +0200
+@@ -67,7 +67,8 @@
+   os << "Block size: " << block_size(super_block) << '\n';
+   os << "Fragment size: " << fragment_size(super_block) << '\n';
+   os << "Number of blocks per group: " << blocks_per_group(super_block) << '\n';
+-  os << "Number of fragments per group: " << super_block.s_frags_per_group << '\n';
++  // e2fsprogs renamed s_frags_per_group to s_clusters_per_group (same field).
++  os << "Number of fragments per group: " << super_block.s_clusters_per_group << '\n';
+   os << "Number of inodes per group: " << inodes_per_group(super_block) << '\n';
+   time_t mtime = super_block.s_mtime;
+   os << "Mount time: " << std::ctime(&mtime);
+--- ext3grep-0.10.2/src/ext3.h.orig	2026-05-21 01:31:05.908208520 +0200
++++ ext3grep-0.10.2/src/ext3.h	2026-05-21 01:31:15.499552352 +0200
+@@ -106,13 +106,15 @@
+     __u32 const* block(void) const { return i_block; }
+     __u32 generation(void) const { return i_generation; }
+     __u32 file_acl(void) const { return i_file_acl; }
+-    __u32 dir_acl(void) const { return i_dir_acl; }
++    // e2fsprogs renamed i_dir_acl to i_size_high (same on-disk field).
++    __u32 dir_acl(void) const { return i_size_high; }
+     __u32 faddr(void) const { return i_faddr; }
+     __u16 uid_high(void) const { return i_uid_high; }
+     __u16 gid_high(void) const { return i_gid_high; }
+-    __u32 reserved2(void) const { return i_reserved2; }
+-
+-    void set_reserved2(__u32 val) { i_reserved2 = val; }
++    // i_reserved2 no longer exists in e2fsprogs headers; debug-only helpers
++    // (only caller is under #ifdef DEBUG) reduced to no-ops.
++    __u32 reserved2(void) const { return 0; }
++    void set_reserved2(__u32) { }
+ 
+     // Returns true if this inode is part of an ORPHAN list.
+     // In that case, dtime is overloaded to point to the next orphan and contains an inode number.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ext3grep.git/commitdiff/5e26f340f6c285efe16f419613eca7728e37a0b2