diff options
Diffstat (limited to 'sys-fs/e2fsprogs')
| -rw-r--r-- | sys-fs/e2fsprogs/Manifest | 6 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild) | 7 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild) | 5 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch | 38 |
4 files changed, 6 insertions, 50 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 901d3d2bcc82..665d105a80b0 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,9 +1,7 @@ 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.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch 1140 BLAKE2B bd454a4cf073db6e2e102ad814065e3a0c9a81282db932a2259a615417a9dea5879e53ca6d4bd41537147e7706edc88ecbd06ad71dc57305e8b0b835c2b15ae9 SHA512 90afefd47bbec59537cd646515dc320eac7b6e0f89ce5100b0d518d2386f8f57f84cf182f62130a7530e9a78132fc971e3195f4cef1836a8175261ddb1beaf11 -AUX e2fsprogs-1.47.1-c23.patch 1293 BLAKE2B 9c297e1c99c9f3b071286223ecdf20a7d5f40aa3705a4e652a4d725831e7270d3a76aa225fc9b1e76a9573509604eb563ad879a4e249849e31b1324209de09c4 SHA512 2818e1e93295231490fcd18478eb14be80a509de435baeb39c87a6c63ed53593624e0dfdc77ed76a448abaafae0f7f6d51422fcbc5fca2f71c7ad3b376e8a4c3 -DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb DIST e2fsprogs-1.47.2.tar.xz 7299932 BLAKE2B 20f93b53c18396dbbf8a9564fd80181e391120554bd63a76c90c88d32616596fb7cf8e1252417b835ef3918ecf3211aebdd7a75daebee11bcb6e7b0f9bd88053 SHA512 a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8 -EBUILD e2fsprogs-1.47.1.ebuild 4673 BLAKE2B 2c4b56e3067dc5134f2cf5e5af08dc6ae7a0187efc3004a03a040c33f324fa5347f0a75d712cf54a8203a33d7f53aebedee54e487ea43ee721b26de48a9d2ad1 SHA512 e53757aef306901431810284bd08fd1ab4288bd4a8c32bf6edfc7f71e03c83815f26a4981faa0cc891dc38893444436a58a1e1b93dc8fcb51deae689abd63222 -EBUILD e2fsprogs-1.47.2.ebuild 4636 BLAKE2B 077540de200ac113f13325e9ff66ae9d8822c7594404d2fb25e4d1b3f6c0e0f58c02fd6a49e29a297a1069b36f2f2f4f61fbb1813a4387dfcc6e74a39d962eda SHA512 c69927b4a996012fca62a5aa364ef29104e5c4f086e3e7604ac788589e8c8975807ebb0b400c06aeb7a622aa2ccd4429b8c1fce27202709145c22be3a26b7438 +EBUILD e2fsprogs-1.47.2-r10.ebuild 4436 BLAKE2B 7a6eb1bca0181ea9bfc94735ce99e9f11ed45680a7987ef5ef01ff612f4b61912974557f92b46acade70c7fb7268620044291b3b933021f31269259ae7c90638 SHA512 b0d51008341d49ada4bfd1a8d12cc5489beabc11805e91adce5d1de66a92f5b3e414d1b57b0de76906b428f3696a8623944ffd98822c2b316976025c89f5bde9 +EBUILD e2fsprogs-1.47.2-r3.ebuild 4636 BLAKE2B 55f4b531a09a5531ffbf2f15235b7ab1aff98870e6ec1717fc1d6609b9bd505eb14de0866e04ef29fcfa324e80abcfe06cd7e9291f20a1f71ac7e687301a4629 SHA512 4af2cfed7c7002e77db3a202e7ae1b1a2a5e9c3ed5a831cd96a96fd5454812d732e5431c4ba636540f02b8ba491cfd405b76e19c5f794199d6e87365351ee284 MISC metadata.xml 870 BLAKE2B bf57e8f24b302ed91357fb10dbc9b15656002983281fd287ee241a9a097d00e6af56d4a42de4109728dbb826ea58e58eba26ec1840299e43f7728495b1a133f4 SHA512 fa0ea6b3db855719976d3c627dcf88f62cf7fdacc132686ea06bcdfce03bb9ccef035d9aa674fc43844a0a111198c34921016183966be5f887aabed06bf0f369 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild index eb92f189446e..9b72df228c78 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ 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" +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 )" @@ -19,7 +19,7 @@ RDEPEND=" !sys-libs/${PN}-libs archive? ( app-arch/libarchive:= ) cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:3 ) + fuse? ( sys-fs/fuse:3= ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) " @@ -41,9 +41,6 @@ MULTILIB_WRAPPED_HEADERS=( 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) ) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild index d1f1284271fc..5a09f77b3fda 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ RDEPEND=" !sys-libs/${PN}-libs archive? ( app-arch/libarchive:= ) cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:3 ) + fuse? ( sys-fs/fuse:3= ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) " @@ -46,7 +46,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch # Upstream patches (can usually removed with next version bump) - "${FILESDIR}"/${PN}-1.47.1-c23.patch ) src_prepare() { diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch deleted file mode 100644 index b39e0a45534c..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch +++ /dev/null @@ -1,38 +0,0 @@ -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" - |