From 59539b9bc5a4a91e6778505a8901f56c6ad841e1 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Tue, 19 Dec 2023 19:47:28 +0100 Subject: [PATCH] tsm-client: 8.1.20.0 -> 8.1.21.0 "Update History" (release notes): https://www.ibm.com/support/pages/node/6998343 At the time of this writing, the "APAR" links of the "Update History" lead to 404. However, the abstracts indicate that this update is not security critical. Note that this update changed the GUI window title to "IBM Storage Protect" (the product itself was renamed with version 8.1.19.0 already). The commit at hand adapts the GUI vm test accordingly. Also, all URLs in package and module comments are updated. --- nixos/modules/programs/tsm-client.nix | 2 +- nixos/modules/services/backup/tsm.nix | 2 +- nixos/tests/tsm-client-gui.nix | 2 +- pkgs/tools/backup/tsm-client/default.nix | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix index 45d436221ee3..d31a1fb3f375 100644 --- a/nixos/modules/programs/tsm-client.nix +++ b/nixos/modules/programs/tsm-client.nix @@ -22,7 +22,7 @@ let serverOptions = { name, config, ... }: { freeformType = attrsOf (either scalarType (listOf scalarType)); # Client system-options file directives are explained here: - # https://www.ibm.com/docs/en/storage-protect/8.1.20?topic=commands-processing-options + # https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=commands-processing-options options.servername = mkOption { type = servernameType; default = name; diff --git a/nixos/modules/services/backup/tsm.nix b/nixos/modules/services/backup/tsm.nix index 6798b18b3af7..2d727dccdece 100644 --- a/nixos/modules/services/backup/tsm.nix +++ b/nixos/modules/services/backup/tsm.nix @@ -90,7 +90,7 @@ in environment.HOME = "/var/lib/tsm-backup"; serviceConfig = { # for exit status description see - # https://www.ibm.com/docs/en/storage-protect/8.1.20?topic=clients-client-return-codes + # https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=clients-client-return-codes SuccessExitStatus = "4 8"; # The `-se` option must come after the command. # The `-optfile` option suppresses a `dsm.opt`-not-found warning. diff --git a/nixos/tests/tsm-client-gui.nix b/nixos/tests/tsm-client-gui.nix index c9632546db6e..ca10cddc411f 100644 --- a/nixos/tests/tsm-client-gui.nix +++ b/nixos/tests/tsm-client-gui.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.execute("DSM_LOG=/tmp dsmj -optfile=/dev/null >&2 &") # does it report the "TCP/IP connection failure" error code? - machine.wait_for_window("IBM Spectrum Protect") + machine.wait_for_window("IBM Storage Protect") machine.wait_for_text("ANS2610S") machine.send_key("esc") diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index e586e831b107..dedc7fdcd8e4 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -45,7 +45,7 @@ # point to this derivations `/dsmi_dir` directory symlink. # Other environment variables might be necessary, # depending on local configuration or usage; see: -# https://www.ibm.com/docs/en/spectrum-protect/8.1.20?topic=solaris-set-api-environment-variables +# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=solaris-set-api-environment-variables # The newest version of TSM client should be discoverable by @@ -104,10 +104,10 @@ let unwrapped = stdenv.mkDerivation rec { name = "tsm-client-${version}-unwrapped"; - version = "8.1.20.0"; + version = "8.1.21.0"; src = fetchurl { url = mkSrcUrl version; - hash = "sha512-UZ5hRXGlB/1B4gZ8/i9OCHsxSuRkbAcp195zl/M75HtTi8o0rOfOh3LMmn4x4/M1V8d60ix7Tn4Mv8xkm7QXzw=="; + hash = "sha512-iXkVYQsqbNhQJmrYl5a5433iSl6kg6YzlTlgCzpFGslMn+3ynSmYn8Rtxwitp931SwmV4a53tGctSuisz8pOCg=="; }; inherit meta passthru;