From d3b15e8c8bdac1296e2ea238bada76b400ede92c Mon Sep 17 00:00:00 2001 From: MaxBrodeurUrbas Date: Tue, 15 Mar 2022 13:29:10 -0700 Subject: [PATCH 1/4] upgrading libarchive to v3.6.0 --- SPECS/libarchive/libarchive.signatures.json | 2 +- SPECS/libarchive/libarchive.spec | 8 +++++--- cgmanifest.json | 4 ++-- .../resources/manifests/package/pkggen_core_aarch64.txt | 4 ++-- .../resources/manifests/package/pkggen_core_x86_64.txt | 4 ++-- toolkit/resources/manifests/package/toolchain_aarch64.txt | 6 +++--- toolkit/resources/manifests/package/toolchain_x86_64.txt | 6 +++--- .../toolchain/container/toolchain-remote-wget-list | 2 +- toolkit/scripts/toolchain/container/toolchain-sha256sums | 2 +- .../toolchain/container/toolchain_build_in_chroot.sh | 8 ++++---- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/SPECS/libarchive/libarchive.signatures.json b/SPECS/libarchive/libarchive.signatures.json index 2303fab6913..9351d7edfbf 100644 --- a/SPECS/libarchive/libarchive.signatures.json +++ b/SPECS/libarchive/libarchive.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libarchive-3.4.2.tar.gz": "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" + "libarchive-3.6.0.tar.gz": "a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852" } } \ No newline at end of file diff --git a/SPECS/libarchive/libarchive.spec b/SPECS/libarchive/libarchive.spec index e6fce3d1296..463757e2b85 100644 --- a/SPECS/libarchive/libarchive.spec +++ b/SPECS/libarchive/libarchive.spec @@ -1,13 +1,12 @@ Summary: Multi-format archive and compression library Name: libarchive -Version: 3.4.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} # Certain files have individual licenses. For more details see contents of "COPYING". License: BSD AND Public Domain AND (ASL 2.0 OR CC0 1.0 OR OpenSSL) Vendor: Microsoft Corporation Distribution: Mariner Source0: https://github.com/libarchive/libarchive/releases/download/v%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-test_write_disk_secure-properly-check-if-lchmod-is-s.patch Provides: bsdtar = %{version}-%{release} BuildRequires: xz-libs @@ -60,6 +59,9 @@ make %{?_smp_mflags} check %{_libdir}/pkgconfig/*.pc %changelog +* Tue Mar 15 2022 Max Brodeur-Urbas - 3.6.0-1 +- Upgrading to v3.6.0 + * Thu Feb 03 2022 Muhammad Falak - 3.4.2-5 - Backport patch from upstream to fix 'test_write_disk_secure' diff --git a/cgmanifest.json b/cgmanifest.json index e128a58ac82..223ea76e25f 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8831,8 +8831,8 @@ "type": "other", "other": { "name": "libarchive", - "version": "3.4.2", - "downloadUrl": "https://github.com/libarchive/libarchive/releases/download/v3.4.2/libarchive-3.4.2.tar.gz" + "version": "3.6.0", + "downloadUrl": "https://github.com/libarchive/libarchive/releases/download/v3.6.0/libarchive-3.6.0.tar.gz" } } }, diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0c9a126d083..1b5fe3e58b7 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -171,8 +171,8 @@ openssl-static-1.1.1k-9.cm2.aarch64.rpm libcap-2.26-2.cm2.aarch64.rpm libcap-devel-2.26-2.cm2.aarch64.rpm debugedit-5.0-1.cm2.aarch64.rpm -libarchive-3.4.2-5.cm2.aarch64.rpm -libarchive-devel-3.4.2-5.cm2.aarch64.rpm +libarchive-3.6.0-1.cm2.aarch64.rpm +libarchive-devel-3.6.0-1.cm2.aarch64.rpm rpm-4.17.0-3.cm2.aarch64.rpm rpm-build-4.17.0-3.cm2.aarch64.rpm rpm-build-libs-4.17.0-3.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index f0309e3a043..ed34c0adef9 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -171,8 +171,8 @@ openssl-static-1.1.1k-9.cm2.x86_64.rpm libcap-2.26-2.cm2.x86_64.rpm libcap-devel-2.26-2.cm2.x86_64.rpm debugedit-5.0-1.cm2.x86_64.rpm -libarchive-3.4.2-5.cm2.x86_64.rpm -libarchive-devel-3.4.2-5.cm2.x86_64.rpm +libarchive-3.6.0-1.cm2.x86_64.rpm +libarchive-devel-3.6.0-1.cm2.x86_64.rpm rpm-4.17.0-3.cm2.x86_64.rpm rpm-build-4.17.0-3.cm2.x86_64.rpm rpm-build-libs-4.17.0-3.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 3a5e740c1c7..ae03e3ae33b 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -139,9 +139,9 @@ krb5-1.18-4.cm2.aarch64.rpm krb5-debuginfo-1.18-4.cm2.aarch64.rpm krb5-devel-1.18-4.cm2.aarch64.rpm krb5-lang-1.18-4.cm2.aarch64.rpm -libarchive-3.4.2-5.cm2.aarch64.rpm -libarchive-debuginfo-3.4.2-5.cm2.aarch64.rpm -libarchive-devel-3.4.2-5.cm2.aarch64.rpm +libarchive-3.6.0-1.cm2.aarch64.rpm +libarchive-debuginfo-3.6.0-1.cm2.aarch64.rpm +libarchive-devel-3.6.0-1.cm2.aarch64.rpm libassuan-2.5.5-2.cm2.aarch64.rpm libassuan-debuginfo-2.5.5-2.cm2.aarch64.rpm libassuan-devel-2.5.5-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index c31b6b5e6c9..6e1d603baea 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -139,9 +139,9 @@ krb5-1.18-4.cm2.x86_64.rpm krb5-debuginfo-1.18-4.cm2.x86_64.rpm krb5-devel-1.18-4.cm2.x86_64.rpm krb5-lang-1.18-4.cm2.x86_64.rpm -libarchive-3.4.2-5.cm2.x86_64.rpm -libarchive-debuginfo-3.4.2-5.cm2.x86_64.rpm -libarchive-devel-3.4.2-5.cm2.x86_64.rpm +libarchive-3.6.0-1.cm2.x86_64.rpm +libarchive-debuginfo-3.6.0-1.cm2.x86_64.rpm +libarchive-devel-3.6.0-1.cm2.x86_64.rpm libassuan-2.5.5-2.cm2.x86_64.rpm libassuan-debuginfo-2.5.5-2.cm2.x86_64.rpm libassuan-devel-2.5.5-2.cm2.x86_64.rpm diff --git a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list index f67a2e97467..618ce57830e 100644 --- a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list +++ b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list @@ -24,7 +24,7 @@ https://www.python.org/ftp/python/3.9.10/Python-3.9.10.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.xz https://zlib.net/zlib-1.2.11.tar.xz https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.bz2 -https://github.com/libarchive/libarchive/releases/download/v3.4.2/libarchive-3.4.2.tar.gz +https://github.com/libarchive/libarchive/releases/download/v3.6.0/libarchive-3.6.0.tar.gz http://www.lua.org/ftp/lua-5.4.3.tar.gz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/rpm-software-management/rpm/archive/rpm-4.17.0-release.tar.gz diff --git a/toolkit/scripts/toolchain/container/toolchain-sha256sums b/toolkit/scripts/toolchain/container/toolchain-sha256sums index f779f865da3..b682f634494 100644 --- a/toolkit/scripts/toolchain/container/toolchain-sha256sums +++ b/toolkit/scripts/toolchain/container/toolchain-sha256sums @@ -27,7 +27,7 @@ fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar. 3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5 groff-1.22.3.tar.gz 9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907 gzip-1.11.tar.xz 58d148df0da4e9c095b8cd1cefac5669c04af700c7c5fa6bc3cc2a97b60a17c3 kernel-5.15.18.1.tar.gz -b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176 libarchive-3.4.2.tar.gz +a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852 libarchive-3.6.0.tar.gz b630b7c484271b3ba867680d6a14b10a86cfa67247a14631b14c06731d5a458b libcap-2.26.tar.xz 0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b libpipeline-1.5.0.tar.gz 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f libtool-2.4.6.tar.xz diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index 2e1f5ab6c33..a1e37e4b0a5 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -1062,14 +1062,14 @@ popd rm -rf cpio-2.13 touch /logs/status_cpio_complete -echo libarchive-3.4.2 -tar xf libarchive-3.4.2.tar.gz -pushd libarchive-3.4.2 +echo libarchive-3.6.0 +tar xf libarchive-3.6.0.tar.gz +pushd libarchive-3.6.0 ./configure --prefix=/usr --disable-static make -j$(nproc) make install popd -rm -rf libarchive-3.4.2 +rm -rf libarchive-3.6.0 touch /logs/status_libarchive_complete echo lua-5.4.3 From 1975575d1e6956e9e0902c03fb737e4b24401fbe Mon Sep 17 00:00:00 2001 From: MaxBrodeurUrbas Date: Tue, 15 Mar 2022 13:55:50 -0700 Subject: [PATCH 2/4] removing patch file --- ...secure-properly-check-if-lchmod-is-s.patch | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 SPECS/libarchive/0001-test_write_disk_secure-properly-check-if-lchmod-is-s.patch diff --git a/SPECS/libarchive/0001-test_write_disk_secure-properly-check-if-lchmod-is-s.patch b/SPECS/libarchive/0001-test_write_disk_secure-properly-check-if-lchmod-is-s.patch deleted file mode 100644 index 43910b084a4..00000000000 --- a/SPECS/libarchive/0001-test_write_disk_secure-properly-check-if-lchmod-is-s.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 56c095bef0a892dbaf18e45efbec2087d6878a54 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Fri, 22 May 2020 11:43:43 +0200 -Subject: [PATCH] test_write_disk_secure: properly check if lchmod() is - supported - -Fixes #1379 - -Backported by mfrw from upstream. - -Signed-off-by: Muhammad Falak Wani ---- - libarchive/test/test_write_disk_secure.c | 33 +++++++++++++++++++++--- - 1 file changed, 29 insertions(+), 4 deletions(-) - -diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c -index 7cd66c41..ff2922a3 100644 ---- a/libarchive/test/test_write_disk_secure.c -+++ b/libarchive/test/test_write_disk_secure.c -@@ -40,6 +40,9 @@ DEFINE_TEST(test_write_disk_secure) - struct archive *a; - struct archive_entry *ae; - struct stat st; -+#if defined(HAVE_LCHMOD) && defined(HAVE_SYMLINK) -+ int working_lchmod; -+#endif - - /* Start with a known umask. */ - assertUmask(UMASK); -@@ -251,10 +254,32 @@ DEFINE_TEST(test_write_disk_secure) - assert(0 == lstat("link_to_dir", &st)); - failure("link_to_dir: st.st_mode=%o", st.st_mode); - assert(S_ISLNK(st.st_mode)); --#if HAVE_LCHMOD -- /* Systems that lack lchmod() can't set symlink perms, so skip this. */ -- failure("link_to_dir: st.st_mode=%o", st.st_mode); -- assert((st.st_mode & 07777) == 0755); -+#if defined(HAVE_SYMLINK) && defined(HAVE_LCHMOD) && \ -+ defined(S_IRUSR) && defined(S_IWUSR) && defined(S_IXUSR) -+ /* Verify if we are able to lchmod() */ -+ if (symlink("dir", "testlink_to_dir") == 0) { -+ if (lchmod("testlink_to_dir", -+ S_IRUSR | S_IWUSR | S_IXUSR) != 0) { -+ switch (errno) { -+ case ENOTSUP: -+ case ENOSYS: -+#if ENOTSUP != EOPNOTSUPP -+ case EOPNOTSUPP: -+#endif -+ working_lchmod = 0; -+ break; -+ default: -+ working_lchmod = 1; -+ } -+ } else -+ working_lchmod = 1; -+ } else -+ working_lchmod = 0; -+ -+ if (working_lchmod) { -+ failure("link_to_dir: st.st_mode=%o", st.st_mode); -+ assert((st.st_mode & 07777) == 0755); -+ } - #endif - - assert(0 == lstat("dir/filea", &st)); --- -2.17.1 - From 451729ef1c1f45bc125ed63d63814977b0f04bc2 Mon Sep 17 00:00:00 2001 From: MaxBrodeurUrbas Date: Tue, 15 Mar 2022 14:05:10 -0700 Subject: [PATCH 3/4] adding missing URL --- SPECS/libarchive/libarchive.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS/libarchive/libarchive.spec b/SPECS/libarchive/libarchive.spec index 463757e2b85..5995090af60 100644 --- a/SPECS/libarchive/libarchive.spec +++ b/SPECS/libarchive/libarchive.spec @@ -6,6 +6,7 @@ Release: 1%{?dist} License: BSD AND Public Domain AND (ASL 2.0 OR CC0 1.0 OR OpenSSL) Vendor: Microsoft Corporation Distribution: Mariner +URL: https://github.com/libarchive/libarchive Source0: https://github.com/libarchive/libarchive/releases/download/v%{version}/%{name}-%{version}.tar.gz Provides: bsdtar = %{version}-%{release} From 080a8874572beab83e4901c66df194401421e045 Mon Sep 17 00:00:00 2001 From: MaxBrodeurUrbas Date: Tue, 15 Mar 2022 14:06:32 -0700 Subject: [PATCH 4/4] fixing URL --- SPECS/libarchive/libarchive.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/libarchive/libarchive.spec b/SPECS/libarchive/libarchive.spec index 5995090af60..97cf44109b2 100644 --- a/SPECS/libarchive/libarchive.spec +++ b/SPECS/libarchive/libarchive.spec @@ -6,7 +6,7 @@ Release: 1%{?dist} License: BSD AND Public Domain AND (ASL 2.0 OR CC0 1.0 OR OpenSSL) Vendor: Microsoft Corporation Distribution: Mariner -URL: https://github.com/libarchive/libarchive +URL: https://www.libarchive.org/ Source0: https://github.com/libarchive/libarchive/releases/download/v%{version}/%{name}-%{version}.tar.gz Provides: bsdtar = %{version}-%{release}