From 1100a36a5e83ef583e096e75f8585a88beb48563 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 13 2017 13:32:29 +0000 Subject: import WALinuxAgent-2.2.14-1.el6 --- diff --git a/.WALinuxAgent.metadata b/.WALinuxAgent.metadata index cd51e12..255e84c 100644 --- a/.WALinuxAgent.metadata +++ b/.WALinuxAgent.metadata @@ -1 +1 @@ -a9e512cfbb548d2bc2ef9d8e26bc03eef81b3a67 SOURCES/WALinuxAgent-2.2.10.tar.gz +f417009479ea7168ee0f2daa38328c167b4f874b SOURCES/WALinuxAgent-2.2.14.tar.gz diff --git a/.gitignore b/.gitignore index 4b17f1e..aafff59 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/WALinuxAgent-2.2.10.tar.gz +SOURCES/WALinuxAgent-2.2.14.tar.gz diff --git a/SOURCES/0002-Disable-auto-update.patch b/SOURCES/0002-Disable-auto-update.patch index 9d56bc3..2718b74 100644 --- a/SOURCES/0002-Disable-auto-update.patch +++ b/SOURCES/0002-Disable-auto-update.patch @@ -1,4 +1,4 @@ -From 711e2fa0a8909b59cc05bb9123d7eae46fa10124 Mon Sep 17 00:00:00 2001 +From ec474c3b131c92796ecb3659b7b25ae2b70b0069 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 8 Feb 2017 11:23:29 +0100 Subject: Disable auto update @@ -9,10 +9,10 @@ Subject: Disable auto update 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/waagent.conf b/config/waagent.conf -index 8a69462..77a0c7e 100644 +index b1b1ba3..e31c618 100644 --- a/config/waagent.conf +++ b/config/waagent.conf -@@ -86,7 +86,7 @@ OS.OpensslPath=None +@@ -95,7 +95,7 @@ OS.SshDir=/etc/ssh # OS.EnableRDMA=y # Enable or disable goal state processing auto-update, default is enabled @@ -22,5 +22,5 @@ index 8a69462..77a0c7e 100644 # Determine the update family, this should not be changed # AutoUpdate.GAFamily=Prod -- -2.9.3 +1.8.3.1 diff --git a/SOURCES/0003-Disable-auto-update-when-upgrading.patch b/SOURCES/0003-Disable-auto-update-when-upgrading.patch index 55cc26f..9c90629 100644 --- a/SOURCES/0003-Disable-auto-update-when-upgrading.patch +++ b/SOURCES/0003-Disable-auto-update-when-upgrading.patch @@ -1,4 +1,4 @@ -From e71be24e77938a0c2873d5eec3ac742715c8abe5 Mon Sep 17 00:00:00 2001 +From 03378df71657bbeeb98d4167c490d2e6c2e17af1 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 7911699..c45ec96 100644 +index 5422784..b52769c 100644 --- a/azurelinuxagent/common/conf.py +++ b/azurelinuxagent/common/conf.py -@@ -219,7 +219,7 @@ def get_autoupdate_gafamily(conf=__conf__): +@@ -232,7 +232,7 @@ def get_autoupdate_gafamily(conf=__conf__): def get_autoupdate_enabled(conf=__conf__): @@ -22,5 +22,5 @@ index 7911699..c45ec96 100644 def get_autoupdate_frequency(conf=__conf__): -- -2.9.3 +1.8.3.1 diff --git a/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch b/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch new file mode 100644 index 0000000..9668f1a --- /dev/null +++ b/SOURCES/0004-Remove-FIPS-setting-from-the-default-config.patch @@ -0,0 +1,39 @@ +From 35acfe30ef0b5ab48cb4c9d1d61ed1db1229f083 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 + +RH-Author: Miroslav Rezanina +Message-id: <20170704083329.31138-1-mrezanin@redhat.com> +Patchwork-id: 75701 +O-Subject: [RHEL-6/RHEL-7 WALinuxAgent PATCH] Remove FIPS setting from the default config +Bugzilla: 1467559 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Mohammed Gamal +RH-Acked-by: Eduardo Otubo + +The feature is not fully functional upstream (see BZ#1460671), remove it +from the default config. + +Signed-off-by: Miroslav Rezanina +--- + config/waagent.conf | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/config/waagent.conf b/config/waagent.conf +index e31c618..ecdb5bf 100644 +--- a/config/waagent.conf ++++ b/config/waagent.conf +@@ -57,9 +57,6 @@ ResourceDisk.MountOptions=None + # Enable verbose logging (y|n) + Logs.Verbose=n + +-# Is FIPS enabled +-OS.EnableFIPS=n +- + # Root device timeout in seconds. + OS.RootDeviceScsiTimeout=300 + +-- +1.8.3.1 + diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index c4d8bf2..aee5030 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -1,6 +1,6 @@ %define name WALinuxAgent -%define version 2.2.10 -%define unmangled_version 2.2.10 +%define version 2.2.14 +%define unmangled_version 2.2.14 %define release 1 %if 0%{?rhel} < 7 @@ -9,13 +9,14 @@ %global initsys systemd %endif -Summary: UNKNOWN +Summary: Microsoft Azure Linux Agent Name: %{name} Version: %{version} -Release: %{release}%{?dist} -Source0: WALinuxAgent-2.2.10.tar.gz -Patch0002: 0002-Disable-auto-update.patch -Patch0003: 0003-Disable-auto-update-when-upgrading.patch +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 License: Apache License Version 2.0 Group: Development/Libraries @@ -70,8 +71,9 @@ images that are built to run in the Azure environment. %prep %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} -%patch0002 -p1 -%patch0003 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build python setup.py build @@ -120,6 +122,14 @@ fi %defattr(-,root,root) %changelog +* 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] +- Resolves: bz#1451174 + ([WALA] Request to package WALA 2.2.14 into RHEL 6 Repo) +- Resolves: bz#1467559 + ([WALA] Remove FIPS from default config in WALA-2.2.14) + * Wed Apr 26 2017 Miroslav Rezanina - 2.2.10-1 - Rebase to 2.2.10 [bz#1443427] - Resolves: bz#1443427