From d6fe3a53bdeea6b060d1755199cc2c27492dc14c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Apr 2023 11:36:37 +0100 Subject: gentoo auto-resync : 10:04:2023 - 11:36:36 --- sys-fs/e2fsprogs/Manifest | 2 + sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild | 172 +++++++++++++++++++++ ...data_csum_seed-and-orphan_file-by-default.patch | 30 ++++ 3 files changed, 204 insertions(+) create mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild create mode 100644 sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch (limited to 'sys-fs/e2fsprogs') diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 65029033f761..349fed585994 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,11 +1,13 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b +AUX e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch 1140 BLAKE2B bd454a4cf073db6e2e102ad814065e3a0c9a81282db932a2259a615417a9dea5879e53ca6d4bd41537147e7706edc88ecbd06ad71dc57305e8b0b835c2b15ae9 SHA512 90afefd47bbec59537cd646515dc320eac7b6e0f89ce5100b0d518d2386f8f57f84cf182f62130a7530e9a78132fc971e3195f4cef1836a8175261ddb1beaf11 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa DIST e2fsprogs-1.46.6.tar.xz 7051160 BLAKE2B 683274bf9468a3aaf41e542f22266482e75522b1fd2a255c6d852a28b08f027918d4f09239259d443a243c41eae49b3c27454f7d140da2c361c36a71ff77dcf6 SHA512 aca5ef77e36885ce9ce2995d9fae5d278c33e276e74f2a73977380f3e1cf1b3bd115fe6199e44a2f79a2827ba985b5554b8d898e88b7d04387fbba659a08e771 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf EBUILD e2fsprogs-1.46.5-r4.ebuild 4373 BLAKE2B a694162dfdf49f233a05eb8a778f004fbe2b7fe72f54ccc8df42078b1c5ea6580d563d1f56d69b3daf30db66841464a80da2ef30627dd55bc89c2dc8b72efcfa SHA512 a3a353e8d88fb23c6741a6165cddf9faa534230163d2fcba7174c25b62def4d6838783b70bfbbde1ea49de083253e2c72af1dfabf0df1093799c7f864c7f937c EBUILD e2fsprogs-1.46.6.ebuild 4385 BLAKE2B e47d2e171f330aa12c4317d58492d9c0840140d7763a4df87cbc43c2e23faf9472f40110c6d45d9536331591e6c4969f410c50d2932f7b065abadb76a2a76973 SHA512 0c50777260571930ae96350620d87babca84e16435742512edb97e6de0889cb9a3a0feab53fac149067d93d46e116ddc6df0c2b759bc54cc5389b79e2a1b7067 +EBUILD e2fsprogs-1.47.0-r1.ebuild 4593 BLAKE2B 0812a61899b3477bcf04be5d94d11266fbc96b9c9efef8004060ed3b1d63afbd131cfc5ea6b8bb20b58b2f574616fcd38cd6b180287505d21eff909e28a09593 SHA512 346531456a531ebc88dc82455a88678fb1365769709f8ba804ebf4af8baa2442083e7f909a4de673e8804defb1e702ea560751ecfd48de0617274e0af438eaa7 EBUILD e2fsprogs-1.47.0.ebuild 4388 BLAKE2B 9bb01f1a115c379e156d8f092458125b98af5eba0d2ac4f0c1d179173c828b0ccc4c549508051907bf8b5fe1340b7941ef16acaf718efddb6aa3bba81bc971f8 SHA512 bd258e054cb11a4cea457e68715ca4f283c162f55f8d8a6ebce6ab86de679b2e2bdae14f09b055fca4285b123f134fe3436758ad8b4375b5dd041fd161773b7b MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild new file mode 100644 index 000000000000..786735ef4908 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r1.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript + +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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="cron fuse nls static-libs test +tools" +RESTRICT="!test? ( test )" + +RDEPEND=" + !sys-libs/${PN}-libs + cron? ( sys-fs/lvm2[lvm] ) + fuse? ( sys-fs/fuse:0 ) + nls? ( virtual/libintl ) + tools? ( sys-apps/util-linux ) +" +# For testing lib/ext2fs, lib/support/libsupport.a is required, which +# unconditionally includes '' 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" + + # 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" + + # Needs open64() prototypes and friends + append-cppflags -D_GNU_SOURCE + + 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_enable fuse fuse2fs) + $(use_enable nls) + $(multilib_native_use_enable tools e2initrd-helper) + --disable-fsck + --disable-uuidd + --disable-lto + --disable-largefile # need to check effect on ABI + --with-pthread + ) + + # 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() { + 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 + + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a com_err ss ext2fs e2p + + # 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 +} diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch new file mode 100644 index 000000000000..566b5fb8d9af --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch @@ -0,0 +1,30 @@ +https://lwn.net/Articles/923969/ +https://sources.debian.org/data/main/e/e2fsprogs/1.47.0-2/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default + +Description: Disable metadata_csum_seed and orphan_file by default for Debian + . + There are a lot of debian packages that assume that mkfs.ext4 for + Debian N will work on Debian N-1 (and sometimes N-2, N-3, etc.). This + is a bad assumption, but it's too late to fix this for Debian + Bookworm. + . + So revert making these feature a default for now. We will enable it + again post Bookworm. +Author: Theodore Ts'o +Origin: vendor +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1031622 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1030939 +--- a/misc/mke2fs.conf.in ++++ b/misc/mke2fs.conf.in +@@ -11,7 +11,7 @@ + features = has_journal + } + ext4 = { +- features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file ++ features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize + } + small = { + blocksize = 1024 +-- +2.31.0 -- cgit v1.2.3