[packages/extundelete] - fix building with recent e2fsprogs

hawk hawk at pld-linux.org
Sun Oct 13 00:59:39 CEST 2019


commit e2d0bdd0d022ebc196f9ad46e059d27a58ef0f1c
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sun Oct 13 00:52:19 2019 +0200

    - fix building with recent e2fsprogs

 e2fsprogs.patch  | 11 +++++++++++
 extundelete.spec |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/extundelete.spec b/extundelete.spec
index d2c0f70..ea7db06 100644
--- a/extundelete.spec
+++ b/extundelete.spec
@@ -9,6 +9,7 @@ Source0:	http://download.sourceforge.net/extundelete/%{name}-%{version}.tar.bz2
 # Source0-md5:	77e626ad31433680c0a222069295d2ca
 Patch0:		%{name}-attrs.patch
 Patch1:		%{name}-dirs.patch
+Patch2:		e2fsprogs.patch
 URL:		http://extundelete.sourceforge.net/
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libcom_err-devel
@@ -38,6 +39,7 @@ zapominać o kopiach zapasowych!
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
diff --git a/e2fsprogs.patch b/e2fsprogs.patch
new file mode 100644
index 0000000..ea0da14
--- /dev/null
+++ b/e2fsprogs.patch
@@ -0,0 +1,11 @@
+--- a/src/insertionops.cc	2012-12-30 18:23:32.000000000 +0100
++++ b/src/insertionops.cc	2018-05-07 22:58:13.065868723 +0200
+@@ -33,7 +33,7 @@
+   os << "File flags: " << inode.i_flags << std::endl;
+   os << "File version (for NFS): " << inode.i_generation << std::endl;
+   os << "File ACL: " << inode.i_file_acl << std::endl;
+-  os << "Directory ACL: " << inode.i_dir_acl << std::endl;
++  os << "Directory ACL: " << inode.i_size_high << std::endl;
+   os << "Fragment address: " << inode.i_faddr << std::endl;
+   os << "Direct blocks: ";
+   for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/extundelete.git/commitdiff/e2d0bdd0d022ebc196f9ad46e059d27a58ef0f1c



More information about the pld-cvs-commit mailing list