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-Remove-FIPS-setting-from-the-default-config.patch b/SOURCES/0002-Remove-FIPS-setting-from-the-default-config.patch new file mode 100644 index 0000000..2eb830f --- /dev/null +++ b/SOURCES/0002-Remove-FIPS-setting-from-the-default-config.patch @@ -0,0 +1,40 @@ +From f3381589f2f192221963b06645a46d6264744901 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: 1467553 +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Mohammed Gamal + +From: Miroslav Rezanina + +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 b1b1ba3..ff42861 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 bd2b074..66181d1 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,11 +9,12 @@ %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 +Release: 1%{?dist} +Source0: WALinuxAgent-2.2.14.tar.gz +Patch1: 0002-Remove-FIPS-setting-from-the-default-config.patch License: Apache License Version 2.0 Group: Development/Libraries @@ -68,6 +69,7 @@ images that are built to run in the Azure environment. %prep %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} +%patch1 -p1 %build python setup.py build @@ -116,7 +118,16 @@ fi %defattr(-,root,root) %changelog -* Wed Apr 26 2017 Miroslav Rezanina - 2.2.4-10.el7 +* Tue Jul 04 2017 Miroslav Rezanina - 2.2.14-1.el7 +- Rebase to 2.2.14 [bz#1451172] +- wla-Remove-FIPS-setting-from-the-default-config.patch [bz#1467553] +- Resolves: bz#1451172 + ([WALA] Request to package WALA 2.2.14 into RHEL 7 Repo) +- Resolves: bz#1467553 + ([WALA] Remove FIPS from default config in WALA-2.2.14) + + +* Wed Apr 26 2017 Miroslav Rezanina - 2.2.10-1.el7 - Rebase to 2.2.10 [bz#1443425] - Resolves: bz#1443425 ([WALA]Request to package WALA 2.2.10 into RHEL 7 Repo)