[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2024-04-11 Thread Arthur Zamarin
commit: 5cc28e7e404788baf34c374b7fe06892f70beae2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Apr 11 10:59:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Apr 11 10:59:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc28e7e

sys-fs/ext4magic: drop 0.3.2-r1, EAPI6--

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild | 36 --
 1 file changed, 36 deletions(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
deleted file mode 100644
index 53b5bc188bdf..
--- a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 
filesystems"
-HOMEPAGE="https://sourceforge.net/projects/ext4magic/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug +expert-mode file-attr"
-
-RDEPEND="app-arch/bzip2
-   >=sys-apps/file-5.04
-   sys-apps/util-linux
-   >=sys-fs/e2fsprogs-1.41.9
-   sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.3.2-sysmacros.patch
-   "${FILESDIR}"/${PN}-0.3.2-i_dir_acl.patch
-)
-
-src_configure() {
-   # build-system incorrectly recognizes '--disable-feature' options as 
enabled!
-   econf \
-   $(usex debug '--enable-debug' '') \
-   $(usex debug '--enable-debug-magic' '') \
-   $(usex expert-mode '--enable-expert-mode' '') \
-   $(usex file-attr '--enable-file-attr' '')
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2024-03-12 Thread Arthur Zamarin
commit: 455fd02ff4df097621327bd1b3b23ecef8a3b599
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Mar 12 15:24:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Mar 12 15:24:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455fd02f

sys-fs/ext4magic: Stabilize 0.3.2-r2 x86, #925609

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
index 3cec555bfb8c..6374f4d94c66 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 FSFAP GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug +expert-mode file-attr"
 
 RDEPEND="app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2024-03-12 Thread Arthur Zamarin
commit: fda4c82e1dcc0136e635f90741e37bd7b932838b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Mar 12 15:24:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Mar 12 15:24:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda4c82e

sys-fs/ext4magic: Stabilize 0.3.2-r2 amd64, #925609

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
index 1ddc9bc13dec..3cec555bfb8c 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 FSFAP GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug +expert-mode file-attr"
 
 RDEPEND="app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/, sys-fs/ext4magic/files/

2024-01-07 Thread Göktürk Yüksek
commit: 6df45df54e7fd8e2c9151d333b5404dc88b9e96e
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Mon Jan  8 03:22:27 2024 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Jan  8 03:33:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df45df5

sys-fs/ext4magic: fix building with musl #716136

Also update EAPI 6 -> 8, and update LICENSES.

Closes: https://bugs.gentoo.org/716136
Signed-off-by: Göktürk Yüksek  gentoo.org>

 sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild |  37 +
 .../files/ext4magic-0.3.2-fix-sys-types-h.patch| 183 +
 2 files changed, 220 insertions(+)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
new file mode 100644
index ..1ddc9bc13dec
--- /dev/null
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 
filesystems"
+HOMEPAGE="https://sourceforge.net/projects/ext4magic/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 FSFAP GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug +expert-mode file-attr"
+
+RDEPEND="app-arch/bzip2
+   >=sys-apps/file-5.04
+   sys-apps/util-linux
+   >=sys-fs/e2fsprogs-1.41.9
+   sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.3.2-sysmacros.patch
+   "${FILESDIR}"/${PN}-0.3.2-i_dir_acl.patch
+   "${FILESDIR}"/${PN}-0.3.2-fix-sys-types-h.patch
+)
+
+src_configure() {
+   # build-system incorrectly recognizes '--disable-feature' options as 
enabled!
+   econf \
+   $(usex debug '--enable-debug' '') \
+   $(usex debug '--enable-debug-magic' '') \
+   $(usex expert-mode '--enable-expert-mode' '') \
+   $(usex file-attr '--enable-file-attr' '')
+}

diff --git a/sys-fs/ext4magic/files/ext4magic-0.3.2-fix-sys-types-h.patch 
b/sys-fs/ext4magic/files/ext4magic-0.3.2-fix-sys-types-h.patch
new file mode 100644
index ..f1e1d1c91716
--- /dev/null
+++ b/sys-fs/ext4magic/files/ext4magic-0.3.2-fix-sys-types-h.patch
@@ -0,0 +1,183 @@
+From 22960546489285b03857609c5c3f6c25ae91a6cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= 
+Date: Sun, 7 Jan 2024 16:59:09 -0800
+Subject: [PATCH 1/1] Include config.h in various files before any other
+ include statements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is an indirect way to fix a compilation failure with musl
+libc. Glibc includes sys/stat.h as part of stdlib.h[1], which
+eventually typedefs dev_t[2]. Musl libc doesn't seem to pull that in
+like glibc does. The header file ext2fs.h uses dev_t in some of its
+function signatures[3], but the inclusion of sys/types.h is guarded by
+the macro `#ifdef HAVE_SYS_TYPES_H`[4].
+
+So every time ext4magic tries to include ext2fs.h while building with musl, it 
fails with:
+
+```
+In file included from hard_link_stack.h:23,
+from hard_link_stack.c:25:
+/usr/include/ext2fs/ext2fs.h:1402:39: error: unknown type name 'dev_t'; did 
you mean 'div_t'?
+1402 | extern char *ext2fs_find_block_device(dev_t device);
+|   ^
+|   div_t
+/usr/include/ext2fs/ext2fs.h:1822:62: error: unknown type name 'mode_t'
+1822 | extern int ext2fs_open_file(const char *pathname, int flags, mode_t 
mode);
+|  ^~
+make[2]: *** [Makefile:467: ext4magic-hard_link_stack.o] Error 1
+```
+
+Autoconf actually declares HAVE_SYS_TYPES_H during ext4magic build, we
+just need to include config.h in the relevant C files so that the
+macro propagates. The alternative would be to pass -DHAVE_SYS_TYPES_H
+to gcc but that solution seems more of a hack compared to including
+config.h as it's meant to be included.
+
+[1] 
https://sourceware.org/git/?p=glibc.git;a=blob;f=include/stdlib.h;h=580da9be15adf0c1034986f62dd89aaaf6498c3f;hb=HEAD#l20
+[2] 
https://sourceware.org/git/?p=glibc.git;a=blob;f=io/sys/stat.h;h=1fa6d6e62ecb2e4b4f0039d0154307a6c27e3fa9;hb=HEAD#l40
+[3] 
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/ext2fs/ext2fs.h#n1402
+[4] 
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/lib/ext2fs/ext2fs.h#n68
+
+Bug: https://bugs.gentoo.org/716136
+Signed-off-by: Göktürk Yüksek 
+---
+ src/block.c| 4 
+ src/file_type.c| 5 +
+ src/hard_link_stack.c  | 4 
+ src/imap_search.c  | 4 
+ src/inode.c| 5 +
+ src/lookup_local.c | 5 +
+ src/magic_block_scan.c | 5 +
+ src/util.c | 5 +
+ 8 files changed, 37 insertions(+)
+
+diff --git a/src/block.c b/src/block.c
+index

[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2023-05-16 Thread Sam James
commit: 03fa465f7e019963e5269d85f2cb6b2f2ea2876f
Author: Sam James  gentoo  org>
AuthorDate: Wed May 17 02:48:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 17 02:48:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fa465f

sys-fs/ext4magic: Keyword 0.3.2-r1 arm64, #906550

Signed-off-by: Sam James  gentoo.org>

 sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
index 5138e1955c4a..53b5bc188bdf 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug +expert-mode file-attr"
 
 RDEPEND="app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2019-02-04 Thread Sergey Popov
commit: 999b1a4ba89cdb5198ab496d4ad2e01edcb59d28
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Feb  4 12:32:37 2019 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Feb  4 12:33:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999b1a4b

sys-fs/ext4magic: stable for amd64/x86

Reported-by: Göktürk Yüksek  gentoo.org>
Signed-off-by: Sergey Popov  gentoo.org>
Closes: https://bugs.gentoo.org/677010
Package-Manager: Portage-2.3.51, Repoman-2.3.10

 sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
index f26ce3b1d1d..8873a8aac0c 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +expert-mode file-attr"
 
 RDEPEND="app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2019-02-04 Thread Sergey Popov
commit: de01a97f235747f84574bf184c4a4911637cbea9
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Feb  4 12:33:22 2019 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Feb  4 12:33:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de01a97f

sys-fs/ext4magic: drop old

Signed-off-by: Sergey Popov  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.10

 sys-fs/ext4magic/ext4magic-0.3.2.ebuild | 37 -
 1 file changed, 37 deletions(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
deleted file mode 100644
index 70ca6384478..000
--- a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 
filesystems"
-HOMEPAGE="https://sourceforge.net/projects/ext4magic/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug expert-mode file-attr"
-
-RDEPEND="app-arch/bzip2
-   >=sys-apps/file-5.04
-   sys-apps/util-linux
-   >=sys-fs/e2fsprogs-1.41.9
-   sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-sysmacros.patch #580192
-}
-
-src_configure() {
-   # build-system incorrectly recognizes '--disable-feature' options as 
enabled!
-   econf \
-   $(usex debug '--enable-debug' '') \
-   $(usex debug '--enable-debug-magic' '') \
-   $(usex expert-mode '--enable-expert-mode' '') \
-   $(usex file-attr '--enable-file-attr' '')
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2018-04-05 Thread Sergey Popov
commit: ef551867763a99e4985754a0dbcb606f0059513c
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Apr  6 04:47:16 2018 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Apr  6 04:47:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef551867

sys-fs/ext4magic: remove myself from maintainers

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-fs/ext4magic/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 4f2ff8681bf..1c14353a5c5 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -5,10 +5,6 @@
gokt...@gentoo.org
Göktürk Yüksek

-   
-   pinkb...@gentoo.org
-   Sergey Popov
-   

Builds ext4magic with expert mode. 
Highly useful in recovering data from a corrupted filesystem
Enable the recovery of file attributes 
(append, immutable, nodump etc)



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/, sys-fs/ext4magic/files/

2018-04-04 Thread Göktürk Yüksek
commit: 9d427990c39a9ab3cf97b6feb243e9f28620f79c
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Wed Apr  4 12:07:03 2018 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Wed Apr  4 12:08:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d427990

sys-fs/ext4magic: fix #650074

Also bump EAPI and enable USE=expert_mode by default.

Bug: https://sourceforge.net/p/ext4magic/tickets/10/
Closes: https://bugs.gentoo.org/650074
Package-Manager: Portage-2.3.27, Repoman-2.3.9

 sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild | 36 ++
 .../files/ext4magic-0.3.2-i_dir_acl.patch  | 32 +++
 2 files changed, 68 insertions(+)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
new file mode 100644
index 000..f26ce3b1d1d
--- /dev/null
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 
filesystems"
+HOMEPAGE="https://sourceforge.net/projects/ext4magic/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +expert-mode file-attr"
+
+RDEPEND="app-arch/bzip2
+   >=sys-apps/file-5.04
+   sys-apps/util-linux
+   >=sys-fs/e2fsprogs-1.41.9
+   sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.3.2-sysmacros.patch
+   "${FILESDIR}"/${PN}-0.3.2-i_dir_acl.patch
+)
+
+src_configure() {
+   # build-system incorrectly recognizes '--disable-feature' options as 
enabled!
+   econf \
+   $(usex debug '--enable-debug' '') \
+   $(usex debug '--enable-debug-magic' '') \
+   $(usex expert-mode '--enable-expert-mode' '') \
+   $(usex file-attr '--enable-file-attr' '')
+}

diff --git a/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch 
b/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch
new file mode 100644
index 000..9c7e86a2af1
--- /dev/null
+++ b/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch
@@ -0,0 +1,32 @@
+From: Gokturk Yuksek 
+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.
+
+Bug: https://bugs.gentoo.org/650074
+Bug: https://sourceforge.net/p/ext4magic/tickets/10/
+
+[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: %dDirectory 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: %lluDirectory 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,



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2017-12-01 Thread David Seifert
commit: ec5f18139c5e307ad76883e11d1dfd78700e08e9
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec  1 21:17:41 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec  1 22:18:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5f1813

sys-fs/ext4magic: [QA] Fix DESCRIPTION.toolong

 sys-fs/ext4magic/ext4magic-0.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
index 9d37a2331a9..70ca6384478 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils
 
-DESCRIPTION="Linux admin tool, can help to recover deleted or overwritten 
files on ext3 and ext4 filesystems"
+DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 
filesystems"
 HOMEPAGE="https://sourceforge.net/projects/ext4magic/";
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2016-05-22 Thread Göktürk Yüksek
commit: 8f4172ce29d60dc16eac69309506a5add2151336
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Thu May 19 04:32:45 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Sun May 22 17:07:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4172ce

sys-fs/ext4magic: update maintainer email and remove proxy-maint

Package-Manager: portage-2.2.28

 sys-fs/ext4magic/metadata.xml | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index d1bfe60..4f2ff86 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -2,17 +2,13 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   gokt...@binghamton.edu
+   gokt...@gentoo.org
Göktürk Yüksek


pinkb...@gentoo.org
Sergey Popov

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

Builds ext4magic with expert mode. 
Highly useful in recovering data from a corrupted filesystem
Enable the recovery of file attributes 
(append, immutable, nodump etc)



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2016-04-23 Thread Patrice Clement
commit: e0d0f2c99ffdd23fb8086f9e7671f62e6a5e2eb5
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Apr 23 17:58:24 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Apr 23 17:59:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d0f2c9

sys-fs/ext4magic: Fixes maintainer's name.

 sys-fs/ext4magic/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 87d28d6..d1bfe60 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -3,7 +3,7 @@
 

gokt...@binghamton.edu
-   Göktürk Yüksek
+   Göktürk Yüksek


pinkb...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/

2016-04-23 Thread Patrice Clement
commit: 04b80bdf6cfec0d571fc63eda4542588e6a39749
Author: Göktürk Yüksek  binghamton  edu>
AuthorDate: Thu Apr 21 01:24:12 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Apr 23 07:44:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b80bdf

sys-fs/ext4magic: remove maintainer  and fix maintainer name

Package-Manager: portage-2.2.26
Closes: https://github.com/gentoo/gentoo/pull/1316

Signed-off-by: Patrice Clement  gentoo.org>

 sys-fs/ext4magic/metadata.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 4d2f83d..87d28d6 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -3,13 +3,11 @@
 

gokt...@binghamton.edu
-   Gokturk 'gokturk' Yuksek
-   Maintainer. Assign bugs on him
+   Göktürk Yüksek


pinkb...@gentoo.org
Sergey Popov
-   Proxy maintainer. CC him on bugs


proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: sys-fs/ext4magic/, sys-fs/ext4magic/files/

2016-04-18 Thread Mike Frysinger
commit: 029e17b98f838bdf8d1c6c1b89946db6dd63d2fe
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Apr 19 06:28:57 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Apr 19 06:28:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029e17b9

sys-fs/ext4magic: fix building w/newer glibc #580192

 sys-fs/ext4magic/ext4magic-0.3.2.ebuild|  4 
 sys-fs/ext4magic/files/ext4magic-0.3.2-sysmacros.patch | 13 +
 2 files changed, 17 insertions(+)

diff --git a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild 
b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
index 3c16018..a7f2b13 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-sysmacros.patch #580192
+}
+
 src_configure() {
# build-system incorrectly recognizes '--disable-feature' options as 
enabled!
econf \

diff --git a/sys-fs/ext4magic/files/ext4magic-0.3.2-sysmacros.patch 
b/sys-fs/ext4magic/files/ext4magic-0.3.2-sysmacros.patch
new file mode 100644
index 000..954d961
--- /dev/null
+++ b/sys-fs/ext4magic/files/ext4magic-0.3.2-sysmacros.patch
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/ext4magic/tickets/4/
+https://bugs.gentoo.org/580192
+
+--- a/src/recover.c
 b/src/recover.c
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ #include  
++#include 
+ #include 
+ #include 
+ #include