Joslobo/take rpm fix (#8551)

Co-authored-by: Sam Meluch <[email protected]> Co-authored-by: Sam Meluch <[email protected]>
microsoft · Mar 25, 2024 · c891a9e · c891a9e
1 parent 86bbd3b
commit c891a9e
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 36 deletions.
diff --git a/SPECS/rpm/rpm.signatures.json b/SPECS/rpm/rpm.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "rpm-4.18.1.tar.bz2": "37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56"
+  "rpm-4.18.2.tar.bz2": "ba7eee1bc2c6f83be73c0a40d159c625cbaed976b3ac044233404fb25ae1b979"
  }
 }
diff --git a/SPECS/rpm/rpm.spec b/SPECS/rpm/rpm.spec
@@ -1,7 +1,7 @@
 Summary:        Package manager
 Name:           rpm
-Version:        4.18.1
-Release:        4%{?dist}
+Version:        4.18.2
+Release:        1%{?dist}
 License:        GPLv2+ AND LGPLv2+ AND BSD
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -266,6 +266,9 @@ popd
 %{python3_sitelib}/*
 
 %changelog
+* Fri Mar 22 2024 Sam Meluch <[email protected]> - 4.18.2-1
+- Upgrade rpm to version 4.18.2
+
 * Thu Feb 29 2024 Andrew Phelps <[email protected]> - 4.18.1-4
 - Remove python generator scripts, which are now provided by the python-rpm-generators package.
 

diff --git a/cgmanifest.json b/cgmanifest.json
@@ -25514,8 +25514,8 @@
         "type": "other",
         "other": {
           "name": "rpm",
-          "version": "4.18.1",
-          "downloadUrl": "http://ftp.rpm.org/releases/rpm-4.18.x/rpm-4.18.1.tar.bz2"
+          "version": "4.18.2",
+          "downloadUrl": "http://ftp.rpm.org/releases/rpm-4.18.x/rpm-4.18.2.tar.bz2"
         }
       }
     },

diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/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.1-4.azl3.aarch64.rpm
-rpm-build-4.18.1-4.azl3.aarch64.rpm
-rpm-build-libs-4.18.1-4.azl3.aarch64.rpm
-rpm-devel-4.18.1-4.azl3.aarch64.rpm
-rpm-lang-4.18.1-4.azl3.aarch64.rpm
-rpm-libs-4.18.1-4.azl3.aarch64.rpm
+rpm-4.18.2-1.azl3.aarch64.rpm
+rpm-build-4.18.2-1.azl3.aarch64.rpm
+rpm-build-libs-4.18.2-1.azl3.aarch64.rpm
+rpm-devel-4.18.2-1.azl3.aarch64.rpm
+rpm-lang-4.18.2-1.azl3.aarch64.rpm
+rpm-libs-4.18.2-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

diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/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.1-4.azl3.x86_64.rpm
-rpm-build-4.18.1-4.azl3.x86_64.rpm
-rpm-build-libs-4.18.1-4.azl3.x86_64.rpm
-rpm-devel-4.18.1-4.azl3.x86_64.rpm
-rpm-lang-4.18.1-4.azl3.x86_64.rpm
-rpm-libs-4.18.1-4.azl3.x86_64.rpm
+rpm-4.18.2-1.azl3.x86_64.rpm
+rpm-build-4.18.2-1.azl3.x86_64.rpm
+rpm-build-libs-4.18.2-1.azl3.x86_64.rpm
+rpm-devel-4.18.2-1.azl3.x86_64.rpm
+rpm-lang-4.18.2-1.azl3.x86_64.rpm
+rpm-libs-4.18.2-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

diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -543,7 +543,7 @@ python3-newt-0.52.23-1.azl3.aarch64.rpm
 python3-packaging-23.2-2.azl3.noarch.rpm
 python3-pip-24.0-1.azl3.noarch.rpm
 python3-pygments-2.5.2-1.azl3.noarch.rpm
-python3-rpm-4.18.1-4.azl3.aarch64.rpm
+python3-rpm-4.18.2-1.azl3.aarch64.rpm
 python3-rpm-generators-14-11.azl3.noarch.rpm
 python3-setuptools-69.0.3-2.azl3.noarch.rpm
 python3-test-3.12.0-2.azl3.aarch64.rpm
@@ -552,13 +552,13 @@ python3-wheel-0.33.6-7.azl3.noarch.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.1-4.azl3.aarch64.rpm
-rpm-build-4.18.1-4.azl3.aarch64.rpm
-rpm-build-libs-4.18.1-4.azl3.aarch64.rpm
-rpm-debuginfo-4.18.1-4.azl3.aarch64.rpm
-rpm-devel-4.18.1-4.azl3.aarch64.rpm
-rpm-lang-4.18.1-4.azl3.aarch64.rpm
-rpm-libs-4.18.1-4.azl3.aarch64.rpm
+rpm-4.18.2-1.azl3.aarch64.rpm
+rpm-build-4.18.2-1.azl3.aarch64.rpm
+rpm-build-libs-4.18.2-1.azl3.aarch64.rpm
+rpm-debuginfo-4.18.2-1.azl3.aarch64.rpm
+rpm-devel-4.18.2-1.azl3.aarch64.rpm
+rpm-lang-4.18.2-1.azl3.aarch64.rpm
+rpm-libs-4.18.2-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

diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -549,7 +549,7 @@ python3-newt-0.52.23-1.azl3.x86_64.rpm
 python3-packaging-23.2-2.azl3.noarch.rpm
 python3-pip-24.0-1.azl3.noarch.rpm
 python3-pygments-2.5.2-1.azl3.noarch.rpm
-python3-rpm-4.18.1-4.azl3.x86_64.rpm
+python3-rpm-4.18.2-1.azl3.x86_64.rpm
 python3-rpm-generators-14-11.azl3.noarch.rpm
 python3-setuptools-69.0.3-2.azl3.noarch.rpm
 python3-test-3.12.0-2.azl3.x86_64.rpm
@@ -558,13 +558,13 @@ python3-wheel-0.33.6-7.azl3.noarch.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.1-4.azl3.x86_64.rpm
-rpm-build-4.18.1-4.azl3.x86_64.rpm
-rpm-build-libs-4.18.1-4.azl3.x86_64.rpm
-rpm-debuginfo-4.18.1-4.azl3.x86_64.rpm
-rpm-devel-4.18.1-4.azl3.x86_64.rpm
-rpm-lang-4.18.1-4.azl3.x86_64.rpm
-rpm-libs-4.18.1-4.azl3.x86_64.rpm
+rpm-4.18.2-1.azl3.x86_64.rpm
+rpm-build-4.18.2-1.azl3.x86_64.rpm
+rpm-build-libs-4.18.2-1.azl3.x86_64.rpm
+rpm-debuginfo-4.18.2-1.azl3.x86_64.rpm
+rpm-devel-4.18.2-1.azl3.x86_64.rpm
+rpm-lang-4.18.2-1.azl3.x86_64.rpm
+rpm-libs-4.18.2-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

diff --git a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list
@@ -26,7 +26,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
-http://ftp.rpm.org/releases/rpm-4.18.x/rpm-4.18.1.tar.bz2
+http://ftp.rpm.org/releases/rpm-4.18.x/rpm-4.18.2.tar.bz2
 https://www.linuxfromscratch.org/patches/downloads/lua/lua-5.4.6-shared_library-1.patch
 https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz
 https://ftp.gnu.org/gnu/glibc/glibc-2.38.tar.xz

diff --git a/toolkit/scripts/toolchain/container/toolchain-sha256sums b/toolkit/scripts/toolchain/container/toolchain-sha256sums
@@ -50,7 +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
-37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56  rpm-4.18.1.tar.bz2
+ba7eee1bc2c6f83be73c0a40d159c625cbaed976b3ac044233404fb25ae1b979  rpm-4.18.2.tar.bz2
 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181  sed-4.9.tar.xz
 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78  setuptools-69.0.3.tar.gz
 b9cd386e7cd22af6e0d2a0f06d0404951e1bef109e42ea06cc0450e10cd15550  sqlite-autoconf-3440000.tar.gz

diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
@@ -956,7 +956,7 @@ popd
 rm -rf "$DEBUGEDIT_WITH_VERSION"
 touch /logs/status_debugedit_complete
 
-RPM_WITH_VERSION=rpm-4.18.1
+RPM_WITH_VERSION=rpm-4.18.2
 RPM_FOLDER="$RPM_WITH_VERSION"
 echo $RPM_WITH_VERSION
 tar xf "$RPM_WITH_VERSION".tar.bz2