diff --git a/.gitignore b/.gitignore index 4336e5e..30509ac 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,21 @@ /WALinuxAgent-2.2.52.tar.gz /v2.2.52.tar.gz /module-setup.sh +/v2.2.54.2.tar.gz +/v2.3.0.2.tar.gz +/v2.3.1.1.tar.gz +/v2.5.0.2.tar.gz +/v2.7.0.6.tar.gz +/v2.7.1.0.tar.gz +/v2.7.3.0.tar.gz +/v2.8.0.11.tar.gz +/v2.9.0.4.tar.gz +/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 +/v2.14.0.1.tar.gz +/v2.15.0.1.tar.gz diff --git a/0001-update-array.tostring-and-json.loads-without-encodin.patch b/0001-update-array.tostring-and-json.loads-without-encodin.patch deleted file mode 100644 index d88c41c..0000000 --- a/0001-update-array.tostring-and-json.loads-without-encodin.patch +++ /dev/null @@ -1,72 +0,0 @@ -From cc9b7996e542640bb19365822344298a04b18e44 Mon Sep 17 00:00:00 2001 -From: Paula Gombar -Date: Wed, 18 Nov 2020 12:24:33 -0800 -Subject: [PATCH 1/3] update array.tostring() and json.loads without encoding - for py3.9 - ---- - azurelinuxagent/common/osutil/bigip.py | 7 ++++++- - azurelinuxagent/common/osutil/default.py | 6 +++++- - tests/protocol/test_imds.py | 4 ++-- - 3 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/azurelinuxagent/common/osutil/bigip.py b/azurelinuxagent/common/osutil/bigip.py -index 61d3c695f911..ceadf8ca2066 100644 ---- a/azurelinuxagent/common/osutil/bigip.py -+++ b/azurelinuxagent/common/osutil/bigip.py -@@ -280,7 +280,12 @@ class BigIpOSUtil(DefaultOSUtil): - if retsize == (expected * struct_size): - logger.warn(('SIOCGIFCONF returned more than {0} up ' - 'network interfaces.'), expected) -- sock = buff.tostring() -+ try: -+ # Python 3.9 removed the tostring() method on arrays, tobytes() is the new alias -+ sock = buff.tostring() -+ except AttributeError: -+ sock = buff.tobytes() -+ - for i in range(0, struct_size * expected, struct_size): - iface = self._format_single_interface_name(sock, i) - -diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py -index 521776818e64..6179061756e3 100644 ---- a/azurelinuxagent/common/osutil/default.py -+++ b/azurelinuxagent/common/osutil/default.py -@@ -758,7 +758,11 @@ class DefaultOSUtil(object): - logger.warn(('SIOCGIFCONF returned more than {0} up ' - 'network interfaces.'), expected) - -- ifconf_buff = buff.tostring() -+ try: -+ # Python 3.9 removed the tostring() method on arrays, tobytes() is the new alias -+ ifconf_buff = buff.tostring() -+ except AttributeError: -+ ifconf_buff = buff.tobytes() - - ifaces = {} - for i in range(0, array_size, struct_size): -diff --git a/tests/protocol/test_imds.py b/tests/protocol/test_imds.py -index a730ded03525..47462fd25ac3 100644 ---- a/tests/protocol/test_imds.py -+++ b/tests/protocol/test_imds.py -@@ -109,7 +109,7 @@ class TestImds(AgentTestCase): - "zone": "In" - }''' - -- data = json.loads(s, encoding='utf-8') -+ data = json.loads(s) - - compute_info = imds.ComputeInfo() - set_properties("compute", compute_info, data) -@@ -258,7 +258,7 @@ class TestImds(AgentTestCase): - "version": "{3}" - }}'''.format(publisher, offer, sku, version) - -- data = json.loads(s, encoding='utf-8') -+ data = json.loads(s) - compute_info = imds.ComputeInfo() - set_properties("compute", compute_info, data) - --- -2.26.2 - diff --git a/0001-waagent.service-set-ConditionVirtualization-microsof.patch b/0001-waagent.service-set-ConditionVirtualization-microsof.patch new file mode 100644 index 0000000..c6a312e --- /dev/null +++ b/0001-waagent.service-set-ConditionVirtualization-microsof.patch @@ -0,0 +1,69 @@ +From dac5101c56b59dbb14d96d4344d6cb2ac047b392 Mon Sep 17 00:00:00 2001 +From: Chris Patterson +Date: Thu, 1 Sep 2022 10:45:47 -0400 +Subject: [PATCH] waagent.service: set ConditionVirtualization=|microsoft + +Only start waagent service when running under Microsoft virtualization. + +Set it as a triggering condition to make it easier for downstreams or +test setups to add another condition (i.e. run outside of hyperv). + +Signed-off-by: Chris Patterson +--- + bin/waagent2.0 | 1 + + init/redhat/py2/waagent.service | 1 + + init/redhat/waagent.service | 1 + + init/waagent.service | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/bin/waagent2.0 b/bin/waagent2.0 +index 34732677..c84c8c40 100644 +--- a/bin/waagent2.0 ++++ b/bin/waagent2.0 +@@ -1569,6 +1569,7 @@ After=network.target + After=sshd.service + ConditionFileIsExecutable=/usr/sbin/waagent + ConditionPathExists=/etc/waagent.conf ++ConditionVirtualization=|microsoft + + [Service] + Type=simple +diff --git a/init/redhat/py2/waagent.service b/init/redhat/py2/waagent.service +index c6d15420..132e7027 100644 +--- a/init/redhat/py2/waagent.service ++++ b/init/redhat/py2/waagent.service +@@ -5,6 +5,7 @@ After=network-online.target + + ConditionFileIsExecutable=/usr/sbin/waagent + ConditionPathExists=/etc/waagent.conf ++ConditionVirtualization=|microsoft + + [Service] + Type=simple +diff --git a/init/redhat/waagent.service b/init/redhat/waagent.service +index dc11fbb1..7c93b101 100644 +--- a/init/redhat/waagent.service ++++ b/init/redhat/waagent.service +@@ -5,6 +5,7 @@ After=network-online.target + + ConditionFileIsExecutable=/usr/sbin/waagent + ConditionPathExists=/etc/waagent.conf ++ConditionVirtualization=|microsoft + + [Service] + Type=simple +diff --git a/init/waagent.service b/init/waagent.service +index e91f1433..aa1f3203 100644 +--- a/init/waagent.service ++++ b/init/waagent.service +@@ -5,6 +5,7 @@ After=network-online.target + + ConditionFileIsExecutable=/usr/sbin/waagent + ConditionPathExists=/etc/waagent.conf ++ConditionVirtualization=|microsoft + + [Service] + Type=simple +-- +2.37.3 + diff --git a/0002-handle-py3.9-check-in-future.py.patch b/0002-handle-py3.9-check-in-future.py.patch deleted file mode 100644 index d7c563a..0000000 --- a/0002-handle-py3.9-check-in-future.py.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 66f600ed3d9f22c2aa6790002507d0c821a7fd0c Mon Sep 17 00:00:00 2001 -From: Paula Gombar -Date: Tue, 8 Dec 2020 18:38:33 -0800 -Subject: [PATCH 2/3] handle py3.9 check in future.py - ---- - azurelinuxagent/common/future.py | 13 ++++++++++++- - azurelinuxagent/common/osutil/bigip.py | 8 +++----- - azurelinuxagent/common/osutil/default.py | 9 ++------- - 3 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/azurelinuxagent/common/future.py b/azurelinuxagent/common/future.py -index 577fb12e186e..0f76aceba786 100644 ---- a/azurelinuxagent/common/future.py -+++ b/azurelinuxagent/common/future.py -@@ -103,4 +103,15 @@ def get_openwrt_platform(): - elif product_matches: - if product_matches.group(1) == "OpenWrt": - result[0] = "openwrt" -- return result -\ No newline at end of file -+ return result -+ -+ -+def array_to_string_or_bytes(buffer): -+ # Python 3.9 removed the tostring() method on arrays, the new alias is tobytes() -+ if sys.version_info[0] == 2: -+ return buffer.tostring() -+ -+ if sys.version_info[0] == 3 and sys.version_info[1] <= 8: -+ return buffer.tostring() -+ -+ return buffer.tobytes() -diff --git a/azurelinuxagent/common/osutil/bigip.py b/azurelinuxagent/common/osutil/bigip.py -index ceadf8ca2066..cc1b64143c12 100644 ---- a/azurelinuxagent/common/osutil/bigip.py -+++ b/azurelinuxagent/common/osutil/bigip.py -@@ -24,6 +24,8 @@ import socket - import struct - import time - -+from azurelinuxagent.common.future import array_to_string_or_bytes -+ - try: - # WAAgent > 2.1.3 - import azurelinuxagent.common.logger as logger -@@ -280,12 +282,8 @@ class BigIpOSUtil(DefaultOSUtil): - if retsize == (expected * struct_size): - logger.warn(('SIOCGIFCONF returned more than {0} up ' - 'network interfaces.'), expected) -- try: -- # Python 3.9 removed the tostring() method on arrays, tobytes() is the new alias -- sock = buff.tostring() -- except AttributeError: -- sock = buff.tobytes() - -+ sock = array_to_string_or_bytes(buff) - for i in range(0, struct_size * expected, struct_size): - iface = self._format_single_interface_name(sock, i) - -diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py -index 6179061756e3..c1ca15cf64ef 100644 ---- a/azurelinuxagent/common/osutil/default.py -+++ b/azurelinuxagent/common/osutil/default.py -@@ -41,7 +41,7 @@ import azurelinuxagent.common.utils.fileutil as fileutil - import azurelinuxagent.common.utils.shellutil as shellutil - import azurelinuxagent.common.utils.textutil as textutil - from azurelinuxagent.common.exception import OSUtilError --from azurelinuxagent.common.future import ustr -+from azurelinuxagent.common.future import ustr, array_to_string_or_bytes - from azurelinuxagent.common.utils.cryptutil import CryptUtil - from azurelinuxagent.common.utils.flexible_version import FlexibleVersion - from azurelinuxagent.common.utils.networkutil import RouteEntry, NetworkInterfaceCard -@@ -758,12 +758,7 @@ class DefaultOSUtil(object): - logger.warn(('SIOCGIFCONF returned more than {0} up ' - 'network interfaces.'), expected) - -- try: -- # Python 3.9 removed the tostring() method on arrays, tobytes() is the new alias -- ifconf_buff = buff.tostring() -- except AttributeError: -- ifconf_buff = buff.tobytes() -- -+ ifconf_buff = array_to_string_or_bytes(buff) - ifaces = {} - for i in range(0, array_size, struct_size): - iface = ifconf_buff[i:i+IFNAMSIZ].split(b'\0', 1)[0] --- -2.26.2 - diff --git a/0003-fix-pylint.patch b/0003-fix-pylint.patch deleted file mode 100644 index 03b887c..0000000 --- a/0003-fix-pylint.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 90f1a4862cf63df4a96ad912effcfb54192ad4d7 Mon Sep 17 00:00:00 2001 -From: Paula Gombar -Date: Tue, 8 Dec 2020 18:53:57 -0800 -Subject: [PATCH 3/3] fix pylint - ---- - azurelinuxagent/common/future.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/azurelinuxagent/common/future.py b/azurelinuxagent/common/future.py -index 0f76aceba786..a6796f19fec2 100644 ---- a/azurelinuxagent/common/future.py -+++ b/azurelinuxagent/common/future.py -@@ -106,12 +106,12 @@ def get_openwrt_platform(): - return result - - --def array_to_string_or_bytes(buffer): -+def array_to_string_or_bytes(buff): - # Python 3.9 removed the tostring() method on arrays, the new alias is tobytes() - if sys.version_info[0] == 2: -- return buffer.tostring() -+ return buff.tostring() - - if sys.version_info[0] == 3 and sys.version_info[1] <= 8: -- return buffer.tostring() -+ return buff.tostring() - -- return buffer.tobytes() -+ return buff.tobytes() --- -2.26.2 - diff --git a/0004-Fix-distro-resolution-for-RedHat-2083.patch b/0004-Fix-distro-resolution-for-RedHat-2083.patch deleted file mode 100644 index e0ce7b2..0000000 --- a/0004-Fix-distro-resolution-for-RedHat-2083.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 3420fef144cf9a5be62cfae16f64c298ca397a17 Mon Sep 17 00:00:00 2001 -From: Paula Gombar -Date: Wed, 2 Dec 2020 21:36:41 -0800 -Subject: [PATCH] Fix distro resolution for RedHat (#2083) - -vkuznets: cherry-picking the primary change of the commit (adding 'rhel') -only, pylint changes require additional commits. - -Signed-off-by: Vitaly Kuznetsov ---- - azurelinuxagent/common/osutil/factory.py | 4 +--- - tests/common/osutil/test_factory.py | 14 ++++++++++++++ - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py -index 69f8430052d5..caecaa0887e2 100644 ---- a/azurelinuxagent/common/osutil/factory.py -+++ b/azurelinuxagent/common/osutil/factory.py -@@ -97,9 +97,7 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name) - else: - return DebianOSBaseUtil() - -- if distro_name == "redhat" \ -- or distro_name == "centos" \ -- or distro_name == "oracle": -+ if distro_name in ("redhat", "rhel", "centos", "oracle"): - if Version(distro_version) < Version("7"): - return Redhat6xOSUtil() - else: -diff --git a/tests/common/osutil/test_factory.py b/tests/common/osutil/test_factory.py -index aa7daebcf25f..2ac0849f75c9 100644 ---- a/tests/common/osutil/test_factory.py -+++ b/tests/common/osutil/test_factory.py -@@ -188,6 +188,13 @@ class TestOsUtilFactory(AgentTestCase): - self.assertTrue(type(ret) == Redhat6xOSUtil) - self.assertEquals(ret.get_service_name(), "waagent") - -+ ret = _get_osutil(distro_name="rhel", -+ distro_code_name="", -+ distro_full_name="", -+ distro_version="6") -+ self.assertTrue(type(ret) == Redhat6xOSUtil) -+ self.assertEquals(ret.get_service_name(), "waagent") -+ - ret = _get_osutil(distro_name="centos", - distro_code_name="", - distro_full_name="", -@@ -209,6 +216,13 @@ class TestOsUtilFactory(AgentTestCase): - self.assertTrue(type(ret) == RedhatOSUtil) - self.assertEquals(ret.get_service_name(), "waagent") - -+ ret = _get_osutil(distro_name="rhel", -+ distro_code_name="", -+ distro_full_name="", -+ distro_version="7") -+ self.assertTrue(type(ret) == RedhatOSUtil) -+ self.assertEquals(ret.get_service_name(), "waagent") -+ - ret = _get_osutil(distro_name="centos", - distro_code_name="", - distro_full_name="", --- -2.29.2 - diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec index 3461261..5eea00e 100644 --- a/WALinuxAgent.spec +++ b/WALinuxAgent.spec @@ -1,34 +1,37 @@ -%global with_legacy 0 %global dracut_modname 97walinuxagent Name: WALinuxAgent -Version: 2.2.52 -Release: 4%{?dist} +Version: 2.15.0.1 +Release: %autorelease Summary: The Microsoft Azure Linux Agent -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/Azure/%{name} Source0: https://github.com/Azure/%{name}/archive/v%{version}.tar.gz Source1: module-setup.sh -# Python3.9 fixes -Patch0: 0001-update-array.tostring-and-json.loads-without-encodin.patch -Patch1: 0002-handle-py3.9-check-in-future.py.patch -Patch2: 0003-fix-pylint.patch -Patch3: 0004-Fix-distro-resolution-for-RedHat-2083.patch +Patch1: 0001-waagent.service-set-ConditionVirtualization-microsof.patch BuildArch: noarch -BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros BuildRequires: python3-setuptools BuildRequires: python3-distro +BuildRequires: python3-crypt-r + Requires: %name-udev = %version-%release +%if 0%{?fedora} Requires: ntfsprogs +%endif Requires: openssh Requires: openssh-server Requires: openssl Requires: parted -Requires: python3-pyasn1 +# We need to manually require this for now since upstream +# still uses crypt (removed in Python 3.13) +Requires: python3-crypt-r +Requires: iptables +Requires: logrotate BuildRequires: systemd Requires(post): systemd @@ -40,17 +43,6 @@ 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 @@ -58,41 +50,53 @@ Summary: Udev rules for Microsoft Azure Udev rules specific to Microsoft Azure Virtual Machines. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -n %{name}-%{version} -p1 + + +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel + %install -%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --lnx-distro redhat +%pyproject_install +%pyproject_save_files azurelinuxagent + +# Prune files the setup.py installs, but that we don't want. +# +# While the setup.py does try to install configuration files, +# it doesn't place them where we need them so we install them +# explicitly later. +rm -rf %{buildroot}/%{python3_sitelib}/{usr,etc} +rm -rf %{buildroot}/%{python3_sitelib}/tests +rm -rf %{buildroot}/%{python3_sitelib}/__main__.py +rm -rf %{buildroot}/%{python3_sitelib}/__pycache__/__main__*.py* +rm -f %{buildroot}%{_sbindir}/waagent2.0 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}/ +# Install configuration and systemd files for the agent +install -m0644 -D --target-directory=%{buildroot}%{_sysconfdir}/ config/waagent.conf +install -m0644 -D --target-directory=%{buildroot}%{_unitdir}/ init/*.slice +install -m0755 -D bin/waagent %{buildroot}%{_sbindir}/waagent +install -m0644 -D init/redhat/waagent.service %{buildroot}%{_unitdir}/ +install -m0644 -D config/waagent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -rm -rf %{buildroot}/%{python3_sitelib}/tests -rm -rf %{buildroot}/%{python3_sitelib}/__main__.py -rm -rf %{buildroot}/%{python3_sitelib}/__pycache__/__main__*.py* +# Install -udev related files +install -m0644 -D --target-directory=%{buildroot}%{_udevrulesdir}/ config/*.rules +install -m0755 -D --target-directory=%{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname}/ %{SOURCE1} sed -i 's,#!/usr/bin/env python,#!/usr/bin/python3,' %{buildroot}%{_sbindir}/waagent -%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 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 -mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent-extn.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}-extn - -install -m0755 -D -t %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modname}/ %{SOURCE1} %post %systemd_post waagent.service @@ -103,137 +107,21 @@ install -m0755 -D -t %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modnam %postun %systemd_postun_with_restart waagent.service -%files -%doc Changelog LICENSE.txt NOTICE README.md +%files -f %{pyproject_files} +%doc LICENSE.txt NOTICE README.md %ghost %{_localstatedir}/log/waagent.log %dir %attr(0700, root, root) %{_sharedstatedir}/waagent %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-extn -%{_sbindir}/waagent %config(noreplace) %{_sysconfdir}/waagent.conf +%{_sbindir}/waagent %{_unitdir}/waagent.service -%{python3_sitelib}/azurelinuxagent -%{python3_sitelib}/*.egg-info +%{_unitdir}/azure.slice +%{_unitdir}/azure-vmextensions.slice %files udev %{_udevrulesdir}/*.rules %{_prefix}/lib/dracut/modules.d/%{dracut_modname}/*.sh -%if 0%{?with_legacy} -%files legacy -%{_sbindir}/waagent2.0 -%endif %changelog -* Tue Jan 26 2021 Vitaly Kuznetsov - 2.2.52-4 -- Fix distro resolution for RedHat - -* Mon Jan 25 2021 Fedora Release Engineering - 2.2.52-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 15 2021 Vitaly Kuznetsov - 2.2.52-2 -- Add udev rules to initramfs (#1909287) - -* Wed Dec 09 2020 Vitaly Kuznetsov - 2.2.52-1 -- Update to 2.2.52 (#1849923) -- Add not yet upstream patches supporting Python3.9 changes - -* Mon Jul 27 2020 Fedora Release Engineering - 2.2.48.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 09 2020 Vitaly Kuznetsov - 2.2.48.1-1 -- Update to 2.2.48.1 (#1641605) -- Split udev rules to a separate subpackage (#1748432) - -* Tue May 26 2020 Miro Hrončok - 2.2.46-2 -- Rebuilt for Python 3.9 - -* Wed Apr 15 2020 Vitaly Kuznetsov - 2.2.46-1 -- Update to 2.2.46 - -* Tue Jan 28 2020 Fedora Release Engineering - 2.2.40-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 2.2.40-6 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Wed Aug 21 2019 Miro Hrončok - 2.2.40-5 -- Rebuilt for Python 3.8 - -* Wed Aug 21 2019 Vitaly Kuznetsov - 2.2.40-4 -- Disable Python2 dependent 'legacy' subpackage (#1741029) - -* Mon Aug 19 2019 Miro Hrončok - 2.2.40-3 -- Rebuilt for Python 3.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 2.2.40-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 03 2019 Vitaly Kuznetsov - 2.2.40-1 -- Update to 2.2.40 -- Fix FTBFS in the preparation for Python3.8 (#1705219) - -* Thu Mar 14 2019 Vitaly Kuznetsov - 2.2.38-1 -- Update to 2.2.38 (CVE-2019-0804) - -* Thu Mar 14 2019 Vitaly Kuznetsov - 2.2.37-1 -- Update to 2.2.37 - -* Thu Jan 31 2019 Fedora Release Engineering - 2.2.32-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Sep 20 2018 Vitaly Kuznetsov - 2.2.32-1 -- Update to 2.2.32.2 - -* Thu Jul 12 2018 Fedora Release Engineering - 2.2.25-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 2.2.25-3 -- Rebuilt for Python 3.7 - -* Wed Apr 25 2018 Vitaly Kuznetsov - 2.2.25-2 -- Move net-tools dependency to WALinuxAgent-legacy (#1106781) - -* Mon Apr 16 2018 Vitaly Kuznetsov - 2.2.25-1 -- Update to 2.2.25 -- Switch to Python3 -- Legacy subpackage with waagent2.0 supporting old extensions - -* Wed Feb 28 2018 Iryna Shcherbina - 2.0.18-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.0.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.0.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Apr 02 2016 Scott K Logan - 2.0.18-1 -- Update to 2.0.18 - -* Wed Feb 03 2016 Fedora Release Engineering - 2.0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jul 02 2015 Scott K Logan - 2.0.14-1 -- Update to 2.0.14 - -* Tue Jun 16 2015 Fedora Release Engineering - 2.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jun 01 2015 Scott K Logan - 2.0.13-1 -- Update to 2.0.13 - -* Thu Apr 02 2015 Scott K Logan - 2.0.12-1 -- Update to 2.0.12-Oracle - -* Sat Jan 10 2015 Scott K Logan - 2.0.11-2 -- Use systemd for rhel7 -- Own logrotate.d -- Fix python2-devel dep - -* Sat Dec 20 2014 Scott K Logan - 2.0.11-1 -- Initial package +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..dd33a5c --- /dev/null +++ b/changelog @@ -0,0 +1,202 @@ +* Wed Jun 12 2024 Jeremy Cline - 2.11.1.4-1 +- Bump to upstream release v2.11.1.4 +- Fix build for Python 3.13 + +* Fri Jun 07 2024 Python Maint - 2.10.0.8-3 +- Rebuilt for Python 3.13 + +* Wed May 08 2024 Jeremy Cline - 2.10.0.8-2 +- Add the udev dependencies to the dracut module + +* Thu Apr 04 2024 Vitaly Kuznetsov - 2.10.0.8-1 +- Update to 2.10.0.8 (#2271975) + +* Mon Jan 22 2024 Fedora Release Engineering - 2.9.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.9.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Oct 18 2023 Vitaly Kuznetsov - 2.9.1.1-1 +- Update to 2.9.1.1 (#2232763) + +* Wed Jul 19 2023 Fedora Release Engineering - 2.9.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 2.9.0.4-3 +- Rebuilt for Python 3.12 + +* Tue May 30 2023 Vitaly Kuznetsov - 2.9.0.4-2 +- Switch to SPDX identifiers for the license field + +* Mon Mar 13 2023 Vitaly Kuznetsov - 2.9.0.4-1 +- Update to 2.9.0.4 (#2177333) + +* Fri Jan 20 2023 Dusty Mabe - 2.8.0.11-3 +- Move module-setup.sh into git + +* Wed Jan 18 2023 Fedora Release Engineering - 2.8.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Oct 31 2022 Vitaly Kuznetsov - 2.8.0.11-1 +- Update to 2.8.0.11 (#2128547) + +* Tue Oct 18 2022 Chris Patterson - 2.7.3.0-2 +- Add ConditionVirtualization=|microsoft triggering condition + +* Wed Aug 03 2022 Vitaly Kuznetsov - 2.7.3.0-1 +- Update to 2.7.3.0 (#2110155) + +* Wed Jul 20 2022 Fedora Release Engineering - 2.7.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 30 2022 Vitaly Kuznetsov - 2.7.1.0-1 +- Update to 2.7.1.0 (#2097244) + +* Mon Jun 13 2022 Python Maint - 2.7.0.6-2 +- Rebuilt for Python 3.11 + +* Fri Apr 22 2022 Vitaly Kuznetsov - 2.7.0.6-1 +- Update to 2.7.0.6 (#2040980) + +* Wed Jan 19 2022 Fedora Release Engineering - 2.5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 03 2022 Vitaly Kuznetsov - 2.5.0.2-1 +- Update to 2.5.0.2 (#2008699) + +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 19 2021 Vitaly Kuznetsov - 2.3.1.1-1 +- Update to 2.3.1.1 (#1982512) +- Require iptables for setting up persistent firewall rules + +* Tue Jun 15 2021 Vitaly Kuznetsov - 2.3.0.2-1 +- Update to 2.3.0.2 (#1971116) + +* Fri Jun 04 2021 Python Maint - 2.2.54.2-2 +- Rebuilt for Python 3.10 + +* Fri May 21 2021 Vitaly Kuznetsov - 2.2.54.2-1 +- Update to 2.2.54.2 (#1916966) + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.52-6 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Fri Feb 19 2021 Vitaly Kuznetsov - 2.2.52-5 +- Require ntfsprogs on Fedora only + +* Tue Jan 26 2021 Vitaly Kuznetsov - 2.2.52-4 +- Fix distro resolution for RedHat + +* Mon Jan 25 2021 Fedora Release Engineering - 2.2.52-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Vitaly Kuznetsov - 2.2.52-2 +- Add udev rules to initramfs (#1909287) + +* Wed Dec 09 2020 Vitaly Kuznetsov - 2.2.52-1 +- Update to 2.2.52 (#1849923) +- Add not yet upstream patches supporting Python3.9 changes + +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.48.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 09 2020 Vitaly Kuznetsov - 2.2.48.1-1 +- Update to 2.2.48.1 (#1641605) +- Split udev rules to a separate subpackage (#1748432) + +* Tue May 26 2020 Miro Hrončok - 2.2.46-2 +- Rebuilt for Python 3.9 + +* Wed Apr 15 2020 Vitaly Kuznetsov - 2.2.46-1 +- Update to 2.2.46 + +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.40-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 2.2.40-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Wed Aug 21 2019 Miro Hrončok - 2.2.40-5 +- Rebuilt for Python 3.8 + +* Wed Aug 21 2019 Vitaly Kuznetsov - 2.2.40-4 +- Disable Python2 dependent 'legacy' subpackage (#1741029) + +* Mon Aug 19 2019 Miro Hrončok - 2.2.40-3 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.40-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jun 03 2019 Vitaly Kuznetsov - 2.2.40-1 +- Update to 2.2.40 +- Fix FTBFS in the preparation for Python3.8 (#1705219) + +* Thu Mar 14 2019 Vitaly Kuznetsov - 2.2.38-1 +- Update to 2.2.38 (CVE-2019-0804) + +* Thu Mar 14 2019 Vitaly Kuznetsov - 2.2.37-1 +- Update to 2.2.37 + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Sep 20 2018 Vitaly Kuznetsov - 2.2.32-1 +- Update to 2.2.32.2 + +* Thu Jul 12 2018 Fedora Release Engineering - 2.2.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.2.25-3 +- Rebuilt for Python 3.7 + +* Wed Apr 25 2018 Vitaly Kuznetsov - 2.2.25-2 +- Move net-tools dependency to WALinuxAgent-legacy (#1106781) + +* Mon Apr 16 2018 Vitaly Kuznetsov - 2.2.25-1 +- Update to 2.2.25 +- Switch to Python3 +- Legacy subpackage with waagent2.0 supporting old extensions + +* Wed Feb 28 2018 Iryna Shcherbina - 2.0.18-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Apr 02 2016 Scott K Logan - 2.0.18-1 +- Update to 2.0.18 + +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jul 02 2015 Scott K Logan - 2.0.14-1 +- Update to 2.0.14 + +* Tue Jun 16 2015 Fedora Release Engineering - 2.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Jun 01 2015 Scott K Logan - 2.0.13-1 +- Update to 2.0.13 + +* Thu Apr 02 2015 Scott K Logan - 2.0.12-1 +- Update to 2.0.12-Oracle + +* Sat Jan 10 2015 Scott K Logan - 2.0.11-2 +- Use systemd for rhel7 +- Own logrotate.d +- Fix python2-devel dep + +* Sat Dec 20 2014 Scott K Logan - 2.0.11-1 +- Initial package diff --git a/module-setup.sh b/module-setup.sh new file mode 100644 index 0000000..9d29893 --- /dev/null +++ b/module-setup.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 chmod cut readlink + inst_rules 66-azure-storage.rules 99-azure-product-uuid.rules +} diff --git a/sources b/sources index 0a8ac9b..35a2aed 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (v2.2.52.tar.gz) = b8d71cb4873b7e9cf92c755884bb104e5e37f171fbdae3d702b2b005a461b8f5447c9dcc80037ff0bfe9950ffbcb901e023e0bda918f481f5336c8ecbaecbbcc -SHA512 (module-setup.sh) = c05ed7395006c78bae1a7727b64c4b00a14e2c37e0d8a6ae7c05905a86d4ba638a2b98e4642ecd9a98db38298ff99f4877f900965a97f933b9aa034488835394 +SHA512 (v2.15.0.1.tar.gz) = dc9398bd5a100f43f7921e0503ef288d632f0e494f2cc9a149e181634ef68da96bb743dda8378b93bbc538f82d43bf59571b7049918dbe2770495001ae80ab79