Re: [ptxdist] [APPLIED] file: version bump 5.39 -> 5.45

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 2114917ead83c4a78aad5cb65518de9e97596b9b.

Michael

[sent from post-receive hook]

On Mon, 05 Aug 2024 08:49:33 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> some bug fixes and improvements
> 
> * removed patch series; no longer needed
> 
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <20240716125346.68065-2-ahelmcke@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/file-5.39/0001-PR-168-gyakovlev-Include-termios.h.patch b/patches/file-5.39/0001-PR-168-gyakovlev-Include-termios.h.patch
> deleted file mode 100644
> index 3f86d9207928..000000000000
> --- a/patches/file-5.39/0001-PR-168-gyakovlev-Include-termios.h.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From: Christos Zoulas <christos@zoulas.com>
> -Date: Thu, 18 Jun 2020 16:25:12 +0000
> -Subject: [PATCH] PR/168: gyakovlev: Include <termios.h>
> -
> ----
> - src/seccomp.c | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/src/seccomp.c b/src/seccomp.c
> -index e667adfe4e3c..68c56485d371 100644
> ---- a/src/seccomp.c
> -+++ b/src/seccomp.c
> -@@ -27,7 +27,7 @@
> - #include "file.h"
> - 
> - #ifndef	lint
> --FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
> -+FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $")
> - #endif	/* lint */
> - 
> - #if HAVE_LIBSECCOMP
> -@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
> - #include <sys/prctl.h> /* prctl */
> - #include <sys/ioctl.h>
> - #include <sys/socket.h>
> -+#include <termios.h>
> - #include <fcntl.h>
> - #include <stdlib.h>
> - #include <errno.h>
> diff --git a/patches/file-5.39/series b/patches/file-5.39/series
> deleted file mode 100644
> index b5b51642a39c..000000000000
> --- a/patches/file-5.39/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-PR-168-gyakovlev-Include-termios.h.patch
> -# 9df76025b13c4838db9194cda9167ce4  - git-ptx-patches magic
> diff --git a/rules/file.make b/rules/file.make
> index 337b30bb41a2..54a31db20f65 100644
> --- a/rules/file.make
> +++ b/rules/file.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_FILE) += file
>  #
>  # Paths and names
>  #
> -FILE_VERSION	:= 5.39
> -FILE_MD5	:= 1c450306053622803a25647d88f80f25
> +FILE_VERSION	:= 5.45
> +FILE_MD5	:= 26b2a96d4e3a8938827a1e572afd527a
>  FILE		:= file-$(FILE_VERSION)
>  FILE_SUFFIX	:= tar.gz
>  FILE_URL	:= http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
> @@ -40,6 +40,8 @@ FILE_CONF_OPT	:= \
>  	--enable-zlib \
>  	--disable-bzlib \
>  	--disable-xzlib \
> +	--disable-zstdlib \
> +	--disable-lzlib \
>  	--$(call ptx/endis, PTXCONF_FILE_SECCOMP)-libseccomp \
>  	--disable-fsect-man5 \
>  	$(GLOBAL_LARGE_FILE_OPTION) \