* [ptxdist] [PATCH] e2fsprogs: Version bump. 1.47.2 -> 1.47.3
@ 2025-07-10 20:24 Christian Melki
2025-07-12 15:48 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2025-07-10 20:24 UTC (permalink / raw)
To: ptxdist
Various minor enhancements.
https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.3
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/e2fsprogs.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 3675567f0..8c8d2b641 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
#
# Paths and names
#
-E2FSPROGS_VERSION := 1.47.2
-E2FSPROGS_MD5 := 56a9e11ca395297627fed9b5afc4fec5
+E2FSPROGS_VERSION := 1.47.3
+E2FSPROGS_MD5 := bfe4e87fe42d899d47cf9bb815fa2b76
E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_SUFFIX := tar.gz
E2FSPROGS_URL := $(call ptx/mirror, KERNEL, kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] e2fsprogs: Version bump. 1.47.2 -> 1.47.3
2025-07-10 20:24 [ptxdist] [PATCH] e2fsprogs: Version bump. 1.47.2 -> 1.47.3 Christian Melki
@ 2025-07-12 15:48 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-07-12 15:48 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 4646e6473a9d9350c126f17aa66b5ffeada6a7bd.
Michael
[sent from post-receive hook]
On Sat, 12 Jul 2025 17:48:27 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Various minor enhancements.
> https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.3
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250710202414.2975086-1-christian.melki@t2data.com>
> [mol: don't forget the patches]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/e2fsprogs-1.47.2/0004-misc-fix-without-libarchive-build-failure.patch b/patches/e2fsprogs-1.47.2/0004-misc-fix-without-libarchive-build-failure.patch
> deleted file mode 100644
> index 84d8f2ff7c94..000000000000
> --- a/patches/e2fsprogs-1.47.2/0004-misc-fix-without-libarchive-build-failure.patch
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -From: Li Dongyang <dongyangli@ddn.com>
> -Date: Wed, 15 Jan 2025 15:36:05 +1100
> -Subject: [PATCH] misc: fix --without-libarchive build failure
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -configure --without-libarchive triggers the error:
> -
> -./../misc/create_inode_libarchive.c: In function ‘__populate_fs_from_tar’:
> -./../misc/create_inode_libarchive.c:25:34: error: parameter name omitted
> - errcode_t __populate_fs_from_tar(ext2_filsys, ext2_ino_t, const char *,
> - ^~~~~~~~~~~
> -./../misc/create_inode_libarchive.c:25:47: error: parameter name omitted
> - errcode_t __populate_fs_from_tar(ext2_filsys, ext2_ino_t, const char *,
> - ^~~~~~~~~~
> -./../misc/create_inode_libarchive.c:25:59: error: parameter name omitted
> - errcode_t __populate_fs_from_tar(ext2_filsys, ext2_ino_t, const char *,
> - ^~~~~~~~~~~~
> -./../misc/create_inode_libarchive.c:26:34: error: parameter name omitted
> - ext2_ino_t, struct hdlinks_s *,
> - ^~~~~~~~~~
> -./../misc/create_inode_libarchive.c:26:46: error: parameter name omitted
> - ext2_ino_t, struct hdlinks_s *,
> - ^~~~~~~~~~~~~~~~~~
> -./../misc/create_inode_libarchive.c:27:34: error: parameter name omitted
> - struct file_info *,
> - ^~~~~~~~~~~~~~~~~~
> -./../misc/create_inode_libarchive.c:28:34: error: parameter name omitted
> - struct fs_ops_callbacks *) {
> - ^~~~~~~~~~~~~~~~~~~~~~~~~
> -
> -Fixes: ecfd4dd1217a ("Decouple --without-libarchive and HAVE_ARCHIVE_H")
> -
> -Signed-off-by: Li Dongyang <dongyangli@ddn.com>
> ----
> - misc/create_inode_libarchive.c | 9 +++++----
> - 1 file changed, 5 insertions(+), 4 deletions(-)
> -
> -diff --git a/misc/create_inode_libarchive.c b/misc/create_inode_libarchive.c
> -index 9c8e53e4674e..f89ac1e4c343 100644
> ---- a/misc/create_inode_libarchive.c
> -+++ b/misc/create_inode_libarchive.c
> -@@ -22,10 +22,11 @@
> -
> - /* If ./configure was run with --without-libarchive, then only
> - * __populate_fs_from_tar() remains in this file and will return an error. */
> --errcode_t __populate_fs_from_tar(ext2_filsys, ext2_ino_t, const char *,
> -- ext2_ino_t, struct hdlinks_s *,
> -- struct file_info *,
> -- struct fs_ops_callbacks *) {
> -+errcode_t __populate_fs_from_tar(ext2_filsys fs, ext2_ino_t root_ino,
> -+ const char *source_tar, ext2_ino_t root,
> -+ struct hdlinks_s *hdlinks,
> -+ struct file_info *target,
> -+ struct fs_ops_callbacks *fs_callbacks) {
> - com_err(__func__, 0,
> - _("you need to compile e2fsprogs without --without-libarchive"
> - "be able to process tarballs"));
> diff --git a/patches/e2fsprogs-1.47.2/0001-e2fsprogs-Disable-docs.patch b/patches/e2fsprogs-1.47.3/0001-e2fsprogs-Disable-docs.patch
> similarity index 82%
> rename from patches/e2fsprogs-1.47.2/0001-e2fsprogs-Disable-docs.patch
> rename to patches/e2fsprogs-1.47.3/0001-e2fsprogs-Disable-docs.patch
> index 38a8cc8ebc00..08384af83ce9 100644
> --- a/patches/e2fsprogs-1.47.2/0001-e2fsprogs-Disable-docs.patch
> +++ b/patches/e2fsprogs-1.47.3/0001-e2fsprogs-Disable-docs.patch
> @@ -10,11 +10,11 @@ Signed-off-by: Christian Melki <christian.melki@t2data.com>
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile.in b/Makefile.in
> -index 79b71165002d..0b80c20d4858 100644
> +index 277b500bbc9a..226aa66c02c6 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -35,7 +35,6 @@ TAR=tar
> - all:: subs
> + all:: top-deps
> $(MAKE) libs
> @ALL_CMT@ $(MAKE) progs
> -@ALL_CMT@ $(MAKE) docs
> @@ -24,12 +24,12 @@ index 79b71165002d..0b80c20d4858 100644
> @@ -72,11 +71,11 @@ distclean-doc:
> -test -d doc && cd doc && $(MAKE) distclean
>
> - install: subs all-libs-recursive install-progs-recursive \
> + install: top-deps all-libs-recursive install-progs-recursive \
> - install-shlibs-libs-recursive install-doc-libs
> + install-shlibs-libs-recursive
> @SUBSET_CMT@ $(MAKE) install-libs
>
> - install-strip: subs all-libs-recursive install-strip-progs-recursive \
> + install-strip: top-deps all-libs-recursive install-strip-progs-recursive \
> - install-shlibs-strip-libs-recursive install-doc-libs
> + install-shlibs-strip-libs-recursive
>
> diff --git a/patches/e2fsprogs-1.47.2/0002-e2fsprogs-Disable-ldconfig.patch b/patches/e2fsprogs-1.47.3/0002-e2fsprogs-Disable-ldconfig.patch
> similarity index 100%
> rename from patches/e2fsprogs-1.47.2/0002-e2fsprogs-Disable-ldconfig.patch
> rename to patches/e2fsprogs-1.47.3/0002-e2fsprogs-Disable-ldconfig.patch
> diff --git a/patches/e2fsprogs-1.47.2/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch b/patches/e2fsprogs-1.47.3/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch
> similarity index 100%
> rename from patches/e2fsprogs-1.47.2/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch
> rename to patches/e2fsprogs-1.47.3/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch
> diff --git a/patches/e2fsprogs-1.47.2/series b/patches/e2fsprogs-1.47.3/series
> similarity index 62%
> rename from patches/e2fsprogs-1.47.2/series
> rename to patches/e2fsprogs-1.47.3/series
> index 5697ef4fb39a..a4d897d2a089 100644
> --- a/patches/e2fsprogs-1.47.2/series
> +++ b/patches/e2fsprogs-1.47.3/series
> @@ -3,5 +3,4 @@
> 0001-e2fsprogs-Disable-docs.patch
> 0002-e2fsprogs-Disable-ldconfig.patch
> 0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch
> -0004-misc-fix-without-libarchive-build-failure.patch
> -# f5718abaa30eabe21a17b45d693a7ae4 - git-ptx-patches magic
> +# 64efe4be705d81494b152b54654a13a5 - git-ptx-patches magic
> diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
> index 3675567f0ae0..8c8d2b6414f4 100644
> --- a/rules/e2fsprogs.make
> +++ b/rules/e2fsprogs.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
> #
> # Paths and names
> #
> -E2FSPROGS_VERSION := 1.47.2
> -E2FSPROGS_MD5 := 56a9e11ca395297627fed9b5afc4fec5
> +E2FSPROGS_VERSION := 1.47.3
> +E2FSPROGS_MD5 := bfe4e87fe42d899d47cf9bb815fa2b76
> E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION)
> E2FSPROGS_SUFFIX := tar.gz
> E2FSPROGS_URL := $(call ptx/mirror, KERNEL, kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-12 15:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-10 20:24 [ptxdist] [PATCH] e2fsprogs: Version bump. 1.47.2 -> 1.47.3 Christian Melki
2025-07-12 15:48 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox