Merge pull request #3907 from microsoft/anphel/2.0-pull-rpm-abi-fix

2.0- Ensure rpm-* ABI compatibility

SPECS/rpm/rpm.spec

@@ -1,7 +1,7 @@
 Summary:        Package manager
 Name:           rpm
 Version:        4.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ AND LGPLv2+ AND BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -20,13 +20,15 @@ Patch1:         define-RPM_LD_FLAGS.patch
 Patch2:         fix_RPM_GNUC_DEPRECATED_headers.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  awk
 BuildRequires:  debugedit
 BuildRequires:  elfutils-devel
 BuildRequires:  file-devel
 BuildRequires:  gettext
 BuildRequires:  libarchive-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libselinux-devel
+BuildRequires:  libtool
 BuildRequires:  lua-devel
 BuildRequires:  openssl-devel
 BuildRequires:  popt-devel
@@ -66,6 +68,7 @@ Shared libraries librpm and librpmio
 
 %package build-libs
 Summary:        Librpmbuild.so.* libraries needed to build rpms.
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description build-libs
 %{summary}
@@ -106,7 +109,8 @@ These are the additional language files of rpm.
 %package -n     python3-rpm
 Summary:        Python 3 bindings for rpm.
 Group:          Development/Libraries
-Requires:       %{name}-build-libs
+Requires:       %{name}-build-libs = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 Requires:       python3
 Provides:       %{name}-python3 = %{version}-%{release}
 
@@ -151,7 +155,7 @@ popd
 sed -i 's/@MAJORVER-PROVIDES-VERSIONS@/%{python3_version}/' %{SOURCE3}
 
 # Fix the interpreter path for python replacing the first line
-sed -i '1 s:.*:#!/usr/bin/python3:' %{SOURCE5}
+sed -i '1 s:.*:#!%{_bindir}/python3:' %{SOURCE5}
 
 %check
 make check TESTSUITEFLAGS=-j%{_smp_build_ncpus}
@@ -281,6 +285,9 @@ popd
 %{python3_sitelib}/*
 
 %changelog
+* Fri Sep 30 2022 Andy Caldwell <andycaldwell@microsoft> - 4.18.0-2
+- Create versioned dependencies from `python3-rpm` -> `rpm-build-libs` -> `rpm-libs` to ensure ABI compatibility
+
 * Wed Sep 21 2022 Daniel McIlvaney <[email protected]> - 4.18.0-1
 - Update to 4.18.0 to resolve CVE-2021-35938, CVE-2021-35939, and CVE-2021-3521
 

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -175,12 +175,12 @@ libcap-devel-2.60-1.cm2.aarch64.rpm
 debugedit-5.0-1.cm2.aarch64.rpm
 libarchive-3.6.1-1.cm2.aarch64.rpm
 libarchive-devel-3.6.1-1.cm2.aarch64.rpm
-rpm-4.18.0-1.cm2.aarch64.rpm
-rpm-build-4.18.0-1.cm2.aarch64.rpm
-rpm-build-libs-4.18.0-1.cm2.aarch64.rpm
-rpm-devel-4.18.0-1.cm2.aarch64.rpm
-rpm-lang-4.18.0-1.cm2.aarch64.rpm
-rpm-libs-4.18.0-1.cm2.aarch64.rpm
+rpm-4.18.0-2.cm2.aarch64.rpm
+rpm-build-4.18.0-2.cm2.aarch64.rpm
+rpm-build-libs-4.18.0-2.cm2.aarch64.rpm
+rpm-devel-4.18.0-2.cm2.aarch64.rpm
+rpm-lang-4.18.0-2.cm2.aarch64.rpm
+rpm-libs-4.18.0-2.cm2.aarch64.rpm
 cpio-2.13-4.cm2.aarch64.rpm
 cpio-lang-2.13-4.cm2.aarch64.rpm
 e2fsprogs-libs-1.46.5-3.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -175,12 +175,12 @@ libcap-devel-2.60-1.cm2.x86_64.rpm
 debugedit-5.0-1.cm2.x86_64.rpm
 libarchive-3.6.1-1.cm2.x86_64.rpm
 libarchive-devel-3.6.1-1.cm2.x86_64.rpm
-rpm-4.18.0-1.cm2.x86_64.rpm
-rpm-build-4.18.0-1.cm2.x86_64.rpm
-rpm-build-libs-4.18.0-1.cm2.x86_64.rpm
-rpm-devel-4.18.0-1.cm2.x86_64.rpm
-rpm-lang-4.18.0-1.cm2.x86_64.rpm
-rpm-libs-4.18.0-1.cm2.x86_64.rpm
+rpm-4.18.0-2.cm2.x86_64.rpm
+rpm-build-4.18.0-2.cm2.x86_64.rpm
+rpm-build-libs-4.18.0-2.cm2.x86_64.rpm
+rpm-devel-4.18.0-2.cm2.x86_64.rpm
+rpm-lang-4.18.0-2.cm2.x86_64.rpm
+rpm-libs-4.18.0-2.cm2.x86_64.rpm
 cpio-2.13-4.cm2.x86_64.rpm
 cpio-lang-2.13-4.cm2.x86_64.rpm
 e2fsprogs-libs-1.46.5-3.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -518,20 +518,20 @@ python3-markupsafe-2.1.0-1.cm2.aarch64.rpm
 python3-newt-0.52.21-4.cm2.aarch64.rpm
 python3-pip-3.9.14-1.cm2.noarch.rpm
 python3-pygments-2.4.2-7.cm2.noarch.rpm
-python3-rpm-4.18.0-1.cm2.aarch64.rpm
+python3-rpm-4.18.0-2.cm2.aarch64.rpm
 python3-setuptools-3.9.14-1.cm2.noarch.rpm
 python3-test-3.9.14-1.cm2.aarch64.rpm
 python3-tools-3.9.14-1.cm2.aarch64.rpm
 readline-8.1-1.cm2.aarch64.rpm
 readline-debuginfo-8.1-1.cm2.aarch64.rpm
 readline-devel-8.1-1.cm2.aarch64.rpm
-rpm-4.18.0-1.cm2.aarch64.rpm
-rpm-build-4.18.0-1.cm2.aarch64.rpm
-rpm-build-libs-4.18.0-1.cm2.aarch64.rpm
-rpm-debuginfo-4.18.0-1.cm2.aarch64.rpm
-rpm-devel-4.18.0-1.cm2.aarch64.rpm
-rpm-lang-4.18.0-1.cm2.aarch64.rpm
-rpm-libs-4.18.0-1.cm2.aarch64.rpm
+rpm-4.18.0-2.cm2.aarch64.rpm
+rpm-build-4.18.0-2.cm2.aarch64.rpm
+rpm-build-libs-4.18.0-2.cm2.aarch64.rpm
+rpm-debuginfo-4.18.0-2.cm2.aarch64.rpm
+rpm-devel-4.18.0-2.cm2.aarch64.rpm
+rpm-lang-4.18.0-2.cm2.aarch64.rpm
+rpm-libs-4.18.0-2.cm2.aarch64.rpm
 sed-4.8-2.cm2.aarch64.rpm
 sed-debuginfo-4.8-2.cm2.aarch64.rpm
 sed-lang-4.8-2.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -518,20 +518,20 @@ python3-markupsafe-2.1.0-1.cm2.x86_64.rpm
 python3-newt-0.52.21-4.cm2.x86_64.rpm
 python3-pip-3.9.14-1.cm2.noarch.rpm
 python3-pygments-2.4.2-7.cm2.noarch.rpm
-python3-rpm-4.18.0-1.cm2.x86_64.rpm
+python3-rpm-4.18.0-2.cm2.x86_64.rpm
 python3-setuptools-3.9.14-1.cm2.noarch.rpm
 python3-test-3.9.14-1.cm2.x86_64.rpm
 python3-tools-3.9.14-1.cm2.x86_64.rpm
 readline-8.1-1.cm2.x86_64.rpm
 readline-debuginfo-8.1-1.cm2.x86_64.rpm
 readline-devel-8.1-1.cm2.x86_64.rpm
-rpm-4.18.0-1.cm2.x86_64.rpm
-rpm-build-4.18.0-1.cm2.x86_64.rpm
-rpm-build-libs-4.18.0-1.cm2.x86_64.rpm
-rpm-debuginfo-4.18.0-1.cm2.x86_64.rpm
-rpm-devel-4.18.0-1.cm2.x86_64.rpm
-rpm-lang-4.18.0-1.cm2.x86_64.rpm
-rpm-libs-4.18.0-1.cm2.x86_64.rpm
+rpm-4.18.0-2.cm2.x86_64.rpm
+rpm-build-4.18.0-2.cm2.x86_64.rpm
+rpm-build-libs-4.18.0-2.cm2.x86_64.rpm
+rpm-debuginfo-4.18.0-2.cm2.x86_64.rpm
+rpm-devel-4.18.0-2.cm2.x86_64.rpm
+rpm-lang-4.18.0-2.cm2.x86_64.rpm
+rpm-libs-4.18.0-2.cm2.x86_64.rpm
 sed-4.8-2.cm2.x86_64.rpm
 sed-debuginfo-4.8-2.cm2.x86_64.rpm
 sed-lang-4.8-2.cm2.x86_64.rpm