sys-fs/e2fsprogs: Sync with Gentoo

It's from Gentoo commit 84180a3c6bb7b0e40f91e9447f59bb2b26a517c8.
This commit is contained in:
Flatcar Buildbot 2025-01-13 07:10:38 +00:00 committed by Krzesimir Nowak
parent 7702fddf99
commit 066848592c
4 changed files with 217 additions and 1 deletions

View File

@ -1,2 +1,3 @@
DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb
DIST e2fsprogs-1.47.2.tar.xz 7299932 BLAKE2B 20f93b53c18396dbbf8a9564fd80181e391120554bd63a76c90c88d32616596fb7cf8e1252417b835ef3918ecf3211aebdd7a75daebee11bcb6e7b0f9bd88053 SHA512 a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8

View File

@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2 BSD" LICENSE="GPL-2 BSD"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="archive cron fuse nls static-libs test +tools" IUSE="archive cron fuse nls static-libs test +tools"
RESTRICT="!test? ( test )" RESTRICT="!test? ( test )"
@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch "${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
# Upstream patches (can usually removed with next version bump) # Upstream patches (can usually removed with next version bump)
"${FILESDIR}"/${PN}-1.47.1-c23.patch
) )
src_prepare() { src_prepare() {

View File

@ -0,0 +1,176 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit multilib-minimal systemd toolchain-funcs udev
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="archive cron fuse nls static-libs test +tools"
RESTRICT="!test? ( test )"
RDEPEND="
!sys-libs/${PN}-libs
archive? ( app-arch/libarchive:= )
cron? ( sys-fs/lvm2[lvm] )
fuse? ( sys-fs/fuse:3 )
nls? ( virtual/libintl )
tools? ( sys-apps/util-linux )
"
# For testing lib/ext2fs, lib/support/libsupport.a is required, which
# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
DEPEND="
${RDEPEND}
test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
"
BDEPEND="
sys-apps/texinfo
virtual/pkgconfig
nls? ( sys-devel/gettext )
"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/ext2fs/ext2_types.h
)
PATCHES=(
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
# We can drop this metadata patch after 6 months or so to let initramfses
# upgrade. See bug #904093 and bug #904048.
"${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
# Upstream patches (can usually removed with next version bump)
)
src_prepare() {
default
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
# Get rid of doc -- we don't use them. This also prevents a sandbox
# violation due to mktexfmt invocation
rm -r doc || die "Failed to remove doc dir"
cat <<-'EOF' > tests/m_rootdir_acl/script || die
echo "$test_name: $test_description: skipped (bgo#905221, fails on btrfs)"
return 0
EOF
# Prevent included intl cruft from building, bug #81096
sed -i -r \
-e 's:@LIBINTL@:@LTLIBINTL@:' \
MCONFIG.in || die 'intl cruft'
}
multilib_src_configure() {
# Keep the package from doing silly things, bug #261411
export VARTEXFONTS="${T}/fonts"
local myeconfargs=(
--with-root-prefix="${EPREFIX}"
$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
--enable-symlink-install
--enable-elf-shlibs
$(tc-has-tls || echo --disable-tls)
$(multilib_native_use_with archive libarchive direct)
$(multilib_native_use_enable fuse fuse2fs)
$(use_enable nls)
$(multilib_native_use_enable tools e2initrd-helper)
--disable-fsck
--disable-uuidd
--disable-lto
--with-pthread
--enable-largefile
)
# We use blkid/uuid from util-linux now
if use kernel_linux ; then
export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
myeconfargs+=( --disable-lib{blkid,uuid} )
fi
ac_cv_path_LDCONFIG=: \
ECONF_SOURCE="${S}" \
CC="$(tc-getCC)" \
BUILD_CC="$(tc-getBUILD_CC)" \
BUILD_LD="$(tc-getBUILD_LD)" \
econf "${myeconfargs[@]}"
if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to https://bugs.gentoo.org/81096"
die "Preventing included intl cruft from building"
fi
}
multilib_src_compile() {
# Parallel make issue #936493
emake -C lib/et V=1 compile_et
emake -C lib/ext2fs V=1 ext2_err.h
if multilib_is_native_abi && use tools ; then
emake V=1
else
emake -C lib/et V=1
emake -C lib/ss V=1
emake -C lib/ext2fs V=1
emake -C lib/e2p V=1
fi
}
multilib_src_test() {
if multilib_is_native_abi && use tools ; then
emake V=1 check
else
# Required by lib/ext2fs's check target
emake -C lib/support V=1
# For non-native, there's no binaries to test. Just libraries.
emake -C lib/et V=1 check
emake -C lib/ss V=1 check
emake -C lib/ext2fs V=1 check
emake -C lib/e2p V=1 check
fi
}
multilib_src_install() {
if multilib_is_native_abi && use tools ; then
emake STRIP=':' V=1 DESTDIR="${D}" install
else
emake -C lib/et V=1 DESTDIR="${D}" install
emake -C lib/ss V=1 DESTDIR="${D}" install
emake -C lib/ext2fs V=1 DESTDIR="${D}" install
emake -C lib/e2p V=1 DESTDIR="${D}" install
fi
# configure doesn't have an option to disable static libs
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die
fi
}
multilib_src_install_all() {
einstalldocs
if use tools ; then
insinto /etc
doins "${FILESDIR}"/e2fsck.conf
fi
}
pkg_postinst() {
udev_reload
}
pkg_postrm() {
udev_reload
}

View File

@ -0,0 +1,38 @@
https://bugs.gentoo.org/943687
https://github.com/tytso/e2fsprogs/issues/202
https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef
From 49fd04d77b3244c6c6990be41142168eef373aef Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 22 Nov 2024 12:36:32 +0000
Subject: [PATCH] libext2fs: fix -std=c23 build failure
gcc-15 switched to -std=c23 by default:
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
As a result `e2fsprogs` fails the build so only typedef int bool
for __STDC_VERSION__ <= 201710L (C17)
../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers
../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration
113 | typedef int bool;
| ^~~~~~~
https://github.com/tytso/e2fsprogs/issues/202
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
--- a/lib/ext2fs/tdb.c
+++ b/lib/ext2fs/tdb.c
@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s)
#endif
#endif
+#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
typedef int bool;
+#endif
#include "tdb.h"