From 9440a577997dcef7f893bbf2b31f33b2e8a27f26 Mon Sep 17 00:00:00 2001
From: Greg Steuck <gnezdo+github@google.com>
Date: Mon, 3 Sep 2018 12:49:30 -0700
Subject: [PATCH 1/5] Document the packages to install on Debian to build
 OpenBSD image.

---
 env/openbsd-amd64/README | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/env/openbsd-amd64/README b/env/openbsd-amd64/README
index f54a076c8d..51b388b3c3 100644
--- a/env/openbsd-amd64/README
+++ b/env/openbsd-amd64/README
@@ -1,7 +1,8 @@
 make.bash creates a Google Compute Engine VM image to run the Go
 OpenBSD builder, booting up to run the buildlet.
 
-make.bash should be run on a Linux box with qemu.
+make.bash should be run on a Linux box with expect and qemu.
+Debian packages: expect qemu-utils qemu-system-x86.
 
 After it completes, it creates a file openbsd-amd64-gce.tar.gz
 

From 317879367da208665bd2aa2ef2e2a184eb198203 Mon Sep 17 00:00:00 2001
From: Greg Steuck <gnezdo+github@google.com>
Date: Mon, 3 Sep 2018 12:52:08 -0700
Subject: [PATCH 2/5] Resolve ftp Permission denied due to install running it
 as unpriv.

---
 env/openbsd-amd64/make.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash
index b1457b8039..9e7d12d25e 100755
--- a/env/openbsd-amd64/make.bash
+++ b/env/openbsd-amd64/make.bash
@@ -144,6 +144,7 @@ send "s\n"
 expect timeout { exit 1 } "# "
 send "mount /dev/cd0c /mnt\n"
 send "cp /mnt/auto_install.conf /mnt/disklabel.template /\n"
+send "chmod a+r /disklabel.template\n"
 send "umount /mnt\n"
 send "exit\n"
 

From 66bd7ba97b10671c4a76b3be941afa1b9ef292a4 Mon Sep 17 00:00:00 2001
From: Greg Steuck <gnezdo+github@google.com>
Date: Mon, 3 Sep 2018 12:53:20 -0700
Subject: [PATCH 3/5] Use https instead of http.

---
 env/openbsd-amd64/make.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash
index 9e7d12d25e..f65c089c6b 100755
--- a/env/openbsd-amd64/make.bash
+++ b/env/openbsd-amd64/make.bash
@@ -23,7 +23,7 @@ readonly ISO="install${RELNO}-${ARCH}.iso"
 readonly ISO_PATCHED="install${RELNO}-${ARCH}-patched.iso"
 
 if [[ ! -f "${ISO}" ]]; then
-  curl -o "${ISO}" "http://${MIRROR}/pub/OpenBSD/${VERSION}/${ARCH}/install${RELNO}.iso"
+  curl -o "${ISO}" "https://${MIRROR}/pub/OpenBSD/${VERSION}/${ARCH}/install${RELNO}.iso"
 fi
 
 function cleanup() {

From 3e19370ce03ae0ecbf247deb598a76424ffe44e2 Mon Sep 17 00:00:00 2001
From: Greg Steuck <gnezdo+github@google.com>
Date: Mon, 3 Sep 2018 14:27:32 -0700
Subject: [PATCH 4/5] Use OpenBSD 6.3.

---
 env/openbsd-amd64/make.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash
index f65c089c6b..8b5890fd2f 100755
--- a/env/openbsd-amd64/make.bash
+++ b/env/openbsd-amd64/make.bash
@@ -8,7 +8,7 @@
 set -e
 set -u
 
-readonly VERSION="6.2"
+readonly VERSION="6.3"
 readonly RELNO="${VERSION/./}"
 
 readonly ARCH="${ARCH:-amd64}"

From 99fd276d45dc7ad456bfee89e6d6e4ac92c11ef6 Mon Sep 17 00:00:00 2001
From: Greg Steuck <gnezdo+github@google.com>
Date: Mon, 3 Sep 2018 22:30:11 -0700
Subject: [PATCH 5/5] Apply the published patches.

---
 env/openbsd-amd64/make.bash | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash
index 8b5890fd2f..95f1ea7972 100755
--- a/env/openbsd-amd64/make.bash
+++ b/env/openbsd-amd64/make.bash
@@ -32,7 +32,7 @@ function cleanup() {
 	rm -f boot.conf
 	rm -f disk.raw
 	rm -f disklabel.template
-	rm -f etc/rc.local
+	rm -f etc/{installurl,rc.local}
 	rm -f install.site
 	rm -f random.seed
 	rm -f site${RELNO}.tgz
@@ -48,12 +48,15 @@ trap cleanup EXIT INT
 mkdir -p etc
 cat >install.site <<EOF
 #!/bin/sh
-env PKG_PATH=http://${MIRROR}/pub/OpenBSD/${VERSION}/packages/${ARCH} \
-  pkg_add -iv bash curl git
+syspatch
+pkg_add -iv bash curl git
 
 echo 'set tty com0' > boot.conf
 EOF
 
+cat >etc/installurl <<EOF
+https://${MIRROR}/pub/OpenBSD
+EOF
 cat >etc/rc.local <<EOF
 (
   set -x
@@ -80,7 +83,7 @@ cat >etc/rc.local <<EOF
 )
 EOF
 chmod +x install.site
-tar -zcvf site${RELNO}.tgz install.site etc/rc.local
+tar -zcvf site${RELNO}.tgz install.site etc/{installurl,rc.local}
 
 # Autoinstall script.
 cat >auto_install.conf <<EOF