From 719b7dcfb1605002b80ff8b2df9da3d0a0edb736 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Jan 2019 00:00:02 -0800 Subject: [PATCH 1/2] monkeysphere: 0.42 -> 0.43 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/monkeysphere/versions --- pkgs/tools/security/monkeysphere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 114ba57e170..af507dbf993 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -14,14 +14,14 @@ let }); in stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.42"; + version = "0.43"; # The patched OpenSSH binary MUST NOT be used (except in the check phase): disallowedRequisites = [ opensshUnsafe ]; src = fetchurl { url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; - sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1"; + sha256 = "18i7qpvp5qb7mmd0z5rqai550rya9l3nbsq2hamwkl3smqsjdqc0"; }; patches = [ ./monkeysphere.patch ]; From 829d105b586cc4643e7207e1fbf066431577e3f1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Jan 2019 16:09:24 +0100 Subject: [PATCH 2/2] monkeysphere: Fix the Ed25519 tests The Ed25519 test was failing inside of the sandbox because /dev/tty is not available: ### generating ed25519 key for testuser... gpg: cannot open '/dev/tty': No such device or address FAILED! --- pkgs/tools/security/monkeysphere/monkeysphere.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index fdf4b9335b1..0a05635d6a8 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -28,5 +28,17 @@ diff --git a/src/share/keytrans b/src/share/keytrans # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between +diff --git a/tests/basic b/tests/basic +--- a/tests/basic ++++ b/tests/basic +@@ -343,7 +340,7 @@ if [ "$MONKEYSPHERE_TEST_USE_ED25519" = true ]; then + echo "### generating ed25519 key for testuser..." + # from the imported secret key + USER_FPR=8A4B353B4CBA6F30625498BAE00B5EEEBA79B482 +- gpg --quick-add-key "$USER_FPR" ed25519 auth 2d ++ gpg --no-tty --quick-add-key "$USER_FPR" ed25519 auth 2d + else + echo "### generating standard monkeysphere key for testuser..." + monkeysphere gen-subkey -- 2.16.3