Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cf6ffaa20e | ||
|
|
72a7729d77 | ||
|
|
11678b23d3 |
4 changed files with 74 additions and 2 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -25,3 +25,7 @@
|
|||
/v2.9.1.1.tar.gz
|
||||
/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
|
||||
/v2.13.1.1.tar.gz
|
||||
|
|
|
|||
67
0001-Fedora-do-not-require-legacycrypt.patch
Normal file
67
0001-Fedora-do-not-require-legacycrypt.patch
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
From 376c6651f3f7c863c1aa5ac5e9536e974e6ab17c Mon Sep 17 00:00:00 2001
|
||||
From: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
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 <vkuznets@redhat.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
%global dracut_modname 97walinuxagent
|
||||
|
||||
Name: WALinuxAgent
|
||||
Version: 2.11.1.4
|
||||
Version: 2.13.1.1
|
||||
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
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v2.11.1.4.tar.gz) = e67ecd801541bd869bc01a023ee3b06a6ee879b5780b34c5fa320d080276ebe8400c66a8550b58d0ca4a1116bd923b00ce2da60d09c574f30c50f446b5a6ac2f
|
||||
SHA512 (v2.13.1.1.tar.gz) = 3cb65495955c746bf112e794cbeb11f47ace72e4272c3cd16eb8d478c0b3b0323890b52c592b68775efafb8c6f267b3614e66f09d6a6dee066b603297676cd38
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue