From 6a6ab1f9f3b73da91413e4784d61f1f45c827142 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 30 2017 23:01:58 +0000 Subject: import WALinuxAgent-2.2.18-1.el7 --- 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-Remove-FIPS-setting-from-the-default-config.patch b/SOURCES/0002-Remove-FIPS-setting-from-the-default-config.patch index 2eb830f..abc38ad 100644 --- a/SOURCES/0002-Remove-FIPS-setting-from-the-default-config.patch +++ b/SOURCES/0002-Remove-FIPS-setting-from-the-default-config.patch @@ -1,4 +1,4 @@ -From f3381589f2f192221963b06645a46d6264744901 Mon Sep 17 00:00:00 2001 +From 38713be8e63355442dacb6baed8d1ffe49315cb2 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 @@ -10,19 +10,19 @@ O-Subject: [RHEL-6/RHEL-7 WALinuxAgent PATCH] Remove FIPS setting from the defau Bugzilla: 1467553 RH-Acked-by: Vitaly Kuznetsov RH-Acked-by: Mohammed Gamal - -From: Miroslav Rezanina +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 +(cherry picked from commit a48b6136e955ae6d7d6d21564f614dac6347d34e) --- config/waagent.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/waagent.conf b/config/waagent.conf -index b1b1ba3..ff42861 100644 +index 99f54d6..d5b75b9 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 66181d1..dd5d3c6 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,9 +12,9 @@ Summary: Microsoft Azure Linux Agent Name: %{name} Version: %{version} -Release: 1%{?dist} -Source0: WALinuxAgent-2.2.14.tar.gz -Patch1: 0002-Remove-FIPS-setting-from-the-default-config.patch +Release: %{release}%{?dist} +Source0: WALinuxAgent-2.2.18.tar.gz +Patch0002: 0002-Remove-FIPS-setting-from-the-default-config.patch License: Apache License Version 2.0 Group: Development/Libraries @@ -69,7 +69,7 @@ images that are built to run in the Azure environment. %prep %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} -%patch1 -p1 +%patch0002 -p1 %build python setup.py build @@ -118,6 +118,12 @@ fi %defattr(-,root,root) %changelog +* Tue Oct 10 2017 Miroslav Rezanina - 2.2.18-1.el7 +- Rebase to 2.2.18 [bz#1491873] +- Resolves: bz#1491873 + ([WALA]Request to package WALA 2.2.18 into RHEL 7 Repo) + + * 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] @@ -126,7 +132,6 @@ fi - 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