[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/files/, app-admin/testdisk/

2024-05-14 Thread Michał Górny
commit: 80b4f200f02a30f1f1e43e929deda4f525462bed
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 14 17:17:30 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 14 17:17:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b4f200

app-admin/testdisk: Backport a musl build fix

Closes: https://bugs.gentoo.org/931887
Signed-off-by: Michał Górny  gentoo.org>

 app-admin/testdisk/files/testdisk-7.2-musl.patch | 25 
 app-admin/testdisk/testdisk-7.2.ebuild   |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/app-admin/testdisk/files/testdisk-7.2-musl.patch 
b/app-admin/testdisk/files/testdisk-7.2-musl.patch
new file mode 100644
index ..d01c2797bf28
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.2-musl.patch
@@ -0,0 +1,25 @@
+From 2c6780ca1edd0b0ba2e5e86b12634e3cc8475872 Mon Sep 17 00:00:00 2001
+From: Christophe Grenier 
+Date: Tue, 14 May 2024 17:34:56 +0200
+Subject: [PATCH] src/hdaccess.c: Fix build with musl-1.2.5 See
+ https://github.com/cgsecurity/testdisk/issues/154
+ https://bugs.gentoo.org/931887
+
+---
+ src/hdaccess.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/hdaccess.c b/src/hdaccess.c
+index 91ec7915..9768c07c 100644
+--- a/src/hdaccess.c
 b/src/hdaccess.c
+@@ -109,6 +109,9 @@
+ #ifdef HAVE_GLOB_H
+ #include 
+ #endif
++#ifdef HAVE_LIBGEN_H
++#include 
++#endif
+ 
+ #if defined(__CYGWIN__) || defined(__MINGW32__)
+ #include "win32.h"

diff --git a/app-admin/testdisk/testdisk-7.2.ebuild 
b/app-admin/testdisk/testdisk-7.2.ebuild
index ea419d0652ee..cfc23c0f8bc4 100644
--- a/app-admin/testdisk/testdisk-7.2.ebuild
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -60,6 +60,8 @@ BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
 DOCS=()
 
 PATCHES=(
+   # 
https://github.com/cgsecurity/testdisk/commit/2c6780ca1edd0b0ba2e5e86b12634e3cc8475872
+   "${FILESDIR}/${P}-musl.patch"
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/files/, app-admin/testdisk/

2024-03-30 Thread Michał Górny
commit: ddd2b717fc95fefacf0febe6f71ab4cfa06fdaa8
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Mar 30 14:28:27 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar 30 14:28:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd2b717

app-admin/testdisk: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 app-admin/testdisk/Manifest|  1 -
 ...disk-7.1-backport-ntfs-3g-ioctl-prototype.patch | 46 ---
 app-admin/testdisk/testdisk-7.1-r2.ebuild  | 96 --
 3 files changed, 143 deletions(-)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 99ef2a164156..bef94bf92ce7 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1 @@
-DIST testdisk-7.1.tar.bz2 742006 BLAKE2B 
ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61
 SHA512 
ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
 DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 
224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239
 SHA512 
f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26

diff --git 
a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch 
b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
deleted file mode 100644
index 4ef379f0021f..
--- 
a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001
-From: Christophe Grenier 
-Date: Wed, 6 Apr 2022 07:43:45 +0200
-Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype
- for ntfs-3g
-

-Gentoo note: link to upstream commit:
-https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482
-
- src/ntfs_io.c | 12 
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/ntfs_io.c b/src/ntfs_io.c
-index 5ca494a5..fa056724 100644
 a/src/ntfs_io.c
-+++ b/src/ntfs_io.c
-@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device 
*dev, struct stat *bu
-   return -1;
- }
- 
-+#ifdef HAVE_LIBNTFS
- static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
-   void *argp)
- {
-@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct 
ntfs_device *dev, int request,
- #endif
-   return -1;
- }
-+#else
-+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned 
long request,
-+  void *argp)
-+{
-+  log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
-+#ifdef ENOTSUP
-+  errno = ENOTSUP;
-+#endif
-+  return -1;
-+}
-+#endif
- 
- /**
-  * Device operations for working with unix style devices and files.
--- 
-2.37.4
-

diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild 
b/app-admin/testdisk/testdisk-7.1-r2.ebuild
deleted file mode 100644
index 100c4ccc7787..
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based 
recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk;
-SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="ewf jpeg ntfs gui reiserfs static zlib"
-
-REQUIRED_USE="static? ( !gui )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-   static? (
-   sys-apps/util-linux[static-libs]
-   sys-fs/e2fsprogs[static-libs]
-   sys-libs/ncurses:0[static-libs]
-   jpeg? ( media-libs/libjpeg-turbo:=[static-libs] )
-   ntfs? ( sys-fs/ntfs3g[static-libs] )
-   reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-   zlib? ( sys-libs/zlib[static-libs] )
-   !arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
-   )
-   !static? (
-   sys-apps/util-linux
-   sys-fs/e2fsprogs
-   sys-libs/ncurses:0=
-   jpeg? ( media-libs/libjpeg-turbo:= )
-   ntfs? ( sys-fs/ntfs3g:= )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-   zlib? ( sys-libs/zlib )