ext4magic: fix build with e2fsprogs >= 1.44.1 and glibc >= 2.27
This commit is contained in:
parent
056a880c28
commit
fee533cf38
3 changed files with 52 additions and 2 deletions
25
srcpkgs/ext4magic/patches/fix-glibc-2.27.patch
Normal file
25
srcpkgs/ext4magic/patches/fix-glibc-2.27.patch
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
From f7aff7aacb346d7d718aeddb4d0afae96d2245ab Mon Sep 17 00:00:00 2001
|
||||||
|
From: maxice8 <thinkabit.ukim@gmail.com>
|
||||||
|
Date: Sat, 22 Sep 2018 22:11:10 -0300
|
||||||
|
Subject: [PATCH] reconver.c: add sys/sysmacros.h header for 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.0
|
||||||
|
|
||||||
|
|
24
srcpkgs/ext4magic/patches/fix-i_dir_acl-rename.patch
Normal file
24
srcpkgs/ext4magic/patches/fix-i_dir_acl-rename.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
Description: Fix FTBFS with new e2fsprogs.
|
||||||
|
Author: Hilko Bengen <bengen@debian.org>
|
||||||
|
Last-Update: 2018-04-13
|
||||||
|
Index: ext4magic/src/inode.c
|
||||||
|
===================================================================
|
||||||
|
--- ext4magic.orig/src/inode.c
|
||||||
|
+++ ext4magic/src/inode.c
|
||||||
|
@@ -406,14 +406,14 @@ void dump_inode(FILE *out, const char *p
|
||||||
|
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,
|
|
@ -2,11 +2,12 @@
|
||||||
pkgname=ext4magic
|
pkgname=ext4magic
|
||||||
version=0.3.2
|
version=0.3.2
|
||||||
revision=2
|
revision=2
|
||||||
|
patch_args="-Np1"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-expert-mode --enable-file-attr --sbindir=/usr/bin"
|
configure_args="--enable-expert-mode --enable-file-attr"
|
||||||
makedepends="e2fsprogs-devel file-devel zlib-devel bzip2-devel"
|
makedepends="e2fsprogs-devel file-devel zlib-devel bzip2-devel"
|
||||||
short_desc="Recover deleted or overwritten files on ext3 and ext4 filesystems"
|
short_desc="Recover deleted or overwritten files on ext3 and ext4 filesystems"
|
||||||
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
|
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://sourceforge.net/projects/ext4magic/"
|
homepage="http://sourceforge.net/projects/ext4magic/"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||||
|
|
Loading…
Reference in a new issue