[arch-commits] Commit in ext3grep/trunk (PKGBUILD ext3grep-e2fsprogs-1.44.1.patch)

[Antonio Rojas]

    Date: Monday, June 4, 2018 @ 22:16:08
  Author: arojas
Revision: 340469

BUILDINFO rebuild

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

---------------------------------+
 PKGBUILD                        |   17 ++++++++++++-----
 ext3grep-e2fsprogs-1.44.1.patch |   12 ++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-04 22:15:28 UTC (rev 340468)
+++ PKGBUILD	2018-06-04 22:16:08 UTC (rev 340469)
@@ -4,7 +4,7 @@
 
 pkgname=ext3grep
 pkgver=0.10.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A tool to investigate an ext3 file system for deleted content and possibly recover it"
 arch=('x86_64')
 url="https://code.google.com/archive/p/ext3grep/"
@@ -12,16 +12,23 @@
 makedepends=('e2fsprogs' 'patch')
 changelog=$pkgname.changelog
 source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.gz
-        $pkgname-build.patch)
+        $pkgname-build.patch ext3grep-e2fsprogs-1.44.1.patch)
 sha256sums=('586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e'
-            '6f57d5012fcfb063012ade80b25c356defc2d22411bbb9086ea89c0de10f3117')
+            '6f57d5012fcfb063012ade80b25c356defc2d22411bbb9086ea89c0de10f3117'
+            'f85913a797ddca5ee63481e0982536cf7b0dc062f58f3dae1121113380c30a21')
 
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
+prepare() {
+  cd $pkgname-$pkgver
 
 #http://code.google.com/p/ext3grep/issues/detail?id=34
   patch -Np1 -i ${srcdir}/$pkgname-build.patch
 
+  patch -p1 -i ../ext3grep-e2fsprogs-1.44.1.patch # Fix build with e2fsprogs 1.44.1
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
   ./configure --prefix=/usr
   make
 }

Added: ext3grep-e2fsprogs-1.44.1.patch
===================================================================
--- ext3grep-e2fsprogs-1.44.1.patch	                        (rev 0)
+++ ext3grep-e2fsprogs-1.44.1.patch	2018-06-04 22:16:08 UTC (rev 340469)
@@ -0,0 +1,12 @@
+diff -ru ext3grep-0.10.2.orig/src/ext3.h ext3grep-0.10.2/src/ext3.h
+--- ext3grep-0.10.2.orig/src/ext3.h	2018-06-04 22:13:06.563391984 +0000
++++ ext3grep-0.10.2/src/ext3.h	2018-06-04 22:13:44.486724597 +0000
+@@ -117,7 +117,7 @@
+     __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; }
++    __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; }