From 67b14a463a895a193a7e697725c9f1f9556d5aa8 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 2 May 2016 20:39:10 -0700
Subject: [PATCH 1/2] coreos-init: fix ebuild name/symlink

Previous update renamed the live ebuild instead of symlink by mistake.
---
 .../coreos-init/coreos-init-0.0.1-r124.ebuild |  1 -
 .../coreos-init/coreos-init-0.0.1-r125.ebuild | 57 +------------------
 .../coreos-init/coreos-init-9999.ebuild       | 56 ++++++++++++++++++
 3 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r124.ebuild
 mode change 100644 => 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r124.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r124.ebuild
deleted file mode 120000
index df02d424d0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r124.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-coreos-init-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild
deleted file mode 100644
index 0ba6d14a75..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="coreos/init"
-CROS_WORKON_LOCALNAME="init"
-CROS_WORKON_REPO="git://github.com"
-
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-else
-	CROS_WORKON_COMMIT="d05fab1c8e5878129c3e365977f1a57fd11216a6"
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-inherit cros-workon systemd
-
-DESCRIPTION="Init scripts for CoreOS"
-HOMEPAGE="http://www.coreos.com/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test symlink-usr"
-
-REQUIRED_USE="symlink-usr"
-
-# Daemons we enable here must installed during build/install in addition to
-# during runtime so the systemd unit enable step works.
-DEPEND="
-	app-emulation/docker
-	net-misc/openssh
-	net-nds/rpcbind
-	!<dev-db/etcd-0.0.1-r6
-	!coreos-base/oem-service
-	test? ( dev-lang/python:2.7 )
-	"
-RDEPEND="${DEPEND}
-	app-admin/logrotate
-	sys-block/parted
-	sys-apps/gptfdisk
-	>=sys-apps/systemd-207-r5
-	>=coreos-base/coreos-cloudinit-0.1.2-r5
-	"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Enable some sockets that aren't enabled by their own ebuilds.
-	systemd_enable_service sockets.target sshd.socket
-	systemd_enable_service sockets.target docker.socket
-
-	# Enable some services that aren't enabled elsewhere.
-	systemd_enable_service rpcbind.target rpcbind.service
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild
new file mode 120000
index 0000000000..df02d424d0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild
@@ -0,0 +1 @@
+coreos-init-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
new file mode 100644
index 0000000000..0ba6d14a75
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+CROS_WORKON_PROJECT="coreos/init"
+CROS_WORKON_LOCALNAME="init"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+else
+	CROS_WORKON_COMMIT="d05fab1c8e5878129c3e365977f1a57fd11216a6"
+	KEYWORDS="amd64 arm arm64 x86"
+fi
+
+inherit cros-workon systemd
+
+DESCRIPTION="Init scripts for CoreOS"
+HOMEPAGE="http://www.coreos.com/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test symlink-usr"
+
+REQUIRED_USE="symlink-usr"
+
+# Daemons we enable here must installed during build/install in addition to
+# during runtime so the systemd unit enable step works.
+DEPEND="
+	app-emulation/docker
+	net-misc/openssh
+	net-nds/rpcbind
+	!<dev-db/etcd-0.0.1-r6
+	!coreos-base/oem-service
+	test? ( dev-lang/python:2.7 )
+	"
+RDEPEND="${DEPEND}
+	app-admin/logrotate
+	sys-block/parted
+	sys-apps/gptfdisk
+	>=sys-apps/systemd-207-r5
+	>=coreos-base/coreos-cloudinit-0.1.2-r5
+	"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Enable some sockets that aren't enabled by their own ebuilds.
+	systemd_enable_service sockets.target sshd.socket
+	systemd_enable_service sockets.target docker.socket
+
+	# Enable some services that aren't enabled elsewhere.
+	systemd_enable_service rpcbind.target rpcbind.service
+}

From 0e41fcd02c9e1260ef5f3e39dc6e0f950689cce5 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 2 May 2016 20:40:40 -0700
Subject: [PATCH 2/2] coreos-init: update coreos-install to use HTTPS

---
 ...eos-init-0.0.1-r125.ebuild => coreos-init-0.0.1-r126.ebuild} | 0
 .../coreos-base/coreos-init/coreos-init-9999.ebuild             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r125.ebuild => coreos-init-0.0.1-r126.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r126.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r125.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r126.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index 0ba6d14a75..c693a7563b 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="d05fab1c8e5878129c3e365977f1a57fd11216a6"
+	CROS_WORKON_COMMIT="902f8944d18d7e2df38034168f8154d2b319f3b7"
 	KEYWORDS="amd64 arm arm64 x86"
 fi