SOURCES/0001-Add-inital-redhat-build-support.patch

@@ -1,131 +0,0 @@
-From ee6172c4d57103ac857bbd69c46f247cee5394c3 Mon Sep 17 00:00:00 2001
-From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Thu, 6 Oct 2016 12:25:35 +0200
-Subject: Add inital redhat build support
-
-Rebase notes (2.2.32):
-- Fix license text
-
-Rebase notes (2.2.26):
-- update to RHEL 8 build
-- Do not use INSTALED_FILES for %files
-
-Rebase notes (2.2.10):
-- switched to sha256
-- added .gitpublish profile
-
-Rebase notes (2.2.46):
-- added waagent-extn.logrotate
-
-Rebase notes (2.7.0.6):
-- new files - azure.slice and azure-vmextensions.slice
-- removed changes in not shipped scripts
-
-Merged patches (2.2.45):
-- df29beb Switch from platform-python to python36
-- 6749108 Stop packaging legacy waagent2.0
-
-Merged patches (2.2.32):
-- ce36fd9 Use Python3
-- 952c830 Remove FIPS setting from the default config
-- cc9df73 Switch hardcoded python3 shebangs into the %%{__python3} macro
-- 66b6f8c Use correct macro for waagent.service
-- 1b15ada Switch to platform-python in systemd unit file
-- 59f682b Use sys.executable to find system python
-
-Merged patches (2.2.49):
-- 3a23336 Mark logrotate configs with %config(noreplace)
-
-Merged patches (2.3.0.2):
-- 30bb06f9 Provide udev rules as a separate subpackage.
-
-Merged patches (2.7.0.6):
-- a790fb5c Require iptables for setting up persistent firewall rules
----
- .gitignore                                |   1 +
- .gitpublish                               |   8 +
- makepkg.py                                |   2 +-
- redhat/.gitignore                         |   1 +
- redhat/Makefile                           |  72 +++++
- redhat/Makefile.common                    |  37 +++
- redhat/WALinuxAgent.spec.template         | 243 ++++++++++++++++
- redhat/rpmbuild/BUILD/.gitignore          |   2 +
- redhat/rpmbuild/RPMS/.gitignore           |   2 +
- redhat/rpmbuild/SOURCES/.gitignore        |   2 +
- redhat/rpmbuild/SPECS/.gitignore          |   2 +
- redhat/rpmbuild/SRPMS/.gitignore          |   2 +
- redhat/scripts/frh.py                     |  27 ++
- redhat/scripts/git-backport-diff          | 327 ++++++++++++++++++++++
- redhat/scripts/git-compile-check          | 215 ++++++++++++++
- redhat/scripts/process-patches.sh         |  93 ++++++
- redhat/scripts/tarball_checksum.sh        |   3 +
- setup.py                                  |   6 +-
- tests/data/ext/sample_ext-1.3.0/sample.py |   2 +-
- 19 files changed, 1042 insertions(+), 5 deletions(-)
- create mode 100644 .gitpublish
- create mode 100644 redhat/.gitignore
- create mode 100644 redhat/Makefile
- create mode 100644 redhat/Makefile.common
- create mode 100644 redhat/WALinuxAgent.spec.template
- create mode 100644 redhat/rpmbuild/BUILD/.gitignore
- create mode 100644 redhat/rpmbuild/RPMS/.gitignore
- create mode 100644 redhat/rpmbuild/SOURCES/.gitignore
- create mode 100644 redhat/rpmbuild/SPECS/.gitignore
- create mode 100644 redhat/rpmbuild/SRPMS/.gitignore
- create mode 100755 redhat/scripts/frh.py
- create mode 100755 redhat/scripts/git-backport-diff
- create mode 100755 redhat/scripts/git-compile-check
- create mode 100755 redhat/scripts/process-patches.sh
- create mode 100755 redhat/scripts/tarball_checksum.sh
-
-diff --git a/makepkg.py b/makepkg.py
-index 11e90b95..1b6b4351 100755
---- a/makepkg.py
-+++ b/makepkg.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import glob
- import os
-diff --git a/setup.py b/setup.py
-index 12c9e1d6..586bb5ca 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Microsoft Azure Linux Agent setup.py
- #
-@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
-     agent_bin_path = osutil.get_agent_bin_path()
- 
-     if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'):  # pylint: disable=R1714
--        if version.startswith("8.2"):
-+        if version.startswith("8"):
-             # redhat8+ default to py3
-             set_bin_files(data_files, dest=agent_bin_path,
-                           src=["bin/py3/waagent", "bin/waagent2.0"])
-@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
-         set_conf_files(data_files)
-         set_logrotate_files(data_files)
-         set_udev_files(data_files)
--        if version.startswith("8.2"):
-+        if version.startswith("8"):
-             # redhat 8+ uses systemd and python3
-             set_systemd_files(data_files, dest=systemd_dir_path,
-                               src=["init/redhat/waagent.service",
-diff --git a/tests/data/ext/sample_ext-1.3.0/sample.py b/tests/data/ext/sample_ext-1.3.0/sample.py
-index 47f86af8..92585ed3 100755
---- a/tests/data/ext/sample_ext-1.3.0/sample.py
-+++ b/tests/data/ext/sample_ext-1.3.0/sample.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- import json
- import os
- import re
--- 
-2.31.1
-

SOURCES/0001-Initial-redhat-build-configuation.patch

@@ -0,0 +1,75 @@
+From 9d071a9b4b40f0f86bb0b739b72c0b9b4870f060 Mon Sep 17 00:00:00 2001
+From: Miroslav Rezanina <mrezanin@redhat.com>
+Date: Fri, 14 May 2021 09:42:08 +0200
+Subject: Initial redhat build configuation.
+
+Using .distro repository to hold redhat tools and configuration.
+
+Package can be built on brew using rh-rhel-koji command.
+
+Note: Old rh-brew target is supported.
+
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+Merged patches (2.7.0.6):
+- 896c5c83 Require iptables package
+- a702a0d1 (origin/rhel-9.0.0-beta) source-git: Use dynamic SRPM_NAME
+---
+ .distro/Makefile                     |  73 ++++++
+ .distro/Makefile.common              |  18 ++
+ .distro/WALinuxAgent.spec.template   | 254 +++++++++++++++++++++
+ .distro/module-setup.sh              |  16 ++
+ .distro/rpmbuild/BUILD/.gitignore    |   2 +
+ .distro/rpmbuild/RPMS/.gitignore     |   2 +
+ .distro/rpmbuild/SOURCES/.gitignore  |   2 +
+ .distro/rpmbuild/SPECS/.gitignore    |   2 +
+ .distro/rpmbuild/SRPMS/.gitignore    |   2 +
+ .distro/scripts/extract_build_cmd.py |  83 +++++++
+ .distro/scripts/frh.py               |  24 ++
+ .distro/scripts/git-backport-diff    | 327 +++++++++++++++++++++++++++
+ .distro/scripts/git-compile-check    | 215 ++++++++++++++++++
+ .distro/scripts/process-patches.sh   |  92 ++++++++
+ .distro/scripts/tarball_checksum.sh  |   3 +
+ setup.py                             |   4 +-
+ 16 files changed, 1117 insertions(+), 2 deletions(-)
+ create mode 100644 .distro/Makefile
+ create mode 100644 .distro/Makefile.common
+ create mode 100644 .distro/WALinuxAgent.spec.template
+ create mode 100644 .distro/module-setup.sh
+ create mode 100644 .distro/rpmbuild/BUILD/.gitignore
+ create mode 100644 .distro/rpmbuild/RPMS/.gitignore
+ create mode 100644 .distro/rpmbuild/SOURCES/.gitignore
+ create mode 100644 .distro/rpmbuild/SPECS/.gitignore
+ create mode 100644 .distro/rpmbuild/SRPMS/.gitignore
+ create mode 100755 .distro/scripts/extract_build_cmd.py
+ create mode 100755 .distro/scripts/frh.py
+ create mode 100755 .distro/scripts/git-backport-diff
+ create mode 100755 .distro/scripts/git-compile-check
+ create mode 100755 .distro/scripts/process-patches.sh
+ create mode 100755 .distro/scripts/tarball_checksum.sh
+
+diff --git a/setup.py b/setup.py
+index 12c9e1d6..e4d7cf7e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
+     agent_bin_path = osutil.get_agent_bin_path()
+ 
+     if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'):  # pylint: disable=R1714
+-        if version.startswith("8.2"):
++        if version.startswith("9"):
+             # redhat8+ default to py3
+             set_bin_files(data_files, dest=agent_bin_path,
+                           src=["bin/py3/waagent", "bin/waagent2.0"])
+@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
+         set_conf_files(data_files)
+         set_logrotate_files(data_files)
+         set_udev_files(data_files)
+-        if version.startswith("8.2"):
++        if version.startswith("9"):
+             # redhat 8+ uses systemd and python3
+             set_systemd_files(data_files, dest=systemd_dir_path,
+                               src=["init/redhat/waagent.service",
+-- 
+2.31.1
+

SOURCES/0002-Implement-restart_if-for-RedHat-OS.patch

@@ -1,4 +1,4 @@
-From 0a9c628d9edd67af7b6f20d034be85c1c552a512 Mon Sep 17 00:00:00 2001
+From 8538516744130409f96b3ec956ff5ec1b1c1be11 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Tue, 24 May 2022 04:10:46 -0400
 Subject: Implement restart_if for RedHat OS

SOURCES/90-tpm2-import.rules

@@ -0,0 +1 @@
+SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/usr/sbin/tpm2-luks-import.sh /dev/$name"

SOURCES/WALinuxAgent-2.3-almalinux_support.patch

@@ -0,0 +1,101 @@
+From 958d73ebc8c196dd30e9768d3e9cf1bdb6d32e25 Mon Sep 17 00:00:00 2001
+From: Aleksandr Kravchenko <akravchenko@cloudlinux.com>
+Date: Thu, 1 Apr 2021 17:19:08 +0300
+Subject: [PATCH 1/3] added AlmaLinux
+
+---
+ azurelinuxagent/common/osutil/factory.py | 2 +-
+ azurelinuxagent/pa/rdma/factory.py       | 2 +-
+ setup.py                                 | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py
+index b212c38253..4a09544c4d 100644
+--- a/azurelinuxagent/common/osutil/factory.py
++++ b/azurelinuxagent/common/osutil/factory.py
+@@ -98,7 +98,7 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
+ 
+         return DebianOSBaseUtil()
+ 
+-    if distro_name in ("redhat", "rhel", "centos", "oracle"):
++    if distro_name in ("redhat", "rhel", "centos", "oracle", "almalinux"):
+         if Version(distro_version) < Version("7"):
+             return Redhat6xOSUtil()
+ 
+diff --git a/azurelinuxagent/pa/rdma/factory.py b/azurelinuxagent/pa/rdma/factory.py
+index d86d8b8f49..e19f2fe918 100644
+--- a/azurelinuxagent/pa/rdma/factory.py
++++ b/azurelinuxagent/pa/rdma/factory.py
+@@ -38,7 +38,7 @@ def get_rdma_handler(
+     ):
+         return SUSERDMAHandler()
+ 
+-    if distro_full_name == 'CentOS Linux' or distro_full_name == 'CentOS' or distro_full_name == 'Red Hat Enterprise Linux Server':
++    if distro_full_name == 'CentOS Linux' or distro_full_name == 'CentOS' or distro_full_name == 'Red Hat Enterprise Linux Server' or distro_full_name == 'AlmaLinux':
+         return CentOSRDMAHandler(distro_version)
+ 
+     if distro_full_name == 'Ubuntu':
+diff --git a/setup.py b/setup.py
+index c258e4b878..8ebdde5e50 100755
+--- a/setup.py
++++ b/setup.py
+@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
+     agent_bin_path = osutil.get_agent_bin_path()
+ 
+     set_bin_files(data_files, dest=agent_bin_path)
+-    if name == 'redhat' or name == 'centos':  # pylint: disable=R1714
++    if name == 'redhat' or name == 'centos' or name == 'almalinux':  # pylint: disable=R1714
+         set_conf_files(data_files)
+         set_logrotate_files(data_files)
+         set_udev_files(data_files)
+
+From 74e3b01b6be8014c4da92c30d8ac7464cb2d381e Mon Sep 17 00:00:00 2001
+From: Aleksandr Kravchenko <akravchenko@cloudlinux.com>
+Date: Fri, 2 Apr 2021 16:06:56 +0300
+Subject: [PATCH 2/3] added test for AlmaLinux
+
+---
+ tests/common/osutil/test_factory.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tests/common/osutil/test_factory.py b/tests/common/osutil/test_factory.py
+index f7d46b21a4..4ab234131b 100644
+--- a/tests/common/osutil/test_factory.py
++++ b/tests/common/osutil/test_factory.py
+@@ -237,6 +237,13 @@ def test_get_osutil_it_should_return_redhat(self):
+         self.assertTrue(isinstance(ret, RedhatOSUtil))
+         self.assertEqual(ret.get_service_name(), "waagent")
+ 
++        ret = _get_osutil(distro_name="almalinux",
++                          distro_code_name="",
++                          distro_full_name="",
++                          distro_version="8")
++        self.assertTrue(isinstance(ret, RedhatOSUtil))
++        self.assertEqual(ret.get_service_name(), "waagent")
++
+     def test_get_osutil_it_should_return_euleros(self):
+         ret = _get_osutil(distro_name="euleros",
+                           distro_code_name="",
+
+From c9eb420d4a6ce69d2c668deef273a446e73fe2d0 Mon Sep 17 00:00:00 2001
+From: Aleksandr Kravchenko <akravchenko@cloudlinux.com>
+Date: Thu, 20 May 2021 13:48:17 +0300
+Subject: [PATCH 3/3] improved
+
+---
+ azurelinuxagent/pa/rdma/factory.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/azurelinuxagent/pa/rdma/factory.py b/azurelinuxagent/pa/rdma/factory.py
+index e19f2fe918..c6d808117b 100644
+--- a/azurelinuxagent/pa/rdma/factory.py
++++ b/azurelinuxagent/pa/rdma/factory.py
+@@ -38,7 +38,7 @@ def get_rdma_handler(
+     ):
+         return SUSERDMAHandler()
+ 
+-    if distro_full_name == 'CentOS Linux' or distro_full_name == 'CentOS' or distro_full_name == 'Red Hat Enterprise Linux Server' or distro_full_name == 'AlmaLinux':
++    if distro_full_name in ('CentOS Linux', 'CentOS', 'Red Hat Enterprise Linux Server', 'AlmaLinux'):
+         return CentOSRDMAHandler(distro_version)
+ 
+     if distro_full_name == 'Ubuntu':

SOURCES/module-setup-cvm.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/bash
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+check() {
+    return 0
+}
+
+depends() {
+    echo tpm2-tss
+    return 0
+}
+
+install() {
+    inst_multiple -o \
+        cryptsetup cut mktemp base64 uname hexdump \
+        tpm2_flushcontext tpm2_import tpm2_load tpm2_unseal tpm2_create tpm2_createprimary \
+        /usr/sbin/tpm2-luks-import.sh /lib/udev/rules.d/90-tpm2-import.rules
+}

SOURCES/module-setup-udev.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/bash
+
+# called by dracut
+check() {
+    return 0
+}
+
+# called by dracut
+depends() {
+    return 0
+}
+
+# called by dracut
+install() {
+    inst_multiple cut readlink chmod
+    inst_rules 66-azure-storage.rules 99-azure-product-uuid.rules
+}

SOURCES/tpm2-luks-import.sh

@@ -0,0 +1,74 @@
+#! /bin/bash -e
+#
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This script goes through all 'tpm2-import' tokens and converts them
+# to 'systemd-tpm2' ones.
+#
+
+getval () {
+    grep ^\"$2\" $1 | cut -f 2 -d ':' | sed 's/\"//g'
+}
+
+if [[ ! -b "$1" ]]; then
+    echo "Device $1 does not exist!" 1>&2
+    exit 1
+fi
+
+/usr/sbin/cryptsetup luksDump "$1" | sed -n '/^Tokens:/,/^Digests:/p' | grep ' tpm2-import' | cut -d ':' -f 1 | while read tokenid; do
+    echo "Importing token $tokenid from $1"
+    token=`mktemp`
+    /usr/sbin/cryptsetup token export --token-id "$tokenid" "$1" | sed -e 's/[{}]/''/g' -e 's/\[//g' -e 's/\]//g' -e 's/,\"/\n"/g' > "$token"
+    tempdir=`mktemp -d`
+    pushd "$tempdir" > /dev/null
+    # Save token data to inidividual files to process them with tpm2-tools
+    getval "$token" "parent_pub" | base64 -d > parent.pub
+    getval "$token" "parent_prv" | base64 -d > parent.prv
+    getval "$token" "parent_seed" | base64 -d > parent.seed
+    getval "$token" "seal_pub" | base64 -d > seal.pub
+    getval "$token" "seal_prv" | base64 -d > seal.prv
+    getval "$token" "pcrpolicy_dat" | base64 -d > pcrpolicy.dat
+    if [ ! -z `getval "$token" "unique_dat"` ]; then
+        getval "$token" "unique_dat" | base64 -d > unique.dat
+    fi
+    echo "Unsealing volume key"
+    # Import sealed object
+    tpm2_flushcontext -t
+    if [ ! -f "unique.dat" ]; then
+        tpm2_createprimary -Q -C o -a 'restricted|decrypt|fixedtpm|fixedparent|sensitivedataorigin|userwithauth|noda' -g sha256 -G rsa -c primary.ctx
+    else
+        tpm2_createprimary -Q -C o -a 'restricted|decrypt|fixedtpm|fixedparent|sensitivedataorigin|userwithauth|noda' -g sha256 -G rsa -u unique.dat -c primary.ctx
+    fi
+    tpm2_flushcontext -t
+    tpm2_import -Q -C primary.ctx -u parent.pub -i parent.prv -r parent_imported.prv -s parent.seed
+    tpm2_flushcontext -t
+    tpm2_load -Q -C primary.ctx -u parent.pub -r parent_imported.prv -c parent.ctx
+    tpm2_flushcontext -t
+    tpm2_load -Q -C parent.ctx -u seal.pub -r seal.prv -c seal.ctx
+    tpm2_flushcontext -t
+    tpm2_unseal -Q -c seal.ctx -p pcr:`getval "$token" tpm2-pcr-bank`:`getval "$token" tpm2-pcrs` > volume_key
+    tpm2_flushcontext -t
+    echo "Sealing new volume key"
+    # Create a new sealed object under primary ECC key
+    tpm2_createprimary -Q -C o -g sha256 -G ecc:null:aes128cfb -c primary_ecc.ctx
+    tpm2_flushcontext -t
+    tpm2_create -Q -u seal_local.pub -r seal_local.prv -C primary_ecc.ctx -L pcrpolicy.dat -i volume_key
+    # Create a new systemd-tpm2 compatible token
+    echo "Adding new LUKS token to $1"
+    echo '{"type":"systemd-tpm2","keyslots":["'`getval "$token" keyslots`'"],
+           "tpm2-blob":"'`cat seal_local.prv seal_local.pub | base64 -w0`'",
+	   "tpm2-pcrs":['`getval "$token" tpm2-pcrs`'],
+           "tpm2-pcr-bank":"'`getval "$token" tpm2-pcr-bank`'",
+	   "tpm2-primary-alg":"ecc",
+	   "tpm2-policy-hash":"'`hexdump -ve '1/1 "%.2x"' pcrpolicy.dat`'",
+	   "tpm2-pin": false,
+	   "kversion": "'`uname -r`'"}' | /usr/sbin/cryptsetup token import "$1"
+    # Remove tpm2-import token now
+    echo "Removing now-unneeded token $tokenid from $1"
+    /usr/sbin/cryptsetup token remove --token-id "$tokenid" "$1"
+    echo "Importing token $tokenid from $1 finished successfully"
+    popd > /dev/null
+    # Cleanup
+    rm -rf "$tempdir"
+    rm -f "$token"
+done

SOURCES/wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch

@@ -1,17 +1,16 @@
-From 97728b1371d39f5ddd31004db0ba87b268308c5d Mon Sep 17 00:00:00 2001
+From 1671c696f3b0f51e3e317b50aabc5dc84be4ca01 Mon Sep 17 00:00:00 2001
 From: Mohammed Gamal <mgamal@redhat.com>
-Date: Wed, 3 Aug 2022 13:39:56 +0200
+Date: Wed, 3 Aug 2022 13:23:19 +0200
 Subject: [PATCH 2/2] Update Log Collector default in Comments and Readme
  (#2608)
 
 RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-MergeRequest: 9: Update Log Collector default in Comments and Readme
-RH-Commit: [1/1] ff82c0e933649ccd06d3cc48753324cddef2c56a
-RH-Bugzilla: 2114824
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-MergeRequest: 4: Update Log Collector default in Comments and Readme
+RH-Commit: [1/1] 2f249d80b7136a0e3dbacb34a75c56454b95b8c2
+RH-Bugzilla: 2093965
 RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
 
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114824
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2093965
 
 (cherry picked from commit a560872bec103523e73ddcb5fb5705896545ffce)
 

SOURCES/wla-Use-platform-python-in-waagent.service.patch

@@ -1,45 +0,0 @@
-From 85638d1238ba9ab0c77138133ab1b7c7069e3821 Mon Sep 17 00:00:00 2001
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Tue, 21 Feb 2023 10:29:52 +0100
-Subject: [PATCH 2/2] Use platform-python in waagent.service
-
-RH-Author: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-MergeRequest: 16: Use platform-python in waagent.service
-RH-Bugzilla: 2170104
-RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Commit: [2/2] e548a4d37bd89e6e2eb471b5193b76f1f9f9529b
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2170104
-Upstream: RHEL only
-
-WALinuxAgent in RHEL8 uses platform-python, which is python3.6.
-'waagent.service', however, overrides this by calling
-'/usr/bin/python3' directly and in case this point to a newer
-AppStream Python (e.g. Python3.9) WALinuxAgent breaks as it can't
-find its files.
-
-See also: https://github.com/Azure/WALinuxAgent/issues/2728
-See also: https://github.com/Azure/WALinuxAgent/pull/2729
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
----
- init/redhat/waagent.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service
-index dc11fbb1..29056395 100644
---- a/init/redhat/waagent.service
-+++ b/init/redhat/waagent.service
-@@ -8,7 +8,7 @@ ConditionPathExists=/etc/waagent.conf
- 
- [Service]
- Type=simple
--ExecStart=/usr/bin/python3 -u /usr/sbin/waagent -daemon
-+ExecStart=/usr/sbin/waagent -daemon
- Restart=always
- RestartSec=5
- Slice=azure.slice
--- 
-2.37.3
-

SOURCES/wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch

@@ -1,16 +1,16 @@
-From ac21739b94266387360a7ba2b3cfeb44c3df5b01 Mon Sep 17 00:00:00 2001
+From 6d452b28383c59a8193595daaca13fa8db9338a1 Mon Sep 17 00:00:00 2001
 From: Mohammed Gamal <mgamal@redhat.com>
 Date: Wed, 22 Jun 2022 13:36:07 +0200
 Subject: [PATCH] redhat: Fix command sequence for restarting net interface
 
 RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-MergeRequest: 4: redhat: Fix command sequence for restarting net interface
-RH-Commit: [1/1] ac14220635c30b3361399ae33a5ecd4e7d8cf92b
-RH-Bugzilla: 2080826
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-MergeRequest: 2: redhat: Fix command sequence for restarting net interface
+RH-Commit: [1/1] e838ff196b8823f64e08247b3a4dac9d60e5ed72
+RH-Bugzilla: 2098233
 RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
 
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2080826
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2098233
 
 Apparently the down and up commands need to be run in the same command, so
 connect them together with "&&" operator. Also re-implement restart_if ot handle
@@ -53,5 +53,5 @@ index a02647cd..5c397ae8 100644
 +            else:
 +                logger.warn("exceeded restart retries")
 -- 
-2.35.3
+2.31.1
 

SOURCES/wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch

@@ -1,17 +1,17 @@
-From f45dc73365999334e680d64c90d36f710a0c7831 Mon Sep 17 00:00:00 2001
+From b85814d5683c7f8a1e1b5f3570bcce0a8f76137b Mon Sep 17 00:00:00 2001
 From: Mohammed Gamal <mgamal@redhat.com>
 Date: Fri, 29 Jul 2022 13:07:13 +0200
 Subject: [PATCH 1/2] redhat: Use NetworkManager to set DHCP hostnames on
  recent RHEL distros
 
 RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
-RH-MergeRequest: 8: redhat: Use NetworkManager to set DHCP hostnames on recent RHEL distros
-RH-Commit: [1/1] b83612e9d88bac7117541d7f7832f65ef268bbe3
-RH-Bugzilla: 2092002
+RH-MergeRequest: 3: redhat: Use NetworkManager to set DHCP hostnames on recent RHEL distros
+RH-Commit: [1/1] 2bf51293796ba0e8567e436836adc0547f062b04
+RH-Bugzilla: 2114830
 RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
 RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
 
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2092002
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114830
 
 Recent versions of RHEL 8 and RHEL 9 started using NetworkManager to configure
 network intefaces instead of sysconfig files. Configurations are no longer

SPECS/WALinuxAgent.spec

@@ -1,35 +1,48 @@
-Summary: Microsoft Azure Linux Agent
+%global with_legacy 0
+%global dracut_modname_udev 97walinuxagent
+%global dracut_modname_cvm 97walinuxagentcvm
+
 Name:           WALinuxAgent
 Version:        2.7.0.6
-Release: 8%{?dist}
+Release:        9%{?dist}.alma
+Summary:        The Microsoft Azure Linux Agent
 
 License:        ASL 2.0
-Group: Development/Libraries
-Url: https://github.com/Azure/WALinuxAgent
-Source0: v2.7.0.6.tar.gz
+URL:            https://github.com/Azure/%{name}
+Source0:        https://github.com/Azure/%{name}/archive/v%{version}.tar.gz
+Source1:        module-setup-udev.sh
+Source2:        module-setup-cvm.sh
+Source3:        90-tpm2-import.rules
+Source4:        tpm2-luks-import.sh
+
+# Python3.9 fixes
+Patch0001: 0001-Initial-redhat-build-configuation.patch
+Patch0002: 0002-Implement-restart_if-for-RedHat-OS.patch
+# For bz#2098233 - [Azure][WALA][RHEL-9] [9.1] walinuxagent kills network during boot
+Patch3: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
+# For bz#2114830 - [Azure][WALA][RHEL-9.1] Provisioning failed if no ifcfg-eth0
+Patch4: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
+# For bz#2093965 - [Azure][WALA][RHEL-9] The description of "Logs.Collect" is incorrect
+Patch5: wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch
+
+# Source-git patches
+# AlmaLinux
+Patch1000: WALinuxAgent-2.3-almalinux_support.patch
 
 BuildArch:      noarch
-Patch0001: 0001-Add-inital-redhat-build-support.patch
-Patch0002: 0002-Implement-restart_if-for-RedHat-OS.patch
-# For bz#2080826 - [Azure][WALA][RHEL-8] [8.7] walinuxagent kills network during boot
-Patch0003: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
-# For bz#2092002 - [Azure][WALA][RHEL-8.7] Provisioning failed if no ifcfg-eth0
-Patch4: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
-# For bz#2114824 - [Azure][WALA][RHEL-8.7] The description of "Logs.Collect" is incorrect
-Patch5: wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch
-# For bz#2170104 - [Azure][WALA][RHEL-8] systemd service should not use python3
-Patch6: wla-Use-platform-python-in-waagent.service.patch
 
-# rhel requirements
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-distro
 Requires:       %name-udev = %version-%release
+%if 0%{?fedora}
+Requires:       ntfsprogs
+%endif
 Requires:       openssh
 Requires:       openssh-server
 Requires:       openssl
 Requires:       parted
 Requires:       python3-pyasn1
-Requires:       python36
 Requires:       iptables
 
 BuildRequires:   systemd
@@ -38,9 +51,20 @@ Requires(preun): systemd
 Requires(postun): systemd
 
 %description
-The Azure Linux Agent supports the provisioning and running of Linux
-VMs in the Azure cloud. This package should be installed on Linux disk
-images that are built to run in the Azure environment.
+The Microsoft Azure Linux Agent supports the provisioning and running of Linux
+VMs in the Microsoft Azure cloud. This package should be installed on Linux disk
+images that are built to run in the Microsoft Azure environment.
+
+%if 0%{?with_legacy}
+%package legacy
+Summary:        The Microsoft Azure Linux Agent (legacy)
+Requires:	%name = %version-%release
+Requires:	python2
+Requires:	net-tools
+
+%description legacy
+The Microsoft Azure Linux Agent supporting old version of extensions.
+%endif
 
 %package udev
 Summary:        Udev rules for Microsoft Azure
@@ -48,28 +72,54 @@ Summary:        Udev rules for Microsoft Azure
 %description udev
 Udev rules specific to Microsoft Azure Virtual Machines.
 
+%package cvm
+Summary:        Microsoft Azure CVM specific tools
+Requires: tpm2-tools
+Requires: cryptsetup
+
+%description cvm
+Scripts and udev rules specific to Microsoft Azure Confidential Virtual Machines.
+
 %prep
 %setup -q
+%autopatch -p1
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1000 -p1
 
 %build
 %py3_build
 
 %install
-%{__python3} setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
-rm -f %{buildroot}%{_sbindir}/waagent2.0
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --lnx-distro redhat
+
+mkdir -p -m 0700 %{buildroot}%{_sharedstatedir}/waagent
+mkdir -p %{buildroot}%{_localstatedir}/log
+touch %{buildroot}%{_localstatedir}/log/waagent.log
 
 mkdir -p %{buildroot}%{_udevrulesdir}
 mv %{buildroot}%{_sysconfdir}/udev/rules.d/*.rules %{buildroot}%{_udevrulesdir}/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}/%{python3_sitelib}/tests
+rm -rf %{buildroot}/%{python3_sitelib}/__main__.py
+rm -rf %{buildroot}/%{python3_sitelib}/__pycache__/__main__*.py*
+
+%if 0%{?with_legacy}
+sed -i 's,#!/usr/bin/env python,#!/usr/bin/python2,' %{buildroot}%{_sbindir}/waagent2.0
+%else
+rm -f %{buildroot}%{_sbindir}/waagent2.0
+%endif
+
+mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+mkdir -p %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname_udev}
+cp %{SOURCE1} %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname_udev}/module-setup.sh
+chmod 0755 %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname_udev}/module-setup.sh
+
+mkdir -p %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname_cvm}
+cp %{SOURCE2} %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname_cvm}/module-setup.sh
+chmod 0755 %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname_cvm}/module-setup.sh
+install -m0644 -D -t %{buildroot}%{_udevrulesdir}/ %{SOURCE3}
+install -m0755 -D -t %{buildroot}%{_sbindir} %{SOURCE4}
 
 %post
 %systemd_post waagent.service
@@ -82,220 +132,214 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf %{_unitdir}/waagent.service.d/
 
 %files
-%defattr(-,root,root)
-%{python3_sitelib}/*
-%config(noreplace) %{_sysconfdir}/waagent.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/waagent.logrotate
+%doc LICENSE.txt NOTICE README.md
+%ghost %{_localstatedir}/log/waagent.log
+%ghost %{_unitdir}/waagent-network-setup.service
+%dir %attr(0700, root, root) %{_sharedstatedir}/waagent
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sbindir}/waagent
+%config(noreplace) %{_sysconfdir}/waagent.conf
 %{_unitdir}/waagent.service
 %{_unitdir}/azure.slice
 %{_unitdir}/azure-vmextensions.slice
-%ghost %{_unitdir}/waagent-network-setup.service
+%{python3_sitelib}/azurelinuxagent
+%{python3_sitelib}/*.egg-info
 
 %files udev
-%{_udevrulesdir}/*.rules
+%{_udevrulesdir}/66-azure-storage.rules
+%{_udevrulesdir}/99-azure-product-uuid.rules
+%dir %{_prefix}/lib/dracut/modules.d/%{dracut_modname_udev}
+%{_prefix}/lib/dracut/modules.d/%{dracut_modname_udev}/*.sh
+
+%files cvm
+%{_sbindir}/tpm2-luks-import.sh
+%{_udevrulesdir}/90-tpm2-import.rules
+%dir %{_prefix}/lib/dracut/modules.d/%{dracut_modname_cvm}
+%{_prefix}/lib/dracut/modules.d/%{dracut_modname_cvm}/*.sh
+
+%if 0%{?with_legacy}
+%files legacy
+%{_sbindir}/waagent2.0
+%endif
 
 %changelog
-* Mon Mar 06 2023 Jon Maloy <jmaloy@redhat.com> - 2.7.0.6-8.el8_8
-- wla-redhat-Fix-frh.py-to-not-skip-valid-patches-to-init-.patch [bz#2170104]
-- wla-Use-platform-python-in-waagent.service.patch [bz#2170104]
-- Resolves: bz#2170104
-  ([Azure][WALA][RHEL-8] systemd service should not use python3)
+* Wed Mar 29 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.7.0.6-9.alma
+- Add AlmaLinux support
 
-* Mon Mar 06 2023 Jon Maloy <jmaloy@redhat.com> - 2.7.0.6-7.el8_8
-- wla-redhat-Fix-frh.py-to-not-skip-valid-patches-to-init-.patch [bz#2170104]
-- wla-Use-platform-python-in-waagent.service.patch [bz#2170104]
-- Resolves: bz#2170104
-  ([Azure][WALA][RHEL-8] systemd service should not use python3)
+* Wed Feb 08 2023 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-9
+- wla-redhat-Adjust-tpm2_createprimary-key-attributes-to-m.patch [bz#2167322]
+- Resolves: bz#2167322
+  (Adjust TPM primary key creation parameters to match Azure)
+
+* Mon Feb 06 2023 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-8
+- wla-redhat-Explicitly-list-udev-rule-requirements-in-the.patch [bz#2165042]
+- Resolves: bz#2165042
+  ([9.0.z] /dev/disk/azure/ is created as symlink to sr0 or sda and not as a directory[Azure])
+
+* Mon Jan 23 2023 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-7
+- wla-redhat-Azure-CVM-specific-udev-rules.patch [bz#2162668]
+- Resolves: bz#2162668
+  (Add support for importing remotely sealed TPM2 objects)
 
 * Mon Aug 29 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-6
-- wla-redhat-Remove-files-inside-WALA-services-directory.patch [bz#2114742]
-- Resolves: bz#2114742
-  ([Azure][WALA][RHEL-8] When remove package some files left)
+- wla-redhat-Remove-files-inside-WALA-services-directory.patch [bz#2114768]
+- Resolves: bz#2114768
+  ([Azure][WALA][RHEL-9] When remove package some files left)
 
 * Tue Aug 23 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-5
-- wla-redhat-Mark-directories-properly-in-the-files-list.patch [bz#2114742]
-- Resolves: bz#2114742
-  ([Azure][WALA][RHEL-8] When remove package some files left)
+- wla-redhat-Mark-directories-properly-in-the-files-list.patch [bz#2114768]
+- Resolves: bz#2114768
+  ([Azure][WALA][RHEL-9] When remove package some files left)
+* Wed Aug 17 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-4
+- wla-redhat-Remove-all-waagent-unit-files-when-uninstalli.patch [bz#2114768]
+- Resolves: bz#2114768
+  ([Azure][WALA][RHEL-9] When remove package some files left)
 
-* Wed Aug 17 2022 Jon Maloy <jmaloy@redhat.com> - 2.7.0.6-4
-- wla-redhat-Remove-all-waagent-unit-files-when-uninstalli.patch [bz#2114742]
-- Resolves: bz#2114742
-  ([Azure][WALA][RHEL-8] When remove package some files left)
+* Mon Aug 08 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-3
+- wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch [bz#2114830]
+- wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch [bz#2093965]
+- Resolves: bz#2114830
+  ([Azure][WALA][RHEL-9.1] Provisioning failed if no ifcfg-eth0)
+- Resolves: bz#2093965
+  ([Azure][WALA][RHEL-9] The description of "Logs.Collect" is incorrect)
 
-* Tue Aug 09 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-3
-- wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch [bz#2092002]
-- wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch [bz#2114824]
-- Resolves: bz#2092002
-  ([Azure][WALA][RHEL-8.7] Provisioning failed if no ifcfg-eth0)
-- Resolves: bz#2114824
-  ([Azure][WALA][RHEL-8.7] The description of "Logs.Collect" is incorrect)
-
-* Tue Jul 12 2022 Camilla Conte <cconte@redhat.com> - 2.7.0.6-2
-- wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch [bz#2080826]
-- Resolves: bz#2080826
-  ([Azure][WALA][RHEL-8] [8.7] walinuxagent kills network during boot)
+* Fri Jul 15 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-2
+- wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch [bz#2098233]
+- Resolves: bz#2098233
+  ([Azure][WALA][RHEL-9] [9.1] walinuxagent kills network during boot)
 
 * Wed May 25 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-1
-- Rebase to 2.7.0.6 [bz#2083465]
-- Adding restart_if implementation for RHEL [bz#2085578]
-- Resolves: bz#2083465
-  ([Azure][RHEL-8][8.7] Rebase WALinuxAgent to v2.7.0.6)
-- Resolves: bz#2085578
-  ([Azure][WALA][8.6] WALA provisions VM failed because of no "ifdown")
+- Rebase to 2.7.0.6-1 [bz#2083464]
+- Adding restart_if implementation for RHEL [bz#2081944]
+- Resolves: bz#2083464
+  ([Azure][RHEL-9]Rebase WALinuxAgent to v2.7.0.6)
+- Resolves: bz#2081944
+  ([Azure][WALA][9.0] WALA provisions VM failed because of no "ifdown")
 
-* Mon Aug 09 2021 Miroslav Rezanina <mrezanin@redhat.com> - 2.3.0.2-2
-- wla-Require-iptables-for-setting-up-persistent-firewall-.patch [bz#1985198]
-- Resolves: bz#1985198
-  ([Azure][WALA][RHEL-8] WALA needs iptables package)
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0.2-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Jun 25 2021 Miroslav Rezanina <mrezanin@redhat.com> - 2.3.0.2-1
-- Rebase to 2.3.0.2 [bz#1972102]
-- Resolves: bz#1972102
-  ([Azure][RHEL-8]Rebase WALinuxAgent to 2.3.0.2)
+* Sun Jul 25 2021 Miroslav Rezanina <mrezanin@redhat.com> - 2.3.0.2-2
+- wala-Require-iptables-package.patch [bz#1978572]
+- Resolves: bz#1978572
+  ([Azure][WALA][RHEL-9] WALA needs iptables package)
 
-* Tue Jan 12 2021 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.49.2-3.el8
-- wla-Provide-udev-rules-as-a-separate-subpackage.patch [bz#1913074]
-- Resolves: bz#1913074
-  ([Azure][RFE] please provide the WALinuxAgent-udev subpackage)
+* Thu Jun 24 2021 Miroslav Rezanina <mrezanin@redhat.com> - 2.3.0.2-1
+- Rebase to 2.3.0.2 [bz#1972101]
+- Resolves: bz#1972101
+  ([Azure][RHEL-9]Rebase WALinuxAgent to 2.3.0.2)
 
-* Thu Dec 17 2020 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.49.2-2.el8
-- wla-Fixed-faulty-check-for-run_command-2093.patch [bz#1903074]
-- Resolves: bz#1903074
-  ([Azure][WALA] Miss report "hostnamectl set-hostname --static] failed, attempting fallback")
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.52-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Wed Nov 18 2020 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.49.2-1.el8
-- Rebase to 2.2.49.2 [bz#1896907]
-  ([Azure] Rebase WALinuxAgent to 2.2.49)
+* Fri Feb 19 2021 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.52-5
+- Require ntfsprogs on Fedora only
 
-* Thu Aug 13 2020 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.46-8.el8
-- wla-Fix-handling-of-gen2-disks-with-udev-rules-1954.patch [bz#1859037]
-- Resolves: bz#1859037
-  ([Azure][WALA]Cannot create /dev/disk/azure/resource softlinks in Gen2 VM)
+* Tue Jan 26 2021 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.52-4
+- Fix distro resolution for RedHat
 
-* Wed Jun 10 2020 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.46-7.el8
-- wla-Mark-logrotate-configs-with-config-noreplace.patch [bz#1838254]
-- Resolves: bz#1838254
-  ([Azure]WALinuxAgent RPM update clobbers waagent.logrotate log rotation changes)
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.52-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Tue May 26 2020 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.46-6.el8
-- wala-Update-Provisioning-options-1853.patch [bz#1827792]
-- Resolves: bz#1822882
-  ([Azure][RHEL-8]Some parameter changes are not in waagent.conf)
+* Fri Jan 15 2021 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.52-2
+- Add udev rules to initramfs (#1909287)
 
-* Thu Apr 09 2020 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.46-5.el8
-- Rebase to 2.2.46 [bz#1791069]
-- Resolves: bz#1791069
-  ([Azure][RHEL-8.3]Ask to increase the WALA version available for RHEL 8.0 to 2.2.46)
+* Wed Dec 09 2020 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.52-1
+- Update to 2.2.52 (#1849923)
+- Add not yet upstream patches supporting Python3.9 changes
 
-* Wed Jun 26 2019 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.32-3.el8
-- wla-Switch-from-platform-python-to-python36.patch [bz#1720373]
-- wla-Stop-packaging-legacy-waagent2.0.patch [bz#1720373]
-- Resolves: bz#1720373
-  ([RHEL 8.1] [Azure] Change WALinuxAgent spec to depend on Python3.6 package)
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.48.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Apr 30 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 2.2.32-2.el8
-- wla-Add-fixes-for-handling-swap-file-and-other-nit-fixes.patch [bz#1684181 bz#1688276]
-- Resolves: bz#1684181
-  (CVE-2019-0804 WALinuxAgent: swapfile created with weak permissions)
-- Resolves: bz#1688276
-  (CVE-2019-0804 WALinuxAgent: swapfile created with weak permissions [rhel-8])
+* Tue Jun 09 2020 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.48.1-1
+- Update to 2.2.48.1 (#1641605)
+- Split udev rules to a separate subpackage (#1748432)
 
-* Fri Dec 14 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.32-1.el8
-- Rebase to 2.2.32 [bz#1639498]
-- Resolves: bz#1639498]
-  (walinuxagent 2.2.32 packaging request for RHEL 8)
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.2.46-2
+- Rebuilt for Python 3.9
 
-* Tue Oct 23 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.26-6.el8
-- wala-Use-sys.executable-to-find-system-python.patch [bz#1639775]
-- Resolves: bz#1639775
-  (WALinuxAgent: Systemd unit file will fail to execute)
+* Wed Apr 15 2020 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.46-1
+- Update to 2.2.46
 
-* Mon Oct 22 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.26-5.el8
-- wala-Switch-to-platform-python-in-systemd-unit-file.patch [bz#1639775]
-- Resolves: bz#1639775
-  (WALinuxAgent: Systemd unit file will fail to execute)
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.40-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Wed Aug 29 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.26-4.el8
-- Fix unit file location [bz#1637545]
-- Resolves: bz#1637545
-  (Wrong macro used for systemd unit file location)
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.2.40-6
+- Rebuilt for Python 3.8.0rc1 (#1748018)
 
-* Wed Jul 04 2018 Tomas Orsava <torsava@redhat.com> - 2.2.26-3
-- Switch hardcoded python3 shebangs into the %%{__python3} macro
+* Wed Aug 21 2019 Miro Hrončok <mhroncok@redhat.com> - 2.2.40-5
+- Rebuilt for Python 3.8
 
-* Tue Jul 03 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.26-2.el8
-- Include 7.6 patches
+* Wed Aug 21 2019 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.40-4
+- Disable Python2 dependent 'legacy' subpackage (#1741029)
 
-* Tue Jul 03 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.26-1.el7
-- Rebase to 2.2.26 [bz#1571523]
-- Resolves: bz#1571523
-  (Rebase WALinuxAgent in RHEL-8.0)
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.2.40-3
+- Rebuilt for Python 3.8
 
-* Thu May 03 2018 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.18-2.el7
-- wa-Add-show-configuration-option.patch [bz#1508340]
-- Resolves: bz#1508340
-  ([WALA] WALA usage prompt lack of " waagent -show-configuration")
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.40-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Tue Oct 10 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.18-1.el7
-- Rebase to 2.2.18 [bz#1491873]
-- Resolves: bz#1491873
-  ([WALA]Request to package WALA 2.2.18 into RHEL 7 Repo)
+* Mon Jun 03 2019 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.40-1
+- Update to 2.2.40
+- Fix FTBFS in the preparation for Python3.8 (#1705219)
 
+* Thu Mar 14 2019 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.38-1
+- Update to 2.2.38 (CVE-2019-0804)
 
-* Tue Jul 04 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.14-1.el7
-- Rebase to 2.2.14 [bz#1451172]
-- wla-Remove-FIPS-setting-from-the-default-config.patch [bz#1467553]
-- Resolves: bz#1451172
-  ([WALA] Request to package WALA 2.2.14 into RHEL 7 Repo)
-- Resolves: bz#1467553
-  ([WALA] Remove FIPS from default config in WALA-2.2.14)
+* Thu Mar 14 2019 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.37-1
+- Update to 2.2.37
 
-* Wed Apr 26 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.10-1.el7
-- Rebase to 2.2.10 [bz#1443425]
-- Resolves: bz#1443425
-  ([WALA]Request to package WALA 2.2.10 into RHEL 7 Repo)
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.32-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Wed Apr 19 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.4-2.el7
-- Enable AutoUpdate by default [bz#1434933]
-- Resolves: bz#1434933
-  ([WALA][RHEL-7] Enable AutoUpdate by default)
+* Thu Sep 20 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.32-1
+- Update to 2.2.32.2
 
-* Wed Mar 01 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.4-1.el7
-- Rebase to 2.2.4 [bz#1419201]
-- resolves: bz#1419201
-  WALA 2.2.4
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.25-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Mon Jan 16 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.0-4.el7
-- agent-RHEL-7-hostname-533.patch [bz#1413674]
-- agent-fix-for-hostnamectl-534.patch [bz#1413674]
-- Resolves: bz#1413674
-  ([WALA] Fail to send hostname to DHCP server during provisioning)
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.25-3
+- Rebuilt for Python 3.7
 
-* Fri Sep 30 2016 Dave Anderson <anderson@redhat.com> - 2.2.0-1
-- Update to v2.2.0
-  Resolves: rhbz#1360492
+* Wed Apr 25 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.25-2
+- Move net-tools dependency to WALinuxAgent-legacy (#1106781)
 
-* Wed Sep 21 2016 Dave Anderson <anderson@redhat.com> - 2.1.5-2
-- Several QE updates to this file
-  Resolves: rhbz#1360492
+* Mon Apr 16 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.25-1
+- Update to 2.2.25
+- Switch to Python3
+- Legacy subpackage with waagent2.0 supporting old extensions
 
-* Tue Sep 13 2016 Dave Anderson <anderson@redhat.com> - 2.1.5-1
-- Update to v2.1.5
-  Resolves: rhbz#1360492
+* Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.0.18-5
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 
-* Thu Jan 14 2016 Dave Anderson <anderson@redhat.com> - 2.0.16-1
-- Update to 2.0.16
-  Resolves: rhbz#1296360
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Mon Jun 01 2015 Dave Anderson <anderson@redhat.com> - 2.0.13-1
-- Update to upstream 2.0.13 package.
-- Remove global commit md5sum and fix Source0 to point to correct location.
-- Fix setup to deal with "WALinuxAgent-WALinuxAgent" naming scheme
-- Added files reference for /udev/rules.d/99-azure-product-uuid.rules
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Thu May 07 2015 Dave Anderson <anderson@redhat.com> - 2.0.11-3
-- Remove Requires: ntfsprogs for RHEL7
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Apr 02 2016 Scott K Logan <logans@cottsay.net> - 2.0.18-1
+- Update to 2.0.18
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jul 02 2015 Scott K Logan <logans@cottsay.net> - 2.0.14-1
+- Update to 2.0.14
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jun 01 2015 Scott K Logan <logans@cottsay.net> - 2.0.13-1
+- Update to 2.0.13
+
+* Thu Apr 02 2015 Scott K Logan <logans@cottsay.net> - 2.0.12-1
+- Update to 2.0.12-Oracle
 
 * Sat Jan 10 2015 Scott K Logan <logans@cottsay.net> - 2.0.11-2
 - Use systemd for rhel7