Commit af8ff991 authored by JuliusFreudenberger's avatar JuliusFreudenberger
Browse files

teleport_16: 16.5.16 -> 16.5.18; teleport_17: 17.7.5 -> 17.7.8; teleport_18: 18.2.2 -> 18.3.1 

This makes one of the applied patches obsolete for all major versions.

Diffs:
https://github.com/gravitational/teleport/compare/v16.5.16...v16.5.18
https://github.com/gravitational/teleport/compare/v17.7.5...v17.7.8
https://github.com/gravitational/teleport/compare/v18.2.2...v18.3.1
parent 766f4bd0

pkgs/build-support/teleport/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ buildGoModule (finalAttrs: { 
  patches = extPatches ++ [

    ./0001-fix-add-nix-path-to-exec-env.patch

    ./rdpclient.patch

    ./tsh.patch

  ];



  # Reduce closure size for client machines

pkgs/build-support/teleport/tsh.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go

index 5de21c69d0..3995c19e3c 100644

--- a/tool/tsh/common/tsh.go

+++ b/tool/tsh/common/tsh.go

@@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {

 	}

 

 	var err error

-	cf.executablePath, err = os.Executable()

+	tempBinaryPath, err := os.Executable()

 	if err != nil {

 		return trace.Wrap(err)

 	}

+	cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"

 

 	// configs

 	setEnvFlags(&cf)

pkgs/by-name/te/teleport_16/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
  extPatches ? [ ],

}:

buildTeleport {

  version = "16.5.16";

  hash = "sha256-b1jUr36KNgiZnA3QBo2blKxjK3Sy6S6Lrc/bzWsX20Q=";

  version = "16.5.18";

  hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo=";

  vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8=";

  pnpmHash = "sha256-+vZXacdGkLvjYN1s0Z+/JiVjxiaOGJ3326PvWtFaFaI=";

  pnpmHash = "sha256-V0R/i+oENGxlmq2Q6iwnikgBFVMWXph9WMStp3HTW34=";

  cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";



  wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;

pkgs/by-name/te/teleport_17/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
}:



buildTeleport {

  version = "17.7.5";

  hash = "sha256-9Qtp/lTbG7xLk9mzHwwMAQkt08oPRM1FP+NLSXEr8Mo=";

  vendorHash = "sha256-4n1N9yiC2ILd8X8ntSPd2JhqRHROKoYK/S0GphVo+bI=";

  version = "17.7.8";

  hash = "sha256-z520UT17nFLBwyVLjdfx9aTbkMv1fljsN88G6WRPvZE=";

  vendorHash = "sha256-mtOCLAcVIxaEhGzdsVWxnKQ4FRTXZ5vVAF+NVMdFItk=";

  cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";

  pnpmHash = "sha256-ovtcJWeRFQUfzbanGXzOcZk/0KwKiZYrr3VmqMt+nfE=";

  pnpmHash = "sha256-4xLbPQwmI0nAUNAgDHwkx1uSbjHPe8LNmEFQfoaj6bY=";



  wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;

  inherit buildGoModule withRdpClient extPatches;

pkgs/by-name/te/teleport_18/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ 
}:



buildTeleport {

  version = "18.2.2";

  hash = "sha256-q7HE3FXX3uxTP+sesMbPH6FbfhI7VsoXgrKKxPtfEtQ=";

  vendorHash = "sha256-w8RhvTKNhHKkwvsi6S3m0S9ZSxEO9bw/qhTHlB80lHc=";

  pnpmHash = "sha256-cpkV+B50JdhcXdI/K7cqJI6TsvGOCRxkFTJcA4wE5iQ=";

  version = "18.3.1";

  hash = "sha256-HM0pu+3O7zoClH15YC0naxxmKJC9ngamnvraTosRqG0=";

  vendorHash = "sha256-HyS0KKW7lyn3NzedxM4+UxFV9OnxgtFDMW5jkj3ir/8=";

  pnpmHash = "sha256-/G6WYC3YGk8ma4hAI6sZhQ6KAh+u4CxQ7891fYj5bJg=";

  cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";



  wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;