Skip to content

[main] upgrading libarchive to v3.6.0 #2515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 19, 2022
Merged

[main] upgrading libarchive to v3.6.0 #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3b15e8
upgrading libarchive to v3.6.0
MaxBrodeurUrbas Mar 15, 2022
1975575
removing patch file
MaxBrodeurUrbas Mar 15, 2022
2b3f4e7
Merge branch 'main' into maxbr/main/libarchive
MaxBrodeurUrbas Mar 15, 2022
451729e
adding missing URL
MaxBrodeurUrbas Mar 15, 2022
080a887
fixing URL
MaxBrodeurUrbas Mar 15, 2022
3622fe6
Merge branch 'maxbr/main/libarchive' of https://github.com/microsoft/…
MaxBrodeurUrbas Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions SPECS/libarchive/0001-test_write_disk_secure-properly-check-if-lchmod-is-s.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion SPECS/libarchive/libarchive.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"libarchive-3.4.2.tar.gz": "b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176"
"libarchive-3.6.0.tar.gz": "a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852"
}
}
9 changes: 6 additions & 3 deletions SPECS/libarchive/libarchive.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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
URL: https://www.libarchive.org/
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
Expand Down Expand Up @@ -60,6 +60,9 @@ make %{?_smp_mflags} check
%{_libdir}/pkgconfig/*.pc

%changelog
* Tue Mar 15 2022 Max Brodeur-Urbas <[email protected]> - 3.6.0-1
- Upgrading to v3.6.0

* Thu Feb 03 2022 Muhammad Falak <[email protected]> - 3.4.2-5
- Backport patch from upstream to fix 'test_write_disk_secure'

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ openssl-static-1.1.1k-11.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
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ openssl-debuginfo-1.1.1k-11.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
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ krb5-1.19.2-1.cm2.aarch64.rpm
krb5-debuginfo-1.19.2-1.cm2.aarch64.rpm
krb5-devel-1.19.2-1.cm2.aarch64.rpm
krb5-lang-1.19.2-1.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
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ krb5-1.19.2-1.cm2.x86_64.rpm
krb5-debuginfo-1.19.2-1.cm2.x86_64.rpm
krb5-devel-1.19.2-1.cm2.x86_64.rpm
krb5-lang-1.19.2-1.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
Expand Down
2 changes: 1 addition & 1 deletion toolkit/scripts/toolchain/container/toolchain-remote-wget-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toolkit/scripts/toolchain/container/toolchain-sha256sums
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2 gmp-6.2.1.tar.
3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5 groff-1.22.3.tar.gz
9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907 gzip-1.11.tar.xz
2cbcede7448516beb64a94220bf1b60937956a433cecd7a0ecb244e1bfeeae21 kernel-5.15.26.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
Expand Down
8 changes: 4 additions & 4 deletions toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,14 +1061,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
Expand Down