From 43cff3c3f4962d30b3cc14a370d1b94d1c773ce9 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 3 Feb 2017 12:39:51 -0800 Subject: [PATCH 1/2] app-emulation/wa-linux-agent: bump to v2.2.4 --- .../app-emulation/wa-linux-agent/Manifest | 2 +- .../0001-fix-sudo-asking-for-password.patch | 22 ------------------- ...-r2.ebuild => wa-linux-agent-2.2.4.ebuild} | 4 ---- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch rename sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/{wa-linux-agent-2.1.3-r2.ebuild => wa-linux-agent-2.2.4.ebuild} (90%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest index c21d21b35a..aeaf2d0daa 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest @@ -1 +1 @@ -DIST wa-linux-agent-2.1.3.tar.gz 156793 SHA256 8321fa7c8a1463817ebff23feed7a7005997671d14141780fe74331cfce75d2d SHA512 31ce930a181726dcdfc097642c1487f0dbace06278aae588b64c590b362cc9e0285b6a0ab40c9ae9f1cee6a89d6f451087d13e446b5b42cd3353e00f968cfcf8 WHIRLPOOL d50afef20b38911c9afe9967c4ae65a09dcb2bbc327cce19a383ab9fd5729730e20a8449b6485a202eb28095c68b8de8c968b554ea5db2868799f656b545db22 +DIST wa-linux-agent-2.2.4.tar.gz 621451 SHA256 ff6c25df41a5e159488182272670b3678bdd1611228c866766ea31b05a8a8195 SHA512 637fc40c5e40e311a528ec29761744f12250345a090509dbfcdd523072410881b8969da69c3eee2a2208bd139309babb039651d25b3de5a280427c1aedbf8546 WHIRLPOOL 71e13040172e9b62e5f3f6157427fa81263a2b23e49c8c851efe8e58bb9ac07f27fa08b91926c356323fee92d1eacaf387c6aefd07d4c22a1d89a24577d4f86d diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch deleted file mode 100644 index f6a6ed5adf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0dc86a2df78b6c80de0533fcfac14a49716f5435 Mon Sep 17 00:00:00 2001 -From: Eric Williams -Date: Sun, 19 Jun 2016 10:28:05 +0100 -Subject: [PATCH] Fix sudo asking for password - ---- - azurelinuxagent/distro/default/osutil.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/azurelinuxagent/distro/default/osutil.py b/azurelinuxagent/distro/default/osutil.py -index 18ab2ba..1685f31 100644 ---- a/azurelinuxagent/distro/default/osutil.py -+++ b/azurelinuxagent/distro/default/osutil.py -@@ -124,7 +124,7 @@ def conf_sudoer(self, username, nopasswd): - fileutil.append_file('/etc/sudoers', sudoers) - sudoer = None - if nopasswd: -- sudoer = "{0} ALL = (ALL) NOPASSWD\n".format(username) -+ sudoer = "{0} ALL = (ALL) NOPASSWD: ALL\n".format(username) - else: - sudoer = "{0} ALL = (ALL) ALL\n".format(username) - fileutil.append_file('/etc/sudoers.d/waagent', sudoer) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.2.4.ebuild similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.2.4.ebuild index 8aa6a1f028..aa5ef02a44 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.2.4.ebuild @@ -14,10 +14,6 @@ IUSE="" RDEPEND="dev-lang/python-oem" -PATCHES=( - "${FILESDIR}/0001-fix-sudo-asking-for-password.patch" -) - S="${WORKDIR}/WALinuxAgent-${PV}" src_install() { From 6c714105c556db96c1882b06d13a57253446e7fd Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 3 Feb 2017 13:16:38 -0800 Subject: [PATCH 2/2] coreos-base/oem-azure: bump to v2.2.4 --- .../{oem-azure-2.1.3-r1.ebuild => oem-azure-2.2.4.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.1.3-r1.ebuild => oem-azure-2.2.4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.1.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.1.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4.ebuild