diff --git a/0001-Drop-rmd160-from-OpenSSL.patch b/0001-Drop-rmd160-from-OpenSSL.patch deleted file mode 100644 index 58049ea..0000000 --- a/0001-Drop-rmd160-from-OpenSSL.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ec97aebcd2a3c4ed3a2fbb0037364b349bf9e84a Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Fri, 3 Dec 2021 11:07:55 -0500 -Subject: [PATCH] Drop rmd160 from OpenSSL - -Signed-off-by: Stephen Gallagher ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cb89c3ee81530e63e18f12aec2bbf04e8c0a1a34..b4d8ceabba4131a93589c0cf6bcd29bed8bdc774 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1205,11 +1205,10 @@ if test "x$with_openssl" != "xno"; then - *) - AC_CHECK_LIB(crypto,OPENSSL_config) - ;; - esac - CRYPTO_CHECK(MD5, OPENSSL, md5) -- CRYPTO_CHECK(RMD160, OPENSSL, rmd160) - CRYPTO_CHECK(SHA1, OPENSSL, sha1) - CRYPTO_CHECK(SHA256, OPENSSL, sha256) - CRYPTO_CHECK(SHA384, OPENSSL, sha384) - CRYPTO_CHECK(SHA512, OPENSSL, sha512) - AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1]) --- -2.33.1 - diff --git a/backport-CVE-2022-36227.patch b/backport-CVE-2022-36227.patch deleted file mode 100644 index 7306ba8..0000000 --- a/backport-CVE-2022-36227.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 -From: obiwac -Date: Fri, 22 Jul 2022 22:41:10 +0200 -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) - -Conflict:NA -Reference:https://github.com/libarchive/libarchive/commit/fd180c36036df7181a64931264732a10ad8cd024 ---- - libarchive/archive_write.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index 66592e826..27626b541 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) - struct archive_write_filter *f; - - f = calloc(1, sizeof(*f)); -+ -+ if (f == NULL) -+ return (NULL); -+ - f->archive = _a; - f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; - if (a->filter_first == NULL) -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, - a->client_data = client_data; - - client_filter = __archive_write_allocate_filter(_a); -+ -+ if (client_filter == NULL) -+ return (ARCHIVE_FATAL); -+ - client_filter->open = archive_write_client_open; - client_filter->write = archive_write_client_write; - client_filter->close = archive_write_client_close; - diff --git a/libarchive-3.6.1.tar.gz b/libarchive-3.6.1.tar.gz deleted file mode 100644 index 51ca0c8..0000000 Binary files a/libarchive-3.6.1.tar.gz and /dev/null differ diff --git a/libarchive-3.6.2.tar.gz b/libarchive-3.6.2.tar.gz new file mode 100644 index 0000000..2dafab0 Binary files /dev/null and b/libarchive-3.6.2.tar.gz differ diff --git a/libarchive-uninitialized-value.patch b/libarchive-uninitialized-value.patch deleted file mode 100644 index 412a8eb..0000000 --- a/libarchive-uninitialized-value.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1ab606af27d6b3fa07a638b7f04efadbc8ef75b4 Mon Sep 17 00:00:00 2001 -From: zhangnaru -Date: Tue, 28 Jul 2020 15:05:03 +0800 -Subject: [PATCH] there need to add the init of child to solve the -problem in oss-fuzz ---- - libarchive/filter_fork_posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libarchive/filter_fork_posix.c b/libarchive/filter_fork_posix.c -index ac255c4..62085a7 100644 ---- a/libarchive/filter_fork_posix.c -+++ b/libarchive/filter_fork_posix.c -@@ -76,7 +76,7 @@ int - __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout, - pid_t *out_child) - { -- pid_t child; -+ pid_t child = -1; - int stdin_pipe[2], stdout_pipe[2], tmp; - #if HAVE_POSIX_SPAWNP - posix_spawn_file_actions_t actions; --- -2.23.0 diff --git a/libarchive.spec b/libarchive.spec index 5b4c466..9ec5ab6 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -1,8 +1,8 @@ %bcond_without check Name: libarchive -Version: 3.6.1 -Release: 2 +Version: 3.6.2 +Release: 1 Summary: Multi-format archive and compression library License: BSD URL: https://www.libarchive.org/ @@ -13,10 +13,6 @@ BuildRequires: lzo-devel e2fsprogs-devel libacl-devel libattr-devel BuildRequires: openssl-devel libxml2-devel lz4-devel automake libzstd-devel BuildRequires: autoconf libtool make -Patch0001: 0001-Drop-rmd160-from-OpenSSL.patch -Patch6000: backport-CVE-2022-36227.patch -Patch9000: libarchive-uninitialized-value.patch - %description %{name} is an open-source BSD-licensed C programming library that provides streaming access to a variety of different archive formats, @@ -189,6 +185,9 @@ run_testsuite %{_bindir}/bsdcat %changelog +* Wed Jun 7 2023 dillon chen - 3.6.2-1 +- Upgrade to 3.6.2 + * Fri Nov 25 2022 wangkerong - 3.6.1-2 - fix CVE-2022-36227