Accepting request 648609 from home:1Antoine1:branches:security:forensics

- Add ext4magic-0.3.2-rename-i_dir_acl.patch: Fix build
  (boo#1115053).
- Clean spec file.

OBS-URL: https://build.opensuse.org/request/show/648609
OBS-URL: https://build.opensuse.org/package/show/security:forensics/ext4magic?expand=0&rev=7

ext4magic-0.3.2-rename-i_dir_acl.patch

@@ -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,

ext4magic.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 12 19:22:16 UTC 2018 - antoine.belvire@opensuse.org
+
+- Add ext4magic-0.3.2-rename-i_dir_acl.patch: Fix build
+  (boo#1115053).
+- Clean spec file.
+
 -------------------------------------------------------------------
 Tue Sep 16 21:08:10 UTC 2014 - Greg.Freemyer@gmail.com
 

ext4magic.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ext4magic
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 robi@users.berlios.de
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,11 +21,13 @@ Name:           ext4magic
 Version:        0.3.2
 Release:        0
 Summary:        Can help to recover deleted files on ext3/4 filesystems
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Filesystems
-Url:            http://sourceforge.net/projects/ext4magic/
+URL:            http://sourceforge.net/projects/ext4magic/
 #Doc_Url:	http://ext4magic.sourceforge.net/ext4magic_en.html
-Source0:        http://sourceforge.net/projects/ext4magic/files/ext4magic-0.3.2.tar.gz
+Source0:        http://sourceforge.net/projects/ext4magic/files/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM ext4magic-0.3.2-rename-i_dir_acl.patch -- Fix FTBFS (boo#1115053)
+Patch0:         ext4magic-0.3.2-rename-i_dir_acl.patch
 BuildRequires:  file-devel > 5.05
 BuildRequires:  libblkid-devel
 BuildRequires:  libbz2-devel
@@ -43,8 +45,6 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  libext2fs-devel >= 1.42.6
 %endif
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %description
 ext4magic is a small tool for Linux administration, it can help to recover
 accidentally deleted or overwritten files from an ext3 or ext4 file systems.
@@ -54,7 +54,7 @@ accidents console or script often arises the question, how can I just restore
 the deleted files back?
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure \
@@ -63,12 +63,12 @@ the deleted files back?
 make %{?_smp_mflags}
 
 %install
-%{makeinstall}
+%make_install
 
 %files
-%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog NEWS README TODO
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%license COPYING
 %{_sbindir}/ext4magic
-%{_mandir}/man8/ext4magic.8.gz
+%{_mandir}/man8/ext4magic.8%{?ext_man}
 
 %changelog