diff --git a/WALinuxAgent-2.12.0.4.tar.gz b/WALinuxAgent-2.12.0.4.tar.gz deleted file mode 100644 index dfdb125..0000000 --- a/WALinuxAgent-2.12.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88be3211a433e1d12d7212761a06b227e6bed551649abd62d4eebeae116ab26c -size 2143917 diff --git a/WALinuxAgent-2.14.0.1.tar.gz b/WALinuxAgent-2.14.0.1.tar.gz new file mode 100644 index 0000000..f0019be --- /dev/null +++ b/WALinuxAgent-2.14.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edcdfcbae753e1dd3b33d2fbe983f5b17def75441cdcc247a70fc8e19610e470 +size 2954922 diff --git a/agent-btrfs-use-f.patch b/agent-btrfs-use-f.patch deleted file mode 100644 index a5a180a..0000000 --- a/agent-btrfs-use-f.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- azurelinuxagent/daemon/resourcedisk/default.py.orig -+++ azurelinuxagent/daemon/resourcedisk/default.py -@@ -124,7 +124,7 @@ class ResourceDiskHandler(object): - "{0}: {1}".format(device, ret[1])) - - force_option = 'F' -- if self.fs == 'xfs': -+ if self.fs in ('btrfs', 'xfs'): - force_option = 'f' - mkfs_string = "mkfs.{0} -{2} {1}".format( - self.fs, partition, force_option) diff --git a/python-azure-agent.changes b/python-azure-agent.changes index b29c269..23dd51c 100644 --- a/python-azure-agent.changes +++ b/python-azure-agent.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Nov 13 13:17:58 UTC 2025 - Robert Schweikert + +- Update to version 2.14.0.1 (bsc#1253001) + + Drop - included upstream + ~ agent-btrfs-use-f.patch included upstream + ~ remove-mock.patch + + FIPS 140-3 support + + Block extensions disallowed by policy + + Report ext policy errors in heartbeat + + Implement signature validation helper functions + + Prevent ssh public key override + + Use proper filesystem creation flag for btrfs + + Enable resource monitoring in cgroup v2 machines + + Update agent cgroup cleanup + + Add cgroupv2 distros to supported list + + Clean old agent cgroup setup + + Redact sas tokens in telemetry events and agent log + + Add conf option to use hardcoded wireserver ip instead of dhcp request + to discover wireserver ip + + Support for python 3.12 + + Update telemetry message for agent updates and send new telemetry for + ext resource governance + + Disable rsm downgrade + + Add community support for Chainguard OS + + Swap out legacycrypt for crypt-r for Python 3.13+ + + Pin setuptools version + + Set the agent config file path for FreeBSD + + Handle errors importing crypt module +- From 2.13.1.1 + + Setup: Fix install_requires list syntax + + Pickup latest goal state on tenant certificate rotation + Avoid + infinite loop when the tenant certificate is missing + + Fix unsupported syntax in py2.6 + + Cgroup rewrite: uses systemctl for expressing desired configuration + instead drop-in files + + Remove usages of tempfile.mktemp + + Use random time for attempting new Agent update + + Enable logcollector in v2 machines + + Clean history files + + Missing firewall rules reason + + Add support for nftables (+ refactoring of firewall code) + + Create walinuxagent nftable atomically + ------------------------------------------------------------------- Thu Jun 19 08:06:14 UTC 2025 - Joachim Gleissner diff --git a/python-azure-agent.spec b/python-azure-agent.spec index 13f94b6..65d8680 100644 --- a/python-azure-agent.spec +++ b/python-azure-agent.spec @@ -28,7 +28,7 @@ %global _sitelibdir %{%{pythons}_sitelib} Name: python-azure-agent -Version: 2.12.0.4 +Version: 2.14.0.1 Release: 0 Summary: Microsoft Azure Linux Agent License: Apache-2.0 @@ -39,10 +39,7 @@ Source0: WALinuxAgent-%{version}.tar.gz Patch6: paa_force_py3_sle15.patch Patch7: reset-dhcp-deprovision.patch Patch8: paa_12_sp5_rdma_no_ext_driver.patch -# PATCH-FIX-UPSTREAM gh#Azure/WALinuxAgent#2741 -Patch9: remove-mock.patch # PATCH-FIX-UPSTREAM gh#Azure/WALinuxAgent#3158 -Patch11: agent-btrfs-use-f.patch Patch12: paa_direct_exec_in_service.patch BuildRequires: dos2unix @@ -160,8 +157,6 @@ setup %endif %patch -P 7 %patch -P 8 -p1 -%patch -P 9 -p1 -%patch -P 11 %patch -P 12 %build diff --git a/remove-mock.patch b/remove-mock.patch deleted file mode 100644 index 2e26bb0..0000000 --- a/remove-mock.patch +++ /dev/null @@ -1,128 +0,0 @@ -Index: WALinuxAgent-2.12.0.4/tests/common/dhcp/test_dhcp.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/common/dhcp/test_dhcp.py -+++ WALinuxAgent-2.12.0.4/tests/common/dhcp/test_dhcp.py -@@ -15,7 +15,10 @@ - # Requires Python 2.6+ and Openssl 1.0+ - # - --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - import azurelinuxagent.common.dhcp as dhcp - import azurelinuxagent.common.osutil.default as osutil - from tests.lib.tools import AgentTestCase, open_patch, patch -Index: WALinuxAgent-2.12.0.4/tests/common/osutil/test_default.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/common/osutil/test_default.py -+++ WALinuxAgent-2.12.0.4/tests/common/osutil/test_default.py -@@ -22,7 +22,10 @@ import subprocess - import tempfile - import unittest - --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - - import azurelinuxagent.common.conf as conf - import azurelinuxagent.common.osutil.default as osutil -Index: WALinuxAgent-2.12.0.4/tests/common/test_event.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/common/test_event.py -+++ WALinuxAgent-2.12.0.4/tests/common/test_event.py -@@ -27,7 +27,10 @@ import threading - import xml.dom - from datetime import datetime, timedelta - --from mock import MagicMock -+try: -+ from unittest.mock import MagicMock -+except ImportError: -+ from mock import MagicMock - - from azurelinuxagent.common.utils import textutil, fileutil - from azurelinuxagent.common import event, logger -Index: WALinuxAgent-2.12.0.4/tests/common/test_version.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/common/test_version.py -+++ WALinuxAgent-2.12.0.4/tests/common/test_version.py -@@ -20,7 +20,10 @@ from __future__ import print_function - import os - import textwrap - --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - - import azurelinuxagent.common.conf as conf - from azurelinuxagent.common.future import ustr -Index: WALinuxAgent-2.12.0.4/tests/ga/test_collect_telemetry_events.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/ga/test_collect_telemetry_events.py -+++ WALinuxAgent-2.12.0.4/tests/ga/test_collect_telemetry_events.py -@@ -26,7 +26,10 @@ import string - import uuid - from collections import defaultdict - --from mock import patch, MagicMock -+try: -+ from unittest.mock import patch, MagicMock -+except ImportError: -+ from mock import patch, MagicMock - - from azurelinuxagent.common import conf - from azurelinuxagent.common.event import EVENTS_DIRECTORY -Index: WALinuxAgent-2.12.0.4/tests/ga/test_remoteaccess_handler.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/ga/test_remoteaccess_handler.py -+++ WALinuxAgent-2.12.0.4/tests/ga/test_remoteaccess_handler.py -@@ -16,7 +16,10 @@ - # - from datetime import timedelta, datetime - --from mock import Mock, MagicMock -+try: -+ from unittest.mock import Mock, MagicMock -+except ImportError: -+ from mock import Mock, MagicMock - from azurelinuxagent.common.osutil.default import DefaultOSUtil - from azurelinuxagent.common.protocol.goal_state import RemoteAccess - from azurelinuxagent.common.protocol.util import ProtocolUtil -Index: WALinuxAgent-2.12.0.4/tests/ga/test_send_telemetry_events.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/ga/test_send_telemetry_events.py -+++ WALinuxAgent-2.12.0.4/tests/ga/test_send_telemetry_events.py -@@ -24,7 +24,10 @@ import time - import uuid - from datetime import datetime, timedelta - --from mock import MagicMock, Mock, patch, PropertyMock -+try: -+ from unittest.mock import MagicMock, Mock, patch, PropertyMock -+except ImportError: -+ from mock import MagicMock, Mock, patch, PropertyMock - - from azurelinuxagent.common import logger - from azurelinuxagent.common.datacontract import get_properties -Index: WALinuxAgent-2.12.0.4/tests/lib/mock_update_handler.py -=================================================================== ---- WALinuxAgent-2.12.0.4.orig/tests/lib/mock_update_handler.py -+++ WALinuxAgent-2.12.0.4/tests/lib/mock_update_handler.py -@@ -17,7 +17,10 @@ - - import contextlib - --from mock import PropertyMock -+try: -+ from unittest.mock import PropertyMock -+except ImportError: -+ from mock import PropertyMock - - from azurelinuxagent.ga.agent_update_handler import AgentUpdateHandler - from azurelinuxagent.ga.exthandlers import ExtHandlersHandler