From 7a051c917d85a5032f60cddccdb6784e67c2c609 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 30 2017 14:30:59 +0000 Subject: import WALinuxAgent-2.2.18-1.el6 --- diff --git a/.WALinuxAgent.metadata b/.WALinuxAgent.metadata index 255e84c..6d4a2e1 100644 --- a/.WALinuxAgent.metadata +++ b/.WALinuxAgent.metadata @@ -1 +1 @@ -f417009479ea7168ee0f2daa38328c167b4f874b SOURCES/WALinuxAgent-2.2.14.tar.gz +291fa8b68cb1486d4ea9dca2e1ae337ee2e120eb SOURCES/WALinuxAgent-2.2.18.tar.gz diff --git a/.gitignore b/.gitignore index aafff59..485e0a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/WALinuxAgent-2.2.14.tar.gz +SOURCES/WALinuxAgent-2.2.18.tar.gz diff --git a/SOURCES/0002-Disable-auto-update.patch b/SOURCES/0002-Disable-auto-update.patch index 2718b74..53858d4 100644 --- a/SOURCES/0002-Disable-auto-update.patch +++ b/SOURCES/0002-Disable-auto-update.patch @@ -1,4 +1,4 @@ -From ec474c3b131c92796ecb3659b7b25ae2b70b0069 Mon Sep 17 00:00:00 2001 +From 5039a85a17bca23036d72c41f55e2281d1a419e9 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 8 Feb 2017 11:23:29 +0100 Subject: Disable auto update @@ -9,7 +9,7 @@ Subject: Disable auto update 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/waagent.conf b/config/waagent.conf -index b1b1ba3..e31c618 100644 +index 99f54d6..6ce49e7 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -95,7 +95,7 @@ OS.SshDir=/etc/ssh diff --git a/SOURCES/0003-Disable-auto-update-when-upgrading.patch b/SOURCES/0003-Disable-auto-update-when-upgrading.patch index 9c90629..98ee350 100644 --- a/SOURCES/0003-Disable-auto-update-when-upgrading.patch +++ b/SOURCES/0003-Disable-auto-update-when-upgrading.patch @@ -1,4 +1,4 @@ -From 03378df71657bbeeb98d4167c490d2e6c2e17af1 Mon Sep 17 00:00:00 2001 +From 7a230d379d0ab047b63c5220e2fe103c1f56b7eb Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 8 Feb 2017 11:25:26 +0100 Subject: Disable auto update when upgrading @@ -9,10 +9,10 @@ Subject: Disable auto update when upgrading 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurelinuxagent/common/conf.py b/azurelinuxagent/common/conf.py -index 5422784..b52769c 100644 +index 75a0248..39a1c7d 100644 --- a/azurelinuxagent/common/conf.py +++ b/azurelinuxagent/common/conf.py -@@ -232,7 +232,7 @@ def get_autoupdate_gafamily(conf=__conf__): +@@ -311,7 +311,7 @@ def get_autoupdate_gafamily(conf=__conf__): def get_autoupdate_enabled(conf=__conf__): diff --git a/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch b/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch index 9668f1a..3cb8f6d 100644 --- a/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch +++ b/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch @@ -1,4 +1,4 @@ -From 35acfe30ef0b5ab48cb4c9d1d61ed1db1229f083 Mon Sep 17 00:00:00 2001 +From ef5a3935cc5e1ec734088c283c878af1291c5915 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 4 Jul 2017 08:33:29 +0200 Subject: Remove FIPS setting from the default config @@ -21,7 +21,7 @@ Signed-off-by: Miroslav Rezanina 1 file changed, 3 deletions(-) diff --git a/config/waagent.conf b/config/waagent.conf -index e31c618..ecdb5bf 100644 +index 6ce49e7..bbd88b6 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -57,9 +57,6 @@ ResourceDisk.MountOptions=None diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index aee5030..47160eb 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -1,6 +1,6 @@ %define name WALinuxAgent -%define version 2.2.14 -%define unmangled_version 2.2.14 +%define version 2.2.18 +%define unmangled_version 2.2.18 %define release 1 %if 0%{?rhel} < 7 @@ -12,11 +12,11 @@ Summary: Microsoft Azure Linux Agent Name: %{name} Version: %{version} -Release: 1%{?dist} -Source0: WALinuxAgent-2.2.14.tar.gz -Patch1: 0002-Disable-auto-update.patch -Patch2: 0003-Disable-auto-update-when-upgrading.patch -Patch3: 0004-Remove-FIPS-setting-from-the-default-config.patch +Release: %{release}%{?dist} +Source0: WALinuxAgent-2.2.18.tar.gz +Patch0002: 0002-Disable-auto-update.patch +Patch0003: 0003-Disable-auto-update-when-upgrading.patch +Patch0004: 0004-Remove-FIPS-setting-from-the-default-config.patch License: Apache License Version 2.0 Group: Development/Libraries @@ -71,9 +71,9 @@ images that are built to run in the Azure environment. %prep %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch0002 -p1 +%patch0003 -p1 +%patch0004 -p1 %build python setup.py build @@ -122,6 +122,11 @@ fi %defattr(-,root,root) %changelog +* Tue Oct 10 2017 Miroslav Rezanina - 2.2.18-1.el6 +- Rebase to 2.2.18 [bz#1491874] +- Resolves: bz#1491874 + ([WALA]Request to package WALA 2.2.18 into RHEL 6 Repo) + * Tue Jul 04 2017 Miroslav Rezanina - 2.2.14-1.el6 - Rebase to 2.2.14 (bz#1451174) - wla-Remove-FIPS-setting-from-the-default-config.patch [bz#1467559] @@ -135,7 +140,7 @@ fi - Resolves: bz#1443427 ([WALA]Request to package WALA 2.2.10 into RHEL 6 Repo) -* Wed Mar 01 2017 Miroslav Rezanina - 2.2.4-1 +* Mon Mar 01 2017 Miroslav Rezanina - 2.2.4-1 - Rebase to 2.2.4 [bz#1419200] - Resolves: bz#1419200 WALA 2.2.4