public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54768 from r-ryantm/auto-update/monkeysphere

Browse Source 
monkeysphere: 0.42 -> 0.43
This commit is contained in:
Michael Weiss 2019-01-28 16:26:35 +01:00 committed by GitHub
commit e53065a7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/monkeysphere/default.nix
View File

@ -14,14 +14,14 @@ let
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "monkeysphere-${version}"; name = "monkeysphere-${version}";
version = "0.42"; version = "0.43";
# The patched OpenSSH binary MUST NOT be used (except in the check phase): # The patched OpenSSH binary MUST NOT be used (except in the check phase):
disallowedRequisites = [ opensshUnsafe ]; disallowedRequisites = [ opensshUnsafe ];
src = fetchurl { src = fetchurl {
url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1"; sha256 = "18i7qpvp5qb7mmd0z5rqai550rya9l3nbsq2hamwkl3smqsjdqc0";
}; };
patches = [ ./monkeysphere.patch ]; patches = [ ./monkeysphere.patch ];

12
pkgs/tools/security/monkeysphere/monkeysphere.patch
View File

@ -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 # keytrans: this is an RSA key translation utility; it is capable of
# transforming RSA keys (both public keys and secret keys) between # 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 2.16.3