[gentoo-commits] repo/gentoo:master commit in: sys-fs/extundelete/files/, sys-fs/extundelete/
commit: 6b1800e098380bf90979347622a1db4d6ad36677
Author: Denis Pronin yandex ru>
AuthorDate: Sat Mar 19 10:13:32 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 5 03:37:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b1800e0
sys-fs/extundelete: fix build with clang
patched src/extundelete.cc so that clang is not swearing on
implicit narrowing
Signed-off-by: Denis Pronin yandex.ru>
Bug: https://bugs.gentoo.org/732284
Closes: https://github.com/gentoo/gentoo/pull/24658
Signed-off-by: Sam James gentoo.org>
sys-fs/extundelete/extundelete-0.2.4-r1.ebuild | 2 +-
sys-fs/extundelete/files/extundelete-0.2.4-clang.patch | 11 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
b/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
index 03b275ad95d1..8df1fab2c980 100644
--- a/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
+++ b/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
@@ -14,4 +14,4 @@ KEYWORDS="amd64 ~arm ~sparc x86"
RDEPEND="sys-fs/e2fsprogs"
DEPEND=${RDEPEND}
-PATCHES=( "${FILESDIR}/${P}-e2fsprogs.patch" )
+PATCHES=( "${FILESDIR}/${P}-e2fsprogs.patch" "${FILESDIR}/${P}-clang.patch" )
diff --git a/sys-fs/extundelete/files/extundelete-0.2.4-clang.patch
b/sys-fs/extundelete/files/extundelete-0.2.4-clang.patch
new file mode 100644
index ..aead9bd910f1
--- /dev/null
+++ b/sys-fs/extundelete/files/extundelete-0.2.4-clang.patch
@@ -0,0 +1,11 @@
+--- a/src/extundelete.cc
b/src/extundelete.cc
+@@ -1268,7 +1268,7 @@
+ *new_ino = 0;
+ priv->ret_ino = new_ino;
+ priv->curr_name = curr_part;
+- struct dir_context ctx = {search_flags, DIRENT_FLAG_INCLUDE_REMOVED,
++ struct dir_context ctx = {static_cast(search_flags),
DIRENT_FLAG_INCLUDE_REMOVED,
+ buf, match_name2, priv, 0};
+ errcode_t code = extundelete_block_iterate3(fs, *inode,
BLOCK_FLAG_DATA_ONLY,
+ NULL, match_ino, &ctx);
[gentoo-commits] repo/gentoo:master commit in: sys-fs/extundelete/files/, sys-fs/extundelete/
commit: 6f1e46266b83063b60d9bcb24cb0a6235957071c
Author: Conrad Kostecki kostecki com>
AuthorDate: Sat Jul 7 21:52:53 2018 +
Commit: Tony Vroon gentoo org>
CommitDate: Wed Jul 11 10:53:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1e4626
sys-fs/extundelete: drop old version
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sys-fs/extundelete/Manifest| 2 --
sys-fs/extundelete/extundelete-0.2.0-r1.ebuild | 26 ---
sys-fs/extundelete/extundelete-0.2.0-r2.ebuild | 29 --
.../files/extundelete-0.2.0-build.patch| 23 -
4 files changed, 80 deletions(-)
diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest
index c1f7335469c..deafdd2cdc7 100644
--- a/sys-fs/extundelete/Manifest
+++ b/sys-fs/extundelete/Manifest
@@ -1,3 +1 @@
-DIST extundelete-0.2.0.tar.bz2 97851 BLAKE2B
2d8d1a9d96de0a450fa7afa07f3532c3df11f5de36284ebe2114127de9e8431e9d029ab51ef4a59b45bccaf029254a998013e1fcec8479ae1064fec2a907a83e
SHA512
2d4b18110795a5318fab5c5889a9b516360ea420215d0a3692322b30e87d5bb3954bbba725a067322cd76e7bba06466032a1405f9fc6dbc3f318723be238b317
DIST extundelete-0.2.4.tar.bz2 108472 BLAKE2B
3627c092672957e25f2bd351a6d92f6d32a0e322a0555766edc35545cccab7ee47fb0c471ebea31692779bdf44433bb98a07cab0bc26141f1f09b33601da57ea
SHA512
5c896055b6fa3c38f283a043cca744513fdc1a60e212eac0c78fa868064a8eeb11f540c4cc5ca89ac68da0c1705a40fe45731c203b6748808f85e9870a207bcd
-DIST extundelete_0.2.0-2.1.debian.tar.gz 6862 BLAKE2B
0a453e9f6062064d616ce621e34ca8fc1b6235304073594475cb0f88dbe94efb72807d12cd6b4b1e9faea3025e4bec8cc2522a771732046b310a7311051943c5
SHA512
37b74347a3017edfd28714731125f968f66beac1b7b7ebd1d44e3d3dff9da06216560433f330f4a544da24f7083f6e900fbe8a5c2930e8760405cb72e6a918e3
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
b/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
deleted file mode 100644
index 0e929fe3ab7..000
--- a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-_E2FS=1.42
-
-DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/e2fsprogs-${_E2FS}
- >=sys-libs/e2fsprogs-libs-${_E2FS}"
-DEPEND="${RDEPEND}"
-
-DOCS="README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-}
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
b/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
deleted file mode 100644
index 59f1f1bda6e..000
--- a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-_UNDEL_DEB=2.1
-_UNDEL_E2FS=1.42.6
-
-DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${_UNDEL_DEB}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/e2fsprogs-${_UNDEL_E2FS}
- >=sys-libs/e2fsprogs-libs-${_UNDEL_E2FS}"
-DEPEND=${RDEPEND}
-
-DOCS=README
-
-src_prepare() {
- local d=${WORKDIR}/debian/patches
- EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
diff --git a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
b/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
deleted file mode 100644
index 2bd56ef2bbd..000
--- a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/402633
-http://projects.archlinux.org/svntogit/community.git/tree/trunk/extundelete-build.patch?h=packages/extundelete
-
src/extundelete.cc
-+++ src/extundelete.cc
-@@ -943,3 +943,3 @@
- {
-- group_descriptor_table[n] = fs->group_desc[n];
-+ group_descriptor_table[n] = *ext2fs_group_desc(fs,
fs->group_desc, n);
- }
-@@ -2613,3 +2613,4 @@
- inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *)
&inodebuf[item*60] );
-- inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *)
&inodebuf[item*62] );
-+ inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *)
&inodebuf[item*62] );
-+ inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *)
&inodebuf[item*63] );
- }
src/insertionops.cc
-+++ src/insertionops.cc
-@@ -65,3 +65,3 @@
- os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
-- os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
-+ os << "# Fragments per group: " << s_bl
