libarchive: Update to version 3.6.2

Message ID 20221217121427.3532488-3-adolf.belka@ipfire.org
State Accepted
Commit bdfe67598735ad28aa2ed705d3de7ebfad4930fc
Headers
Series libarchive: Update to version 3.6.2 |

Commit Message

Adolf Belka 17 Dec 2022, 12:14 p.m. UTC
  - Update from version 3.6.1 to 3.6.2
- Update of rootfile
- patch to fix glibc 2.36 headers is now part of the source code
- Changelog
    Libarchive 3.6.2 is a bugfix and security release.
	Important bug fixes:
	    include ZSTD in Windows builds (#1688)
	    SSL fixes on Windows (#1714, #1723, #1724)
	    rar5 reader: fix possible garbled output with bsdtar -O (#1745)
	    mtree reader: support reading mtree files with tabs (#1783)
	    various small fixes for issues found by CodeQL

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/libarchive            |  2 +-
 lfs/libarchive                                |  7 ++--
 ...ibarchive-3.6-fix-glibc-2.36-headers.patch | 41 -------------------
 3 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
  

Comments

Peter Müller 26 Dec 2022, 8:52 a.m. UTC | #1
I lost count how many security updates libarchive released this year...

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - Update from version 3.6.1 to 3.6.2
> - Update of rootfile
> - patch to fix glibc 2.36 headers is now part of the source code
> - Changelog
>     Libarchive 3.6.2 is a bugfix and security release.
> 	Important bug fixes:
> 	    include ZSTD in Windows builds (#1688)
> 	    SSL fixes on Windows (#1714, #1723, #1724)
> 	    rar5 reader: fix possible garbled output with bsdtar -O (#1745)
> 	    mtree reader: support reading mtree files with tabs (#1783)
> 	    various small fixes for issues found by CodeQL
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  config/rootfiles/common/libarchive            |  2 +-
>  lfs/libarchive                                |  7 ++--
>  ...ibarchive-3.6-fix-glibc-2.36-headers.patch | 41 -------------------
>  3 files changed, 4 insertions(+), 46 deletions(-)
>  delete mode 100644 src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
> 
> diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive
> index d6860041b..df0ab03c4 100644
> --- a/config/rootfiles/common/libarchive
> +++ b/config/rootfiles/common/libarchive
> @@ -6,7 +6,7 @@
>  #usr/lib/libarchive.la
>  #usr/lib/libarchive.so
>  usr/lib/libarchive.so.13
> -usr/lib/libarchive.so.13.6.1
> +usr/lib/libarchive.so.13.6.2
>  #usr/lib/pkgconfig/libarchive.pc
>  #usr/share/man/man1/bsdcat.1
>  #usr/share/man/man1/bsdcpio.1
> diff --git a/lfs/libarchive b/lfs/libarchive
> index c6531ce12..f88753017 100644
> --- a/lfs/libarchive
> +++ b/lfs/libarchive
> @@ -1,7 +1,7 @@
>  ###############################################################################
>  #                                                                             #
>  # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
>  #                                                                             #
>  # This program is free software: you can redistribute it and/or modify        #
>  # it under the terms of the GNU General Public License as published by        #
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 3.6.1
> +VER        = 3.6.2
>  
>  THISAPP    = libarchive-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -41,7 +41,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_BLAKE2 = e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf
> +$(DL_FILE)_BLAKE2 = 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4
>  
>  install : $(TARGET)
>  
> @@ -74,7 +74,6 @@ $(subst %,%_BLAKE2,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
>  	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make install
> diff --git a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch b/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
> deleted file mode 100644
> index 7c88ca1b1..000000000
> --- a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Mon, 25 Jul 2022 10:56:53 -0700
> -Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
> - present
> -
> -These headers are in conflict and only one is needed by
> -archive_read_disk_posix.c therefore include linux/fs.h if it exists
> -otherwise include sys/mount.h
> -
> -It also helps compiling with glibc 2.36
> -where sys/mount.h conflicts with linux/mount.h see [1]
> -
> -[1] https://sourceware.org/glibc/wiki/Release/2.36
> ----
> - libarchive/archive_read_disk_posix.c | 5 ++---
> - 1 file changed, 2 insertions(+), 3 deletions(-)
> -
> -diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
> -index 2b39e672b..a96008db7 100644
> ---- a/libarchive/archive_read_disk_posix.c
> -+++ b/libarchive/archive_read_disk_posix.c
> -@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
> - #ifdef HAVE_SYS_PARAM_H
> - #include <sys/param.h>
> - #endif
> --#ifdef HAVE_SYS_MOUNT_H
> --#include <sys/mount.h>
> --#endif
> - #ifdef HAVE_SYS_STAT_H
> - #include <sys/stat.h>
> - #endif
> -@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
> - #endif
> - #ifdef HAVE_LINUX_FS_H
> - #include <linux/fs.h>
> -+#elif HAVE_SYS_MOUNT_H
> -+#include <sys/mount.h>
> - #endif
> - /*
> -  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
  

Patch

diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/libarchive
index d6860041b..df0ab03c4 100644
--- a/config/rootfiles/common/libarchive
+++ b/config/rootfiles/common/libarchive
@@ -6,7 +6,7 @@ 
 #usr/lib/libarchive.la
 #usr/lib/libarchive.so
 usr/lib/libarchive.so.13
-usr/lib/libarchive.so.13.6.1
+usr/lib/libarchive.so.13.6.2
 #usr/lib/pkgconfig/libarchive.pc
 #usr/share/man/man1/bsdcat.1
 #usr/share/man/man1/bsdcpio.1
diff --git a/lfs/libarchive b/lfs/libarchive
index c6531ce12..f88753017 100644
--- a/lfs/libarchive
+++ b/lfs/libarchive
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 3.6.1
+VER        = 3.6.2
 
 THISAPP    = libarchive-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf
+$(DL_FILE)_BLAKE2 = 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4
 
 install : $(TARGET)
 
@@ -74,7 +74,6 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch b/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
deleted file mode 100644
index 7c88ca1b1..000000000
--- a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
- present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
----
- libarchive/archive_read_disk_posix.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
-index 2b39e672b..a96008db7 100644
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
-  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.