Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package packer

After previous release, upstream added three more commit to
handle ABI change of golang-golang-x-crypto-dev.
One was not relevant to debian release, because the files to
patch were removed in DFSG repack. So I backport another two
commits and here's the release.

Enclosed is the debdiff against the package in testing.
Thanks!

unblock packer/0.10.2+dfsg-6
diff -Nru packer-0.10.2+dfsg/debian/changelog 
packer-0.10.2+dfsg/debian/changelog
--- packer-0.10.2+dfsg/debian/changelog 2017-05-15 00:51:19.000000000 +0900
+++ packer-0.10.2+dfsg/debian/changelog 2017-05-26 09:08:48.000000000 +0900
@@ -1,3 +1,11 @@
+packer (0.10.2+dfsg-6) unstable; urgency=medium
+
+  * deb/patches:
+    - Backport two more patches to handle ABI change of
+      golang-golang-x-crypto-dev (Closes: #861282).
+
+ -- Roger Shimizu <rogershim...@gmail.com>  Fri, 26 May 2017 09:08:48 +0900
+
 packer (0.10.2+dfsg-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru packer-0.10.2+dfsg/debian/patches/series 
packer-0.10.2+dfsg/debian/patches/series
--- packer-0.10.2+dfsg/debian/patches/series    2017-05-15 00:47:25.000000000 
+0900
+++ packer-0.10.2+dfsg/debian/patches/series    2017-05-24 00:45:27.000000000 
+0900
@@ -1,2 +1,4 @@
 fix-tails-import-path.patch
 handle-ABI-change-of-golang-golang-x-crypto-dev.patch
+update-ssh-client-usage-for-new-crypto-ssh-version.patch
+Specify-InsecureIgnoreHostKey-for-HostKeyCallback.patch
diff -Nru 
packer-0.10.2+dfsg/debian/patches/Specify-InsecureIgnoreHostKey-for-HostKeyCallback.patch
 
packer-0.10.2+dfsg/debian/patches/Specify-InsecureIgnoreHostKey-for-HostKeyCallback.patch
--- 
packer-0.10.2+dfsg/debian/patches/Specify-InsecureIgnoreHostKey-for-HostKeyCallback.patch
   1970-01-01 09:00:00.000000000 +0900
+++ 
packer-0.10.2+dfsg/debian/patches/Specify-InsecureIgnoreHostKey-for-HostKeyCallback.patch
   2017-05-24 00:44:04.000000000 +0900
@@ -0,0 +1,93 @@
+From: JD Friedrikson <yo...@decompo.site>
+Date: Sat, 20 May 2017 16:17:04 -0400
+Subject: Specify InsecureIgnoreHostKey for HostKeyCallback
+
+[A recent breaking change upstream in Golang's crypto
+library](https://github.com/golang/crypto/commit/e4e2799dd7aab89f583e1d898300d96367750991)
+has broken SSH connectivity for a few builders:
+
+```
+==> qemu: Waiting for SSH to become available...
+2017/05/20 16:23:58 ui: ==> qemu: Waiting for SSH to become available...
+2017/05/20 16:23:58 packer: 2017/05/20 16:23:58 [INFO] Attempting SSH 
connection...
+2017/05/20 16:23:58 packer: 2017/05/20 16:23:58 reconnecting to TCP connection 
for SSH
+2017/05/20 16:23:58 packer: 2017/05/20 16:23:58 handshaking with SSH
+2017/05/20 16:23:58 packer: 2017/05/20 16:23:58 handshake error: ssh: must 
specify HostKeyCallback
+2017/05/20 16:23:58 packer: 2017/05/20 16:23:58 [DEBUG] SSH handshake err: 
ssh: must specify HostKeyCallback
+2017/05/20 16:24:05 packer: 2017/05/20 16:24:05 [INFO] Attempting SSH 
connection...
+2017/05/20 16:24:05 packer: 2017/05/20 16:24:05 reconnecting to TCP connection 
for SSH
+2017/05/20 16:24:05 packer: 2017/05/20 16:24:05 handshaking with SSH
+2017/05/20 16:24:05 packer: 2017/05/20 16:24:05 handshake error: ssh: must 
specify HostKeyCallback
+2017/05/20 16:24:05 packer: 2017/05/20 16:24:05 [DEBUG] SSH handshake err: 
ssh: must specify HostKeyCallback
+```
+
+Specifying HostKeyCallback as insecure should make things work again
+and would make sense for packer's use case.
+
+[cherry-picked a0052fdb687f80ac07e67d7a0f39dcf3a66e32dd with modification]
+---
+ builder/null/ssh.go              | 1 +
+ builder/qemu/ssh.go              | 5 +++--
+ builder/virtualbox/common/ssh.go | 5 +++--
+ builder/vmware/common/ssh.go     | 5 +++--
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/builder/null/ssh.go b/builder/null/ssh.go
+index 483390e..80623f8 100644
+--- a/builder/null/ssh.go
++++ b/builder/null/ssh.go
+@@ -50,6 +50,7 @@ func SSHConfig(username string, password string, 
privateKeyFile string) func(mul
+                                       gossh.KeyboardInteractive(
+                                               
ssh.PasswordKeyboardInteractive(password)),
+                               },
++                              HostKeyCallback: gossh.InsecureIgnoreHostKey(),
+                       }, nil
+               }
+       }
+diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go
+index 498d3fb..63e7e76 100644
+--- a/builder/qemu/ssh.go
++++ b/builder/qemu/ssh.go
+@@ -35,7 +35,8 @@ func sshConfig(state multistep.StateBag) 
(*gossh.ClientConfig, error) {
+       }
+ 
+       return &gossh.ClientConfig{
+-              User: config.Comm.SSHUsername,
+-              Auth: auth,
++              User:            config.Comm.SSHUsername,
++              Auth:            auth,
++              HostKeyCallback: gossh.InsecureIgnoreHostKey(),
+       }, nil
+ }
+diff --git a/builder/virtualbox/common/ssh.go 
b/builder/virtualbox/common/ssh.go
+index c9080df..1b9c524 100644
+--- a/builder/virtualbox/common/ssh.go
++++ b/builder/virtualbox/common/ssh.go
+@@ -34,8 +34,9 @@ func SSHConfigFunc(config SSHConfig) 
func(multistep.StateBag) (*gossh.ClientConf
+               }
+ 
+               return &gossh.ClientConfig{
+-                      User: config.Comm.SSHUsername,
+-                      Auth: auth,
++                      User:            config.Comm.SSHUsername,
++                      Auth:            auth,
++                      HostKeyCallback: gossh.InsecureIgnoreHostKey(),
+               }, nil
+       }
+ }
+diff --git a/builder/vmware/common/ssh.go b/builder/vmware/common/ssh.go
+index 86e184b..4060772 100644
+--- a/builder/vmware/common/ssh.go
++++ b/builder/vmware/common/ssh.go
+@@ -84,8 +84,9 @@ func SSHConfigFunc(config *SSHConfig) 
func(multistep.StateBag) (*gossh.ClientCon
+               }
+ 
+               return &gossh.ClientConfig{
+-                      User: config.Comm.SSHUsername,
+-                      Auth: auth,
++                      User:            config.Comm.SSHUsername,
++                      Auth:            auth,
++                      HostKeyCallback: gossh.InsecureIgnoreHostKey(),
+               }, nil
+       }
+ }
diff -Nru 
packer-0.10.2+dfsg/debian/patches/update-ssh-client-usage-for-new-crypto-ssh-version.patch
 
packer-0.10.2+dfsg/debian/patches/update-ssh-client-usage-for-new-crypto-ssh-version.patch
--- 
packer-0.10.2+dfsg/debian/patches/update-ssh-client-usage-for-new-crypto-ssh-version.patch
  1970-01-01 09:00:00.000000000 +0900
+++ 
packer-0.10.2+dfsg/debian/patches/update-ssh-client-usage-for-new-crypto-ssh-version.patch
  2017-05-24 00:44:04.000000000 +0900
@@ -0,0 +1,88 @@
+From: Matthew Hooker <mwhoo...@gmail.com>
+Date: Thu, 18 May 2017 12:01:44 -0700
+Subject: update ssh client usage for new crypto/ssh version
+
+[cherry-picked ee5d13611fb8aca1f1014f9bcd65c18fffdd1b2b with modification]
+---
+ builder/amazon/common/ssh.go    | 1 +
+ builder/azure/common/lin/ssh.go | 1 +
+ builder/digitalocean/ssh.go     | 1 +
+ builder/googlecompute/ssh.go    | 1 +
+ builder/openstack/ssh.go        | 1 +
+ builder/parallels/common/ssh.go | 5 +++--
+ 6 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go
+index d689d59..c9d7a15 100644
+--- a/builder/amazon/common/ssh.go
++++ b/builder/amazon/common/ssh.go
+@@ -67,6 +67,7 @@ func SSHConfig(username string) func(multistep.StateBag) 
(*ssh.ClientConfig, err
+                       Auth: []ssh.AuthMethod{
+                               ssh.PublicKeys(signer),
+                       },
++                      HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+               }, nil
+       }
+ }
+diff --git a/builder/azure/common/lin/ssh.go b/builder/azure/common/lin/ssh.go
+index af86b5f..cbe0cd3 100644
+--- a/builder/azure/common/lin/ssh.go
++++ b/builder/azure/common/lin/ssh.go
+@@ -32,6 +32,7 @@ func SSHConfig(username string) func(multistep.StateBag) 
(*ssh.ClientConfig, err
+                       Auth: []ssh.AuthMethod{
+                               ssh.PublicKeys(signer),
+                       },
++                      HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+               }, nil
+       }
+ }
+diff --git a/builder/digitalocean/ssh.go b/builder/digitalocean/ssh.go
+index 5367dde..26a2d91 100644
+--- a/builder/digitalocean/ssh.go
++++ b/builder/digitalocean/ssh.go
+@@ -26,5 +26,6 @@ func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, 
error) {
+               Auth: []ssh.AuthMethod{
+                       ssh.PublicKeys(signer),
+               },
++              HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+       }, nil
+ }
+diff --git a/builder/googlecompute/ssh.go b/builder/googlecompute/ssh.go
+index 5b79405..5c224f0 100644
+--- a/builder/googlecompute/ssh.go
++++ b/builder/googlecompute/ssh.go
+@@ -27,5 +27,6 @@ func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, 
error) {
+               Auth: []ssh.AuthMethod{
+                       ssh.PublicKeys(signer),
+               },
++              HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+       }, nil
+ }
+diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go
+index f7fb2d5..a2d1e25 100644
+--- a/builder/openstack/ssh.go
++++ b/builder/openstack/ssh.go
+@@ -76,6 +76,7 @@ func SSHConfig(username string) func(multistep.StateBag) 
(*ssh.ClientConfig, err
+                       Auth: []ssh.AuthMethod{
+                               ssh.PublicKeys(signer),
+                       },
++                      HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+               }, nil
+       }
+ }
+diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go
+index 35b4331..a0a5a52 100644
+--- a/builder/parallels/common/ssh.go
++++ b/builder/parallels/common/ssh.go
+@@ -42,8 +42,9 @@ func SSHConfigFunc(config SSHConfig) 
func(multistep.StateBag) (*ssh.ClientConfig
+               }
+ 
+               return &ssh.ClientConfig{
+-                      User: config.Comm.SSHUsername,
+-                      Auth: auth,
++                      User:            config.Comm.SSHUsername,
++                      Auth:            auth,
++                      HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+               }, nil
+       }
+ }

Reply via email to