Unverified Commit cc5ae9c1 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #314578 from justinas/backport-24-05-teleport-15-3-7 

[24.05] teleport_15: 15.2.2 -> 15.3.7, teleport_14: 14.3.0 -> 14.3.20, teleport_13: 13.4.14 -> 13.4.26
parents d74a983e 404c1149

pkgs/servers/teleport/13/Cargo.lock

+9 −9
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" 


[[package]]

name = "bindgen"

version = "0.66.1"

version = "0.68.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"

checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"

dependencies = [

 "bitflags 2.4.1",

 "cexpr",
@@ -149,9 +149,9 @@ dependencies = [ 


[[package]]

name = "boring"

version = "3.1.0"

version = "4.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece"

checksum = "92667e5967bf826198f88dd3e43616973f8902769a6151616a65be1289a3c531"

dependencies = [

 "bitflags 2.4.1",

 "boring-sys",
@@ -162,9 +162,9 @@ dependencies = [ 


[[package]]

name = "boring-sys"

version = "3.1.0"

version = "4.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481"

checksum = "f04f5e0e2dc8315f68251391a4ac6da54793525c01d0206b10732b71139768cd"

dependencies = [

 "bindgen",

 "cmake",
@@ -1242,7 +1242,7 @@ dependencies = [ 
[[package]]

name = "rdp-rs"

version = "0.1.0"

source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d"

source = "git+https://github.com/gravitational/rdp-rs?rev=edfb5330a11d11eaf36d65e4300555368b4c6b02#edfb5330a11d11eaf36d65e4300555368b4c6b02"

dependencies = [

 "boring",

 "bufstream",
@@ -1470,9 +1470,9 @@ dependencies = [ 


[[package]]

name = "shlex"

version = "1.1.0"

version = "1.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"

checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"



[[package]]

name = "signature"

pkgs/servers/teleport/13/default.nix

+5 −5
Original line number Diff line number Diff line 
args:

import ../generic.nix (args // {

  version = "13.4.14";

  hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0=";

  vendorHash = "sha256-kiDhlR/P81u/yNq72JuskES/UzMrTFzJT0H3xldGk8I=";

  yarnHash = "sha256-E9T+7aXVoERdUnVEL4va2fcMnv1jsL9Js/R2LZo4hu4=";

  version = "13.4.26";

  hash = "sha256-vtOig4uIyAGC6yraiqLeJZ3X8arHRGc2AAaopgQLCHo=";

  vendorHash = "sha256-lAPx54vsqXW7WKIi+zFQtVhWYlPX1Is0b5jiWsN3j2E=";

  yarnHash = "sha256-Os8T4p5/QzZJAvLqJwKgB4XiLg/TYdlXpunStKAc/mk=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0=";

      "rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4=";

    };

  };

  extPatches = [

pkgs/servers/teleport/14/Cargo.lock

+9 −9
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" 


[[package]]

name = "bindgen"

version = "0.66.1"

version = "0.68.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"

checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"

dependencies = [

 "bitflags 2.4.0",

 "cexpr",
@@ -149,9 +149,9 @@ dependencies = [ 


[[package]]

name = "boring"

version = "3.1.0"

version = "4.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece"

checksum = "92667e5967bf826198f88dd3e43616973f8902769a6151616a65be1289a3c531"

dependencies = [

 "bitflags 2.4.0",

 "boring-sys",
@@ -162,9 +162,9 @@ dependencies = [ 


[[package]]

name = "boring-sys"

version = "3.1.0"

version = "4.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481"

checksum = "f04f5e0e2dc8315f68251391a4ac6da54793525c01d0206b10732b71139768cd"

dependencies = [

 "bindgen",

 "cmake",
@@ -1233,7 +1233,7 @@ dependencies = [ 
[[package]]

name = "rdp-rs"

version = "0.1.0"

source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d"

source = "git+https://github.com/gravitational/rdp-rs?rev=edfb5330a11d11eaf36d65e4300555368b4c6b02#edfb5330a11d11eaf36d65e4300555368b4c6b02"

dependencies = [

 "boring",

 "bufstream",
@@ -1462,9 +1462,9 @@ dependencies = [ 


[[package]]

name = "shlex"

version = "1.1.0"

version = "1.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"

checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"



[[package]]

name = "signature"

pkgs/servers/teleport/14/default.nix

+5 −5
Original line number Diff line number Diff line 
args:

import ../generic.nix (args // {

  version = "14.3.0";

  hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk=";

  vendorHash = "sha256-lHsgSbY1nqQminU67QgV6FbHXNlv5tCMv2oVq48S33M=";

  yarnHash = "sha256-m934P+KygGiCzr5fDsNTlmZ1T9JxA6P8zTimocQyVi0=";

  version = "14.3.20";

  hash = "sha256-oGN3t0xt7z3+U7wlhnJu4B8cSSMwONdiHZkv8UY7lkA=";

  vendorHash = "sha256-RMTHWrbwKCGlxi9SP+8ccGk8YYqwhC8yWLPDf2Ha5bE=";

  yarnHash = "sha256-c5ItZpq9Wp+kE9gw2WQdm5gTvBKA9I+nHAX/pT4Hqhs=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0=";

      "rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4=";

    };

  };

  extPatches = [

pkgs/servers/teleport/15/Cargo.lock

+31 −17
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-async"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bytes",

 "ironrdp-connector",
@@ -1172,7 +1172,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-cliprdr"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bitflags 2.4.2",

 "ironrdp-pdu",
@@ -1184,7 +1184,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-connector"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "ironrdp-error",

 "ironrdp-pdu",
@@ -1196,10 +1196,21 @@ dependencies = [ 
 "winapi",

]



[[package]]

name = "ironrdp-displaycontrol"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "ironrdp-dvc",

 "ironrdp-pdu",

 "ironrdp-svc",

 "tracing",

]



[[package]]

name = "ironrdp-dvc"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "ironrdp-pdu",

 "ironrdp-svc",
@@ -1210,12 +1221,12 @@ dependencies = [ 
[[package]]

name = "ironrdp-error"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"



[[package]]

name = "ironrdp-graphics"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bit_field",

 "bitflags 2.4.2",
@@ -1232,7 +1243,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-pdu"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bit_field",

 "bitflags 2.4.2",
@@ -1254,7 +1265,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-rdpdr"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bitflags 2.4.2",

 "ironrdp-error",
@@ -1266,7 +1277,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-rdpsnd"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "ironrdp-pdu",

 "ironrdp-svc",
@@ -1275,9 +1286,10 @@ dependencies = [ 
[[package]]

name = "ironrdp-session"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "ironrdp-connector",

 "ironrdp-displaycontrol",

 "ironrdp-dvc",

 "ironrdp-error",

 "ironrdp-graphics",
@@ -1289,7 +1301,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-svc"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bitflags 2.4.2",

 "ironrdp-pdu",
@@ -1298,7 +1310,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-tls"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "tokio",

 "tokio-rustls",
@@ -1308,7 +1320,7 @@ dependencies = [ 
[[package]]

name = "ironrdp-tokio"

version = "0.1.0"

source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d"

source = "git+https://github.com/Devolutions/IronRDP?rev=fd105e4b56647ab2f54aa23954aec4aaeef118e2#fd105e4b56647ab2f54aa23954aec4aaeef118e2"

dependencies = [

 "bytes",

 "ironrdp-async",
@@ -1972,6 +1984,8 @@ dependencies = [ 
 "env_logger",

 "ironrdp-cliprdr",

 "ironrdp-connector",

 "ironrdp-displaycontrol",

 "ironrdp-dvc",

 "ironrdp-pdu",

 "ironrdp-rdpdr",

 "ironrdp-rdpsnd",
@@ -2172,9 +2186,9 @@ dependencies = [ 


[[package]]

name = "rustls"

version = "0.21.9"

version = "0.21.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"

checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"

dependencies = [

 "log",

 "ring",
@@ -2976,9 +2990,9 @@ dependencies = [ 


[[package]]

name = "uuid"

version = "1.6.1"

version = "1.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"

checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"

dependencies = [

 "getrandom",

 "serde",