Date: Sunday, November 11, 2018 @ 13:47:49
Author: seblu
Revision: 406361
archrelease: copy trunk to community-x86_64
Added:
ext4magic/repos/community-x86_64/01-i_dir_acl.patch
(from rev 406360, ext4magic/trunk/01-i_dir_acl.patch)
ext4magic/repos/community-x86_64/02-Fix-undefined-reference-to-makedev.patch
(from rev 406360,
ext4magic/trunk/02-Fix-undefined-reference-to-makedev.patch)
ext4magic/repos/community-x86_64/PKGBUILD
(from rev 406360, ext4magic/trunk/PKGBUILD)
Deleted:
ext4magic/repos/community-x86_64/PKGBUILD
---------------------------------------------+
01-i_dir_acl.patch | 29 ++++++++
02-Fix-undefined-reference-to-makedev.patch | 30 +++++++++
PKGBUILD | 85 +++++++++++++-------------
3 files changed, 103 insertions(+), 41 deletions(-)
Copied: ext4magic/repos/community-x86_64/01-i_dir_acl.patch (from rev 406360,
ext4magic/trunk/01-i_dir_acl.patch)
===================================================================
--- 01-i_dir_acl.patch (rev 0)
+++ 01-i_dir_acl.patch 2018-11-11 13:47:49 UTC (rev 406361)
@@ -0,0 +1,29 @@
+From: Gokturk Yuksek <gokt...@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,
Copied:
ext4magic/repos/community-x86_64/02-Fix-undefined-reference-to-makedev.patch
(from rev 406360, ext4magic/trunk/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:49 UTC (rev
406361)
@@ -0,0 +1,30 @@
+From d412778d45774225ff4b36470193a6056ecc03cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <se...@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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-11 13:47:41 UTC (rev 406360)
+++ PKGBUILD 2018-11-11 13:47:49 UTC (rev 406361)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=ext4magic
-pkgver=0.3.2
-pkgrel=2
-pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems'
-arch=('i686' 'x86_64')
-url='https://sourceforge.net/projects/ext4magic/'
-license=('GPL2')
-depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
-source=("$url/files/$pkgname-$pkgver.tar.gz"
- "$url/files/Patches/workaround.patch")
-md5sums=('8351cb27598fb8ffa7d2175ab74e7a53'
- 'e96c1fff3b8d59f93a0557b0a8190167')
-
-prepare() {
- cd $pkgname-$pkgver
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
- if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch ${filename##*/}"
- patch -p1 -N -i "$srcdir/${filename##*/}"
- fi
- done
- :
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sbindir=/usr/bin
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ext4magic/repos/community-x86_64/PKGBUILD (from rev 406360,
ext4magic/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-11 13:47:49 UTC (rev 406361)
@@ -0,0 +1,44 @@
+# Maintainer: Sébastien Luttringer
+
+pkgname=ext4magic
+pkgver=0.3.2
+pkgrel=3
+pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems'
+arch=('x86_64')
+url='https://sourceforge.net/projects/ext4magic/'
+license=('GPL2')
+depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
+source=("$url/files/$pkgname-$pkgver.tar.gz"
+ "$url/files/Patches/workaround.patch"
+ '01-i_dir_acl.patch'
+ '02-Fix-undefined-reference-to-makedev.patch')
+md5sums=('8351cb27598fb8ffa7d2175ab74e7a53'
+ 'e96c1fff3b8d59f93a0557b0a8190167'
+ '7e3462b64d142ee3911e67fcd9610f18'
+ 'bba42512e1da183f3897df43d2d2bc31')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch ${filename##*/}"
+ patch -p1 -N -i "$srcdir/${filename##*/}"
+ fi
+ done
+ :
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
