microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

rpm: upgrade to 4.18.1 (#7560)

This commit is contained in:
Andrew Phelps 2024-02-01 12:25:14 -08:00 коммит произвёл GitHub
Родитель b529cdcef8
Коммит 0aa233562a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
10 изменённых файлов: 42 добавлений и 44 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
SPECS/rpm/define-RPM_LD_FLAGS.patch
Просмотреть файл

@ -1,8 +1,8 @@
--- orig-rpm-4.17.0-release/macros.in 2021-09-03 02:41:20.000000000 -0700
+++ fixed-rpm-4.17.0-release/macros.in 2021-12-02 21:35:53.475842878 -0800
@@ -742,10 +742,11 @@
RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
--- rpm-4.18.1/macros.in
+++ rpm-4.18.1/macros.in
@@ -727,10 +727,11 @@ package or when debugging this package.\
RPM_SOURCE_DIR=\"%{_sourcedir}\"\
RPM_BUILD_DIR=\"%{_builddir}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\
+ RPM_LD_FLAGS=\"%{?build_ldflags}\"\
RPM_ARCH=\"%{_arch}\"\

2
SPECS/rpm/rpm.signatures.json
Просмотреть файл

@ -3,6 +3,6 @@
"python.attr": "32eebee98c24edcc9524b4553cf05c0ec6707828fe14f76d250e294568e7091a",
"pythondeps.sh": "1cc7665252eb845c7e4741ff3e832c78f54ffb05552f1cdb2d43d2c0cbf7c07d",
"pythondistdeps.py": "f73f01bb78daa75d25d6581a6da40cf6f946654c5e9d166676036367307186d1",
"rpm-4.18.0.tar.bz2": "2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554"
"rpm-4.18.1.tar.bz2": "37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56"
}
}

7
SPECS/rpm/rpm.spec
Просмотреть файл

@ -1,7 +1,7 @@
Summary: Package manager
Name: rpm
Version: 4.18.0
Release: 4%{?dist}
Version: 4.18.1
Release: 1%{?dist}
License: GPLv2+ AND LGPLv2+ AND BSD
Vendor: Microsoft Corporation
Distribution: Mariner
@ -281,6 +281,9 @@ popd
%{python3_sitelib}/*
%changelog
* Tue Jan 30 2024 Andrew Phelps <anphel@microsoft.com> - 4.18.1-1
- Upgrade to version 4.18.1
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 4.18.0-4
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)

12
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Просмотреть файл

@ -175,12 +175,12 @@ libcap-devel-2.69-1.azl3.aarch64.rpm
debugedit-5.0-2.azl3.aarch64.rpm
libarchive-3.7.1-1.azl3.aarch64.rpm
libarchive-devel-3.7.1-1.azl3.aarch64.rpm
rpm-4.18.0-4.azl3.aarch64.rpm
rpm-build-4.18.0-4.azl3.aarch64.rpm
rpm-build-libs-4.18.0-4.azl3.aarch64.rpm
rpm-devel-4.18.0-4.azl3.aarch64.rpm
rpm-lang-4.18.0-4.azl3.aarch64.rpm
rpm-libs-4.18.0-4.azl3.aarch64.rpm
rpm-4.18.1-1.azl3.aarch64.rpm
rpm-build-4.18.1-1.azl3.aarch64.rpm
rpm-build-libs-4.18.1-1.azl3.aarch64.rpm
rpm-devel-4.18.1-1.azl3.aarch64.rpm
rpm-lang-4.18.1-1.azl3.aarch64.rpm
rpm-libs-4.18.1-1.azl3.aarch64.rpm
cpio-2.14-1.azl3.aarch64.rpm
cpio-lang-2.14-1.azl3.aarch64.rpm
e2fsprogs-libs-1.47.0-1.azl3.aarch64.rpm

12
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Просмотреть файл

@ -175,12 +175,12 @@ libcap-devel-2.69-1.azl3.x86_64.rpm
debugedit-5.0-2.azl3.x86_64.rpm
libarchive-3.7.1-1.azl3.x86_64.rpm
libarchive-devel-3.7.1-1.azl3.x86_64.rpm
rpm-4.18.0-4.azl3.x86_64.rpm
rpm-build-4.18.0-4.azl3.x86_64.rpm
rpm-build-libs-4.18.0-4.azl3.x86_64.rpm
rpm-devel-4.18.0-4.azl3.x86_64.rpm
rpm-lang-4.18.0-4.azl3.x86_64.rpm
rpm-libs-4.18.0-4.azl3.x86_64.rpm
rpm-4.18.1-1.azl3.x86_64.rpm
rpm-build-4.18.1-1.azl3.x86_64.rpm
rpm-build-libs-4.18.1-1.azl3.x86_64.rpm
rpm-devel-4.18.1-1.azl3.x86_64.rpm
rpm-lang-4.18.1-1.azl3.x86_64.rpm
rpm-libs-4.18.1-1.azl3.x86_64.rpm
cpio-2.14-1.azl3.x86_64.rpm
cpio-lang-2.14-1.azl3.x86_64.rpm
e2fsprogs-libs-1.47.0-1.azl3.x86_64.rpm

16
toolkit/resources/manifests/package/toolchain_aarch64.txt
Просмотреть файл

@ -539,20 +539,20 @@ python3-markupsafe-2.1.3-1.azl3.aarch64.rpm
python3-newt-0.52.23-1.azl3.aarch64.rpm
python3-pip-3.9.14-8.azl3.noarch.rpm
python3-pygments-2.5.2-1.azl3.noarch.rpm
python3-rpm-4.18.0-4.azl3.aarch64.rpm
python3-rpm-4.18.1-1.azl3.aarch64.rpm
python3-setuptools-3.9.14-8.azl3.noarch.rpm
python3-test-3.9.14-8.azl3.aarch64.rpm
python3-tools-3.9.14-8.azl3.aarch64.rpm
readline-8.2-1.azl3.aarch64.rpm
readline-debuginfo-8.2-1.azl3.aarch64.rpm
readline-devel-8.2-1.azl3.aarch64.rpm
rpm-4.18.0-4.azl3.aarch64.rpm
rpm-build-4.18.0-4.azl3.aarch64.rpm
rpm-build-libs-4.18.0-4.azl3.aarch64.rpm
rpm-debuginfo-4.18.0-4.azl3.aarch64.rpm
rpm-devel-4.18.0-4.azl3.aarch64.rpm
rpm-lang-4.18.0-4.azl3.aarch64.rpm
rpm-libs-4.18.0-4.azl3.aarch64.rpm
rpm-4.18.1-1.azl3.aarch64.rpm
rpm-build-4.18.1-1.azl3.aarch64.rpm
rpm-build-libs-4.18.1-1.azl3.aarch64.rpm
rpm-debuginfo-4.18.1-1.azl3.aarch64.rpm
rpm-devel-4.18.1-1.azl3.aarch64.rpm
rpm-lang-4.18.1-1.azl3.aarch64.rpm
rpm-libs-4.18.1-1.azl3.aarch64.rpm
sed-4.9-1.azl3.aarch64.rpm
sed-debuginfo-4.9-1.azl3.aarch64.rpm
sed-lang-4.9-1.azl3.aarch64.rpm

16
toolkit/resources/manifests/package/toolchain_x86_64.txt
Просмотреть файл

@ -545,20 +545,20 @@ python3-markupsafe-2.1.3-1.azl3.x86_64.rpm
python3-newt-0.52.23-1.azl3.x86_64.rpm
python3-pip-3.9.14-8.azl3.noarch.rpm
python3-pygments-2.5.2-1.azl3.noarch.rpm
python3-rpm-4.18.0-4.azl3.x86_64.rpm
python3-rpm-4.18.1-1.azl3.x86_64.rpm
python3-setuptools-3.9.14-8.azl3.noarch.rpm
python3-test-3.9.14-8.azl3.x86_64.rpm
python3-tools-3.9.14-8.azl3.x86_64.rpm
readline-8.2-1.azl3.x86_64.rpm
readline-debuginfo-8.2-1.azl3.x86_64.rpm
readline-devel-8.2-1.azl3.x86_64.rpm
rpm-4.18.0-4.azl3.x86_64.rpm
rpm-build-4.18.0-4.azl3.x86_64.rpm
rpm-build-libs-4.18.0-4.azl3.x86_64.rpm
rpm-debuginfo-4.18.0-4.azl3.x86_64.rpm
rpm-devel-4.18.0-4.azl3.x86_64.rpm
rpm-lang-4.18.0-4.azl3.x86_64.rpm
rpm-libs-4.18.0-4.azl3.x86_64.rpm
rpm-4.18.1-1.azl3.x86_64.rpm
rpm-build-4.18.1-1.azl3.x86_64.rpm
rpm-build-libs-4.18.1-1.azl3.x86_64.rpm
rpm-debuginfo-4.18.1-1.azl3.x86_64.rpm
rpm-devel-4.18.1-1.azl3.x86_64.rpm
rpm-lang-4.18.1-1.azl3.x86_64.rpm
rpm-libs-4.18.1-1.azl3.x86_64.rpm
sed-4.9-1.azl3.x86_64.rpm
sed-debuginfo-4.9-1.azl3.x86_64.rpm
sed-lang-4.9-1.azl3.x86_64.rpm

2
toolkit/scripts/toolchain/container/toolchain-remote-wget-list
Просмотреть файл

@ -27,9 +27,7 @@ https://ftp.gnu.org/gnu/cpio/cpio-2.14.tar.bz2
https://github.com/libarchive/libarchive/releases/download/v3.7.1/libarchive-3.7.1.tar.gz
https://www.lua.org/ftp/lua-5.4.6.tar.gz
http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.19.tar.gz
https://github.com/rpm-software-management/rpm/archive/rpm-4.17.0-release.tar.gz
http://ftp.rpm.org/releases/rpm-4.18.x/rpm-4.18.1.tar.bz2
http://ftp.rpm.org/releases/rpm-4.19.x/rpm-4.19.0.tar.bz2
https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/python.attr
https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/pythondeps.sh
https://git.centos.org/rpms/python-rpm-generators/raw/c8s/f/SOURCES/pythondistdeps.py

2
toolkit/scripts/toolchain/container/toolchain-sha256sums
Просмотреть файл

@ -50,9 +50,7 @@ c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9 popt-1.19.tar.
795c34f44df45a0e9b9710c8c71c15c671871524cd412ca14def212e8ccb155d Python-3.12.0.tar.xz
3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz
2d6478185dcce0d8fe6ac02e7872fba8b91429f41627ddfc2e322e5338e36a53 readline-8.2-upstream_fix-1.patch
2d8274d212b859b3ac90b276d462467ae2f8165143ef9f9e7ebfab77b1c7e272 rpm-4.17.0-release.tar.gz
37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 rpm-4.18.1.tar.bz2
b30916dc148cbeab077797e9fc365702931e3a9a7eacf70add84153b549b3f77 rpm-4.19.0.tar.bz2
32eebee98c24edcc9524b4553cf05c0ec6707828fe14f76d250e294568e7091a python.attr
1cc7665252eb845c7e4741ff3e832c78f54ffb05552f1cdb2d43d2c0cbf7c07d pythondeps.sh
f73f01bb78daa75d25d6581a6da40cf6f946654c5e9d166676036367307186d1 pythondistdeps.py

7
toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
Просмотреть файл

@ -933,11 +933,10 @@ popd
rm -rf "$DEBUGEDIT_WITH_VERSION"
touch /logs/status_debugedit_complete
RPM_WITH_VERSION=rpm-4.17.0
RPM_FOLDER="$RPM_WITH_VERSION"-release
RPM_WITH_VERSION=rpm-4.18.1
RPM_FOLDER="$RPM_WITH_VERSION"
echo $RPM_WITH_VERSION
tar xf "$RPM_WITH_VERSION"-release.tar.gz
mv rpm-"$RPM_WITH_VERSION"-release "$RPM_FOLDER"
tar xf "$RPM_WITH_VERSION".tar.bz2
pushd "$RPM_FOLDER"
# Still not in the upstream