diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-01-28 16:26:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 16:26:35 +0100 |
| commit | e53065a7fa08ffd3cea0543a7e8eb7c14b02235f (patch) | |
| tree | d47f790a98e4b870d96b0f91ccea72df6ded2aeb /pkgs/tools/security | |
| parent | 82a1153d6deb791c64854c5a600d547747089f3c (diff) | |
| parent | 829d105b586cc4643e7207e1fbf066431577e3f1 (diff) | |
| download | nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.tar nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.tar.gz nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.tar.bz2 nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.tar.lz nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.tar.xz nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.tar.zst nixlib-e53065a7fa08ffd3cea0543a7e8eb7c14b02235f.zip | |
Merge pull request #54768 from r-ryantm/auto-update/monkeysphere
monkeysphere: 0.42 -> 0.43
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/monkeysphere/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/monkeysphere/monkeysphere.patch | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 114ba57e1700..af507dbf993b 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 ]; diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index fdf4b9335b19..0a05635d6a80 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 |