From 05a3b7c2189f095dfc46fbb03d4b3e801d3dc13a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Dec 2022 09:29:38 +0000 Subject: gentoo auto-resync : 14:12:2022 - 09:29:38 --- app-admin/testdisk/Manifest | 4 +- ...disk-7.1-backport-ntfs-3g-ioctl-prototype.patch | 46 +++++++++++ app-admin/testdisk/metadata.xml | 3 + app-admin/testdisk/testdisk-7.1-r2.ebuild | 96 ++++++++++++++++++++++ 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch create mode 100644 app-admin/testdisk/testdisk-7.1-r2.ebuild (limited to 'app-admin/testdisk') diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index a9fa501f6fe0..ea36ae33f916 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1,3 +1,5 @@ +AUX testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch 1268 BLAKE2B 9c57329b3576cef7f23177fe07d45cd49a449b4353a9abd3a3196a9ec2896a05e900b1d7785d087f4587642d786efb36ea655d8b2c35833c8736014fbdad9cfb SHA512 7325ff2d83350512acf2e0b3f2269cdc4a92f775eafeae62c0b337fa4f31dac0c4f56d9ed7397fbd8a29d7679eb259401ca934d48c51438bfc4e3d0e0bcf7e00 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 EBUILD testdisk-7.1-r1.ebuild 2354 BLAKE2B afc950294c018dbff1423bbfa67e07a9ba6de3166629d8c09bbaafd878071658c9e462d8cf9cdbc5fd85bfdf994050527d164dceee9c7c9f395f1d6d1d2162d6 SHA512 9f878e51186866e6b8d5621e629f020218f24544b611733fb581925fb8fa916cde3ffbf42a29dd5a77e4224e88a0be1029eaaaaf84ec716ebcbc7eb5ed5e4a64 -MISC metadata.xml 556 BLAKE2B db8777e1d66155225e309d519520fdbfbd47067879183478078571aae5efa75a5ad374af3c5791f306324f02143cb1ce437b9d819bc8665166fc0f0e1dd56a18 SHA512 f0d3184b6e36d4d829b75c44693895a28c216fc83db57d2deaa3a87175738f954e25b0d57fd89ebbc946a40ea2f6b627ca47e8ff09cb996679eda842018af929 +EBUILD testdisk-7.1-r2.ebuild 2488 BLAKE2B fce98752a6cea2713ff003d9b6140ed071142c6ad7896f8ca7813714fad5cee6f8e2059c7bc5a2523478d30560baf3da43f085c5f8b847c325f70cf3efee556e SHA512 f0d18b3f24b00075380a561a6aed75dbe43dcc28e567c6c3d65422a38a066274b878b631443716b9a5425548d4ced0a45f8cd439814575c74d0456b9e9b4b7c5 +MISC metadata.xml 640 BLAKE2B 2c906cdb19a874657ac6f51ea5ec0035b27b0644e73faac95b9234a888a991bc8d9026252a0bf1bd32841295519fe2a966f77101396ca8071dd96c3f742bfd24 SHA512 8996a1f5afaaf7cf18f088d342b717d43316737e92c7b891c63613f9698e4b60bcdc6c65d3d87e4ce4da129b40993e3a60c75544dd5503e9d104d2652460b58c 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 new file mode 100644 index 000000000000..4ef379f0021f --- /dev/null +++ b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch @@ -0,0 +1,46 @@ +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/metadata.xml b/app-admin/testdisk/metadata.xml index 89a6073cc7db..adbd9697dcd6 100644 --- a/app-admin/testdisk/metadata.xml +++ b/app-admin/testdisk/metadata.xml @@ -14,4 +14,7 @@ Include reiserfs reading ability Include ewf library + + cgsecurity/testdisk + diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild new file mode 100644 index 000000000000..a891080e0dcc --- /dev/null +++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 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 ~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 ) + !arm? ( ewf? ( app-forensics/libewf:= ) ) + ) +" +RDEPEND="!static? ( ${DEPEND} )" +BDEPEND="gui? ( dev-qt/linguist-tools:5 )" + +DOCS=() + +PATCHES=( + "${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch +) + +src_configure() { + export MOC="$(qt5_get_bindir)/moc" + export PATH="$(qt5_get_bindir):${PATH}" + + local myconf=( + --enable-sudo + --without-ntfs + $(use_with ewf) + $(use_with jpeg) + $(use_with ntfs ntfs3g) + $(use_enable gui qt) + $(use_with reiserfs) + $(use_with zlib) + ) + + # this static method is the same used by upstream for their 'static' make + # target, but better, as it doesn't break. + use static && append-ldflags -static + + econf "${myconf[@]}" + + # perform safety checks for NTFS, REISERFS and JPEG + if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then + die "Failed to find either NTFS or NTFS-3G library." + fi + if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then + die "Failed to find reiserfs library." + fi + if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then + die "Failed to find jpeg library." + fi +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} -- cgit v1.2.3