svn commit: r520317 - head/devel/pijul/files

[Tobias Kortkamp]

Author: tobik
Date: Tue Dec 17 08:52:57 2019
New Revision: 520317
URL: https://svnweb.freebsd.org/changeset/ports/520317

Log:
  devel/pijul: Unbreak build with Rust 1.40.0 (D22843)
  
  error[E0382]: assign to part of moved value: `newkeys`
     --> .../cargo-crates/thrussh-0.20.7/src/client/connection.rs:550:13
      |
  539 |             let mut newkeys = kexdhdone.compute_keys(
      |                 ----------- move occurs because `newkeys` has type `session::NewKeys`, which does not implement the `Copy` trait
  ...
  549 |             session.0.kex = Some(Kex::NewKeys(newkeys));
      |                                               ------- value moved here
  550 |             newkeys.sent = true;
      |             ^^^^^^^^^^^^^^^^^^^ value partially assigned here after move
  
  error: aborting due to previous error

Added:
  head/devel/pijul/files/patch-cargo-crates_thrussh-0.20.7_src_client_connection.rs   (contents, props changed)

Added: head/devel/pijul/files/patch-cargo-crates_thrussh-0.20.7_src_client_connection.rs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pijul/files/patch-cargo-crates_thrussh-0.20.7_src_client_connection.rs	Tue Dec 17 08:52:57 2019	(r520317)
@@ -0,0 +1,27 @@
+error[E0382]: assign to part of moved value: `newkeys`
+   --> .../cargo-crates/thrussh-0.20.7/src/client/connection.rs:550:13
+    |
+539 |             let mut newkeys = kexdhdone.compute_keys(
+    |                 ----------- move occurs because `newkeys` has type `session::NewKeys`, which does not implement the `Copy` trait
+...
+549 |             session.0.kex = Some(Kex::NewKeys(newkeys));
+    |                                               ------- value moved here
+550 |             newkeys.sent = true;
+    |             ^^^^^^^^^^^^^^^^^^^ value partially assigned here after move
+
+error: aborting due to previous error
+
+https://nest.pijul.com/pijul_org/thrussh/patches/AsyuWkJg4jAwNaG3H1yv1kbECx5E3GQAtjzXWBDB8yEGMswyfKbxKvYmAGWCohTVaTipdvF8mHh63yU5PTr5F9py
+
+--- cargo-crates/thrussh-0.20.7/src/client/connection.rs.orig	2019-12-17 08:35:47 UTC
++++ cargo-crates/thrussh-0.20.7/src/client/connection.rs
+@@ -546,8 +546,8 @@ impl<R: AsyncRead + AsyncWrite, H: Handler> Connection
+                 &[msg::NEWKEYS],
+                 &mut session.0.write_buffer,
+             );
+-            session.0.kex = Some(Kex::NewKeys(newkeys));
+             newkeys.sent = true;
++            session.0.kex = Some(Kex::NewKeys(newkeys));
+         }
+         Ok(())
+     }