[arch-commits] Commit in extundelete/trunk (2 files)

[Antonio Rojas]

    Date: Monday, June 4, 2018 @ 22:21:48
  Author: arojas
Revision: 340471

BUILDINFO rebuild

Added:
  extundelete/trunk/extundelete-e2fsprogs-1.44.1.patch
Modified:
  extundelete/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   15 +++++++++++----
 extundelete-e2fsprogs-1.44.1.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-04 22:16:32 UTC (rev 340470)
+++ PKGBUILD	2018-06-04 22:21:48 UTC (rev 340471)
@@ -4,16 +4,23 @@
 
 pkgname=extundelete
 pkgver=0.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Utility for recovering deleted files from ext2, ext3 or ext4 partitions by parsing the journal"
 arch=('x86_64')
 url="http://extundelete.sourceforge.net"
 license=('GPL')
-makedepends=('e2fsprogs')
+depends=('e2fsprogs')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4')
+source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
+        extundelete-e2fsprogs-1.44.1.patch)
+sha256sums=('a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4'
+            '944a1dc5a0697334fa27eabc198a6b230740199a01d3a942c01570edb996426f')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../extundelete-e2fsprogs-1.44.1.patch # Fix build with e2fsprogs 1.44.1
+}
+
 build() {
   cd ${srcdir}/$pkgname-$pkgver
 

Added: extundelete-e2fsprogs-1.44.1.patch
===================================================================
--- extundelete-e2fsprogs-1.44.1.patch	                        (rev 0)
+++ extundelete-e2fsprogs-1.44.1.patch	2018-06-04 22:21:48 UTC (rev 340471)
@@ -0,0 +1,12 @@
+diff -ru extundelete-0.2.4.orig/src/insertionops.cc extundelete-0.2.4/src/insertionops.cc
+--- extundelete-0.2.4.orig/src/insertionops.cc	2018-06-04 22:19:22.460051515 +0000
++++ extundelete-0.2.4/src/insertionops.cc	2018-06-04 22:19:49.256717673 +0000
+@@ -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++)