From 4df30b7983c84968f85a4a5eb810ddaf95d517b1 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Tue, 7 Jun 2016 18:06:13 -0700
Subject: [PATCH] app-emulation/wa-linux-agent: bump to v2.1.3

---
 .../app-emulation/wa-linux-agent/Manifest     |  2 +-
 .../wa-linux-agent/files/waagent.conf         | 39 ++++++++++++++++++-
 ....16.ebuild => wa-linux-agent-2.1.3.ebuild} | 18 ++++-----
 3 files changed, 48 insertions(+), 11 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/{wa-linux-agent-2.0.16.ebuild => wa-linux-agent-2.1.3.ebuild} (58%)

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 4dce1b529f..c21d21b35a 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 WALinuxAgent-2.0.16.tar.gz 98500 SHA256 a54126516e90a8b1c342e8357bf2f01ca96fc6d5b8d817470f5186618fe979d0 SHA512 3ecbd987d1b79f4f84188a15efabbf1e130448db20ecaaf31b84fb8eb470c2ff0d279cf85afd5bc815df9e7d67e14acb9e4189e469b3be28dcf9aadb3772a42a WHIRLPOOL 5653a4a6b0b3d7599e75d3ca040d18511aee7d7bc9c98af802e59da115d0a9c213265562f7347d55f7f8a7d3f23113f4ce92f725a71ae918ed70979a701952e0
+DIST wa-linux-agent-2.1.3.tar.gz 156793 SHA256 8321fa7c8a1463817ebff23feed7a7005997671d14141780fe74331cfce75d2d SHA512 31ce930a181726dcdfc097642c1487f0dbace06278aae588b64c590b362cc9e0285b6a0ab40c9ae9f1cee6a89d6f451087d13e446b5b42cd3353e00f968cfcf8 WHIRLPOOL d50afef20b38911c9afe9967c4ae65a09dcb2bbc327cce19a383ab9fd5729730e20a8449b6485a202eb28095c68b8de8c968b554ea5db2868799f656b545db22
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/waagent.conf b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/waagent.conf
index ecfa378df0..9d9fd6739f 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/waagent.conf
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/waagent.conf
@@ -1,5 +1,5 @@
 #
-# Windows Azure Linux Agent Configuration
+# Microsoft Azure Linux Agent Configuration
 #
 
 # Specified program is invoked with the argument "Ready" when we report ready status
@@ -28,6 +28,21 @@ Provisioning.SshHostKeyPairType=ed25519
 # Monitor host name changes and publish changes via DHCP requests.
 Provisioning.MonitorHostName=y
 
+# Decode CustomData from Base64.
+Provisioning.DecodeCustomData=n
+
+# Execute CustomData after provisioning.
+Provisioning.ExecuteCustomData=n
+
+# Algorithm used by crypt when generating password hash.
+#Provisioning.PasswordCryptId=6
+
+# Length of random salt used when generating password hash.
+#Provisioning.PasswordCryptSaltLength=10
+
+# Allow reset password of sys user
+Provisioning.AllowResetSysUser=n
+
 # Format if unformatted. If 'n', resource disk will not be mounted.
 ResourceDisk.Format=y
 
@@ -55,3 +70,25 @@ OS.RootDeviceScsiTimeout=300
 
 # If "None", the system default version is used.
 OS.OpensslPath=None
+
+# If set, agent will use proxy server to access internet
+#HttpProxy.Host=None
+#HttpProxy.Port=None
+
+# Detect Scvmm environment, default is n
+# DetectScvmmEnv=n
+
+#
+# Lib.Dir=/var/lib/waagent
+
+#
+# DVD.MountPoint=/mnt/cdrom/secure
+
+#
+# Pid.File=/var/run/waagent.pid
+
+#
+# Extension.LogDir=/var/log/azure
+
+#
+# Home.Dir=/home
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.16.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3.ebuild
similarity index 58%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.16.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3.ebuild
index 40c8d7a9d5..aa5ef02a44 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.16.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3.ebuild
@@ -1,17 +1,12 @@
 # Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-MY_PN="WALinuxAgent"
-MY_PV="WALinuxAgent-${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
+EAPI=6
 
 DESCRIPTION="Windows Azure Linux Agent"
 HOMEPAGE="https://github.com/Azure/WALinuxAgent"
 KEYWORDS="amd64"
-SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,10 +14,15 @@ IUSE=""
 
 RDEPEND="dev-lang/python-oem"
 
+S="${WORKDIR}/WALinuxAgent-${PV}"
+
 src_install() {
 	into "/usr/share/oem"
-	dobin "${S}"/waagent
+	dobin "${S}/bin/waagent"
+
+	insinto "/usr/share/oem/python/$(get_libdir)/python2.7/site-packages"
+	doins -r "${S}/azurelinuxagent/"
 
 	insinto "/usr/share/oem"
-	doins "${FILESDIR}"/waagent.conf
+	doins "${FILESDIR}/waagent.conf"
 }