From 86fd51f6375bff377884f3b2a41607b9fc2a0884 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Mon, 21 Oct 2024 17:36:28 +0200 Subject: [PATCH 01/11] Update to v2.11.1.12 Signed-off-by: Vitaly Kuznetsov --- .gitignore | 1 + WALinuxAgent.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8efa138..fc2e64e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /v2.9.1.1.tar.gz /v2.10.0.8.tar.gz /v2.11.1.4.tar.gz +/v2.11.1.12.tar.gz diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index a6e8aca..b144983 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -1,7 +1,7 @@ %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.11.1.4 +Version: 2.11.1.12 Release: %autorelease Summary: The Microsoft Azure Linux Agent diff --git a/sources b/sources index 11fe930..572b6d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.11.1.4.tar.gz) = e67ecd801541bd869bc01a023ee3b06a6ee879b5780b34c5fa320d080276ebe8400c66a8550b58d0ca4a1116bd923b00ce2da60d09c574f30c50f446b5a6ac2f +SHA512 (v2.11.1.12.tar.gz) = 5979b1553b2cba1e8b7673ad2f29ccf91fb24ecc74034304caf78de735eb38b2955b9aaf092bdbedae611f6f19fdfc07ceabb0df7832b5be1570a58d1fe8d3cd From 8f18b5595d8233262d0d0b5b7f1aef936d2d2d2d Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Tue, 26 Nov 2024 15:23:09 +0100 Subject: [PATCH 02/11] Update to v2.12.0.4 Note: legacycrypt is not in Fedora, add a patch to keep working with 'crypt_r' instead. Signed-off-by: Vitaly Kuznetsov --- .gitignore | 2 + 0001-Fedora-do-not-require-legacycrypt.patch | 67 ++++++++++++++++++++ WALinuxAgent.spec | 3 +- sources | 2 +- 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 0001-Fedora-do-not-require-legacycrypt.patch diff --git a/.gitignore b/.gitignore index fc2e64e..266efa3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /v2.10.0.8.tar.gz /v2.11.1.4.tar.gz /v2.11.1.12.tar.gz +/v2.12.0.2.tar.gz +/v2.12.0.4.tar.gz diff --git a/0001-Fedora-do-not-require-legacycrypt.patch b/0001-Fedora-do-not-require-legacycrypt.patch new file mode 100644 index 0000000..41caab1 --- /dev/null +++ b/0001-Fedora-do-not-require-legacycrypt.patch @@ -0,0 +1,67 @@ +From 376c6651f3f7c863c1aa5ac5e9536e974e6ab17c Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Wed, 27 Nov 2024 14:53:15 +0100 +Subject: [PATCH] Fedora: do not require legacycrypt +Content-Type: text/plain + +'legacycrypt' is not yet present in Fedora, however, there's 'crypt_r' +stub emulating 'crypt'. + +Signed-off-by: Vitaly Kuznetsov +--- + azurelinuxagent/common/osutil/default.py | 10 +--------- + requirements.txt | 1 - + setup.py | 5 ++--- + 3 files changed, 3 insertions(+), 13 deletions(-) + +diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py +index 0a0fd0e1cdd7..3a1c647a8363 100644 +--- a/azurelinuxagent/common/osutil/default.py ++++ b/azurelinuxagent/common/osutil/default.py +@@ -38,15 +38,7 @@ import time + from pwd import getpwall + + from azurelinuxagent.common.exception import OSUtilError +-# 'crypt' was removed in Python 3.13; use legacycrypt instead +-if sys.version_info[0] == 3 and sys.version_info[1] >= 13 or sys.version_info[0] > 3: +- try: +- from legacycrypt import crypt +- except ImportError: +- def crypt(password, salt): +- raise OSUtilError("Please install the legacycrypt Python module to use this feature.") +-else: +- from crypt import crypt # pylint: disable=deprecated-module ++from crypt import crypt # pylint: disable=deprecated-module + + from azurelinuxagent.common import conf + from azurelinuxagent.common import logger +diff --git a/requirements.txt b/requirements.txt +index ab6958a732ce..ee3b024d8fdc 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,3 +1,2 @@ + distro; python_version >= '3.8' + pyasn1 +-legacycrypt; python_version >= '3.13' +diff --git a/setup.py b/setup.py +index e83f598934c6..ea4c488b2897 100755 +--- a/setup.py ++++ b/setup.py +@@ -319,12 +319,11 @@ class install(_install): # pylint: disable=C0103 + # implementation may be broken prior to Python 3.8 where the functionality + # will be removed from Python 3. + # * In version 3.13 of Python, the crypt module was removed and legacycrypt is +-# required instead. ++# required instead. Fedora doesn't provide legacycrypt but has 'crypt_r' stub ++# instead. + requires = [] + if sys.version_info[0] >= 3 and sys.version_info[1] >= 8: + requires.append('distro') +-if sys.version_info[0] >= 3 and sys.version_info[1] >= 13: +- requires.append('legacycrypt') + + modules = [] # pylint: disable=invalid-name + +-- +2.47.0 + diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index b144983..b3c602f 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -1,7 +1,7 @@ %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.11.1.12 +Version: 2.12.0.4 Release: %autorelease Summary: The Microsoft Azure Linux Agent @@ -11,6 +11,7 @@ Source0: https://github.com/Azure/%{name}/archive/v%{version}.tar.gz Source1: module-setup.sh Patch1: 0001-waagent.service-set-ConditionVirtualization-microsof.patch +Patch2: 0001-Fedora-do-not-require-legacycrypt.patch BuildArch: noarch diff --git a/sources b/sources index 572b6d4..b420d66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.11.1.12.tar.gz) = 5979b1553b2cba1e8b7673ad2f29ccf91fb24ecc74034304caf78de735eb38b2955b9aaf092bdbedae611f6f19fdfc07ceabb0df7832b5be1570a58d1fe8d3cd +SHA512 (v2.12.0.4.tar.gz) = 483c187afd30c8d356b54af7a01544297ea6c8f196234332a9ecac23c9192d0432fcc31f5a3ff31b763d36faabec4f77262d44d5d729f8f2256695f208319571 From 6e0394d06e6acfecc65992858bf6d02162362644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:23:35 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 705517316832cc4e6cda63ab306b821261c3ea93 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Mon, 5 May 2025 16:13:48 +0200 Subject: [PATCH 04/11] Update to v2.13.1.1 (#2363841) Signed-off-by: Vitaly Kuznetsov --- .gitignore | 1 + WALinuxAgent.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 266efa3..f36f11d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /v2.11.1.12.tar.gz /v2.12.0.2.tar.gz /v2.12.0.4.tar.gz +/v2.13.1.1.tar.gz diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index b3c602f..3f562fd 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -1,7 +1,7 @@ %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.12.0.4 +Version: 2.13.1.1 Release: %autorelease Summary: The Microsoft Azure Linux Agent diff --git a/sources b/sources index b420d66..7194baa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.12.0.4.tar.gz) = 483c187afd30c8d356b54af7a01544297ea6c8f196234332a9ecac23c9192d0432fcc31f5a3ff31b763d36faabec4f77262d44d5d729f8f2256695f208319571 +SHA512 (v2.13.1.1.tar.gz) = 3cb65495955c746bf112e794cbeb11f47ace72e4272c3cd16eb8d478c0b3b0323890b52c592b68775efafb8c6f267b3614e66f09d6a6dee066b603297676cd38 From 6664e733d843479d0a0c7dcc8a31e139bf3fe9b9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 23:21:05 +0200 Subject: [PATCH 05/11] Rebuilt for Python 3.14 From a3c68d79b431fc4a1ead34793545cc1d185c0997 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 21 Jul 2025 12:04:17 -0400 Subject: [PATCH 06/11] Turn off ResourceDisk.Format in the default config WALinuxAgent can optionally format resource disks. However, other tools can also handle this. Fedora Cloud ships with cloud-init, and enables the disk_setup[0] module, which handles formatting the disks. For any cases where users don't want this done via cloud-init, the azure-vm-utils package will provide a small shell script and systemd unit to handle it[1]. [0] https://docs.cloud-init.io/en/latest/reference/yaml_examples/disk_setup.html [1] https://github.com/Azure/azure-vm-utils/pull/84 Signed-off-by: Jeremy Cline --- WALinuxAgent.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index 3f562fd..63f7946 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -94,6 +94,9 @@ install -m0755 -D --target-directory=%{buildroot}%{_prefix}/lib/dracut/modules.d sed -i 's,#!/usr/bin/env python,#!/usr/bin/python3,' %{buildroot}%{_sbindir}/waagent sed -i 's,/usr/bin/python ,/usr/bin/python3 ,' %{buildroot}%{_unitdir}/waagent.service +# Other commonly-used tools can handle formatting resource disks (cloud-init, azure-vm-utils) so +# by default, let's have WALinuxAgent not do that. +sed -i 's,ResourceDisk.Format=y,ResourceDisk.Format=n,' %{buildroot}%{_sysconfdir}/waagent.conf %post From 2d46c9102420b1ca59f443aa4d02372502d9195f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:39:58 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4314e3d0b327bd92018eaa6ae4e9bfa1553728c2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:43 +0200 Subject: [PATCH 08/11] Rebuilt for Python 3.14.0rc2 bytecode From 1104f83c4642b1b25faf4290de98502a6c9f3021 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:03:06 +0200 Subject: [PATCH 09/11] Rebuilt for Python 3.14.0rc3 bytecode From 1c8843aa5e7a2763a113c772e542db1a1cdddd5a Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Mon, 22 Sep 2025 11:08:47 +0200 Subject: [PATCH 10/11] Update to v2.14.0.1 Signed-off-by: Vitaly Kuznetsov --- .gitignore | 1 + 0001-Fedora-do-not-require-legacycrypt.patch | 67 -------------------- WALinuxAgent.spec | 3 +- sources | 2 +- 4 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 0001-Fedora-do-not-require-legacycrypt.patch diff --git a/.gitignore b/.gitignore index f36f11d..16e49a8 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /v2.12.0.2.tar.gz /v2.12.0.4.tar.gz /v2.13.1.1.tar.gz +/v2.14.0.1.tar.gz diff --git a/0001-Fedora-do-not-require-legacycrypt.patch b/0001-Fedora-do-not-require-legacycrypt.patch deleted file mode 100644 index 41caab1..0000000 --- a/0001-Fedora-do-not-require-legacycrypt.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 376c6651f3f7c863c1aa5ac5e9536e974e6ab17c Mon Sep 17 00:00:00 2001 -From: Vitaly Kuznetsov -Date: Wed, 27 Nov 2024 14:53:15 +0100 -Subject: [PATCH] Fedora: do not require legacycrypt -Content-Type: text/plain - -'legacycrypt' is not yet present in Fedora, however, there's 'crypt_r' -stub emulating 'crypt'. - -Signed-off-by: Vitaly Kuznetsov ---- - azurelinuxagent/common/osutil/default.py | 10 +--------- - requirements.txt | 1 - - setup.py | 5 ++--- - 3 files changed, 3 insertions(+), 13 deletions(-) - -diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py -index 0a0fd0e1cdd7..3a1c647a8363 100644 ---- a/azurelinuxagent/common/osutil/default.py -+++ b/azurelinuxagent/common/osutil/default.py -@@ -38,15 +38,7 @@ import time - from pwd import getpwall - - from azurelinuxagent.common.exception import OSUtilError --# 'crypt' was removed in Python 3.13; use legacycrypt instead --if sys.version_info[0] == 3 and sys.version_info[1] >= 13 or sys.version_info[0] > 3: -- try: -- from legacycrypt import crypt -- except ImportError: -- def crypt(password, salt): -- raise OSUtilError("Please install the legacycrypt Python module to use this feature.") --else: -- from crypt import crypt # pylint: disable=deprecated-module -+from crypt import crypt # pylint: disable=deprecated-module - - from azurelinuxagent.common import conf - from azurelinuxagent.common import logger -diff --git a/requirements.txt b/requirements.txt -index ab6958a732ce..ee3b024d8fdc 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,3 +1,2 @@ - distro; python_version >= '3.8' - pyasn1 --legacycrypt; python_version >= '3.13' -diff --git a/setup.py b/setup.py -index e83f598934c6..ea4c488b2897 100755 ---- a/setup.py -+++ b/setup.py -@@ -319,12 +319,11 @@ class install(_install): # pylint: disable=C0103 - # implementation may be broken prior to Python 3.8 where the functionality - # will be removed from Python 3. - # * In version 3.13 of Python, the crypt module was removed and legacycrypt is --# required instead. -+# required instead. Fedora doesn't provide legacycrypt but has 'crypt_r' stub -+# instead. - requires = [] - if sys.version_info[0] >= 3 and sys.version_info[1] >= 8: - requires.append('distro') --if sys.version_info[0] >= 3 and sys.version_info[1] >= 13: -- requires.append('legacycrypt') - - modules = [] # pylint: disable=invalid-name - --- -2.47.0 - diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index 63f7946..eda48cf 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -1,7 +1,7 @@ %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.13.1.1 +Version: 2.14.0.1 Release: %autorelease Summary: The Microsoft Azure Linux Agent @@ -11,7 +11,6 @@ Source0: https://github.com/Azure/%{name}/archive/v%{version}.tar.gz Source1: module-setup.sh Patch1: 0001-waagent.service-set-ConditionVirtualization-microsof.patch -Patch2: 0001-Fedora-do-not-require-legacycrypt.patch BuildArch: noarch diff --git a/sources b/sources index 7194baa..662611f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.13.1.1.tar.gz) = 3cb65495955c746bf112e794cbeb11f47ace72e4272c3cd16eb8d478c0b3b0323890b52c592b68775efafb8c6f267b3614e66f09d6a6dee066b603297676cd38 +SHA512 (v2.14.0.1.tar.gz) = b09c0dc7145f7f6b347c603ddcd5a5b26522b2cd1d37303dcdcb44c41ee710a61e2aab3df0bb5854304de8ed5c7d934c7a6924c9e5c7005e081f66e7d1658db8 From 2116361af6a18ba636d8cc3dee54fe4d9a37fe3f Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Wed, 26 Nov 2025 10:21:13 +0100 Subject: [PATCH 11/11] Update to v2.15.0.1 Signed-off-by: Vitaly Kuznetsov --- .gitignore | 1 + WALinuxAgent.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 16e49a8..30509ac 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /v2.12.0.4.tar.gz /v2.13.1.1.tar.gz /v2.14.0.1.tar.gz +/v2.15.0.1.tar.gz diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index eda48cf..5eea00e 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -1,7 +1,7 @@ %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.14.0.1 +Version: 2.15.0.1 Release: %autorelease Summary: The Microsoft Azure Linux Agent diff --git a/sources b/sources index 662611f..35a2aed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.14.0.1.tar.gz) = b09c0dc7145f7f6b347c603ddcd5a5b26522b2cd1d37303dcdcb44c41ee710a61e2aab3df0bb5854304de8ed5c7d934c7a6924c9e5c7005e081f66e7d1658db8 +SHA512 (v2.15.0.1.tar.gz) = dc9398bd5a100f43f7921e0503ef288d632f0e494f2cc9a149e181634ef68da96bb743dda8378b93bbc538f82d43bf59571b7049918dbe2770495001ae80ab79