Thanks, applied as a3bde6856ab6cce5b7754edf74e6af0b411ce569. Michael
[sent from post-receive hook] On Mon, 10 Jun 2024 21:41:25 +0200, Christian Melki <[email protected]> wrote: > Bunch of fixes mostly. Post 2038 for 64-bit time_t. > https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.1 > > * Disable libarchive. Could have been used to stream tar directly as input to > mke2fs. > * Forward patches. Applies cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch > b/patches/e2fsprogs-1.47.1/0001-e2fsprogs-Disable-docs.patch > similarity index 100% > rename from patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch > rename to patches/e2fsprogs-1.47.1/0001-e2fsprogs-Disable-docs.patch > diff --git a/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch > b/patches/e2fsprogs-1.47.1/0002-e2fsprogs-Disable-ldconfig.patch > similarity index 100% > rename from patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch > rename to patches/e2fsprogs-1.47.1/0002-e2fsprogs-Disable-ldconfig.patch > diff --git > a/patches/e2fsprogs-1.47.0/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch > > b/patches/e2fsprogs-1.47.1/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch > similarity index 100% > rename from > patches/e2fsprogs-1.47.0/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch > rename to > patches/e2fsprogs-1.47.1/0003-mke2fs.conf-remove-orphan_file-from-ext4-features.patch > diff --git a/patches/e2fsprogs-1.47.0/series b/patches/e2fsprogs-1.47.1/series > similarity index 100% > rename from patches/e2fsprogs-1.47.0/series > rename to patches/e2fsprogs-1.47.1/series > diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make > index 87f1004f3323..f5cc651b1336 100644 > --- a/rules/e2fsprogs.make > +++ b/rules/e2fsprogs.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs > # > # Paths and names > # > -E2FSPROGS_VERSION := 1.47.0 > -E2FSPROGS_MD5 := 6b4f18a33873623041857b4963641ee9 > +E2FSPROGS_VERSION := 1.47.1 > +E2FSPROGS_MD5 := 75e6d1353cbe6d5728a98fb0267206cb > E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) > E2FSPROGS_SUFFIX := tar.gz > E2FSPROGS_URL := $(call ptx/mirror, SF, > e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)) > @@ -75,7 +75,8 @@ E2FSPROGS_CONF_OPT := \ > --disable-addrsan \ > --disable-threadsan \ > --disable-fuzzing \ > - --with-pthread > + --with-pthread \ > + --without-libarchive > > E2FSPROGS_MAKE_OPT := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1) > E2FSPROGS_INSTALL_OPT := install install-libs
