From c1cad3c17b661378564e1d501ef1096721aab6f7 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Mon, 22 Sep 2025 11:08:47 +0200 Subject: [PATCH 1/2] 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 0643129668890d28aa8d56bc17616f5e9dc47c8c Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Wed, 26 Nov 2025 10:21:13 +0100 Subject: [PATCH 2/2] 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