[arch-commits] Commit in ext4magic/trunk (3 files)

[Sébastien Luttringer]

    Date: Sunday, November 11, 2018 @ 13:47:41
  Author: seblu
Revision: 406360

upgpkg: ext4magic 0.3.2-3

https://www.archlinux.org/todo/failed-to-build-from-source/

Added:
  ext4magic/trunk/01-i_dir_acl.patch
  ext4magic/trunk/02-Fix-undefined-reference-to-makedev.patch
Modified:
  ext4magic/trunk/PKGBUILD

---------------------------------------------+
 01-i_dir_acl.patch                          |   29 +++++++++++++++++++++++++
 02-Fix-undefined-reference-to-makedev.patch |   30 ++++++++++++++++++++++++++
 PKGBUILD                                    |   10 ++++++--
 3 files changed, 66 insertions(+), 3 deletions(-)

Added: 01-i_dir_acl.patch
===================================================================
--- 01-i_dir_acl.patch	                        (rev 0)
+++ 01-i_dir_acl.patch	2018-11-11 13:47:41 UTC (rev 406360)
@@ -0,0 +1,29 @@
+From: Gokturk Yuksek <gokturk at gentoo.org>
+Subject: [PATCH] src/inode: supersede i_dir_acl with i_size_high
+
+The upstream has removed the macro that defined i_dir_acl as
+i_size_high which causes a build failure with the later versions of
+e2fsprogs. Replace every reference to inode->i_dir_acl with
+inode->i_size_high.
+
+[0] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=578fcbfd2e61e0b13ce8c7b62804c941d6c1eb8e
+
+--- a/src/inode.c
++++ b/src/inode.c
+@@ -404,14 +404,14 @@
+         fprintf(out,
+                         "%sFile ACL: %d    Directory ACL: %d Translator: %d\n",
+                         prefix,
+-                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0,
++                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0,
+                         inode->osd1.hurd1.h_i_translator);
+         else
+                 fprintf(out, "%sFile ACL: %llu    Directory ACL: %d\n",
+                         prefix,
+                         inode->i_file_acl | ((long long)
+                                 (inode->osd2.linux2.l_i_file_acl_high) << 32),
+-                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0);
++                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0);
+         if (os == EXT2_OS_LINUX)
+                 fprintf(out, "%sLinks: %d   Blockcount: %llu\n",
+                         prefix, inode->i_links_count,

Added: 02-Fix-undefined-reference-to-makedev.patch
===================================================================
--- 02-Fix-undefined-reference-to-makedev.patch	                        (rev 0)
+++ 02-Fix-undefined-reference-to-makedev.patch	2018-11-11 13:47:41 UTC (rev 406360)
@@ -0,0 +1,30 @@
+From d412778d45774225ff4b36470193a6056ecc03cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu at seblu.net>
+Date: Sun, 11 Nov 2018 14:42:38 +0100
+Subject: [PATCH] Fix undefined reference to `makedev'
+
+Add include to sys/sysmacros.h to fix compilation with gcc 8.2.1
+
+Error:
+gcc -O2 -g -D_FILE_OFFSET_BITS=64 -g -O2 -o ext4magic ext4magic-block.o ext4magic-dir_list.o ext4magic-ext4magic.o ext4magic-extent_db.o ext4magic-file_type.o ext4magic-hard_link_stack.o ext4magic-imap_search.o ext4magic-inode.o ext4magic-journal.o ext4magic-lookup_local.o ext4magic-magic_block_scan.o ext4magic-recover.o ext4magic-ring_buf.o ext4magic-util.o  -le2p -luuid -lblkid -lz -lbz2 -lmagic -lext2fs
+/bin/ld: ext4magic-recover.o: in function `recover_file':
+/home/seblu/scm/foss/ext4magic/src/recover.c:478: undefined reference to `makedev'
+---
+ src/recover.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/recover.c b/src/recover.c
+index 41b4aee..30b5d8f 100644
+--- a/src/recover.c
++++ b/src/recover.c
+@@ -24,6 +24,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <utime.h>
++#include <sys/sysmacros.h>
+ 
+ #ifndef O_LARGEFILE
+ #define O_LARGEFILE 0
+-- 
+2.19.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-11 13:35:29 UTC (rev 406359)
+++ PKGBUILD	2018-11-11 13:47:41 UTC (rev 406360)
@@ -2,7 +2,7 @@
 
 pkgname=ext4magic
 pkgver=0.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems'
 arch=('x86_64')
 url='https://sourceforge.net/projects/ext4magic/'
@@ -9,9 +9,13 @@
 license=('GPL2')
 depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
 source=("$url/files/$pkgname-$pkgver.tar.gz"
-        "$url/files/Patches/workaround.patch")
+        "$url/files/Patches/workaround.patch"
+        '01-i_dir_acl.patch'
+        '02-Fix-undefined-reference-to-makedev.patch')
 md5sums=('8351cb27598fb8ffa7d2175ab74e7a53'
-         'e96c1fff3b8d59f93a0557b0a8190167')
+         'e96c1fff3b8d59f93a0557b0a8190167'
+         '7e3462b64d142ee3911e67fcd9610f18'
+         'bba42512e1da183f3897df43d2d2bc31')
 
 prepare() {
   cd $pkgname-$pkgver