monkeysphere: 0.43 -> 0.44

This commit is contained in:
Michael Weiss 2019-05-20 21:44:46 +02:00
parent a43fb1def6
commit ea7052b17f
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 6 additions and 27 deletions

View file

@ -2,7 +2,7 @@
, perl, libassuan, libgcrypt
, perlPackages, lockfileProgs, gnupg, coreutils
# For the tests:
, bash, openssh, which, socat, cpio, hexdump, openssl
, bash, openssh, which, socat, cpio, hexdump, procps, openssl
}:
let
@ -14,14 +14,14 @@ let
});
in stdenv.mkDerivation rec {
name = "monkeysphere-${version}";
version = "0.43";
version = "0.44";
# 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 = "18i7qpvp5qb7mmd0z5rqai550rya9l3nbsq2hamwkl3smqsjdqc0";
sha256 = "1ah7hy8r9gj96pni8azzjb85454qky5l17m3pqn37854l6grgika";
};
patches = [ ./monkeysphere.patch ];
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl libassuan libgcrypt ]
++ stdenv.lib.optional doCheck
([ gnupg opensshUnsafe which socat cpio hexdump lockfileProgs ] ++
([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++
(with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
makeFlags = ''
@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
postFixup =
let wrapperArgs = runtimeDeps:
"--prefix PERL5LIB : "
+ (with perlPackages; makePerlPath [
+ (with perlPackages; makePerlPath [ # Optional (only required for keytrans)
CryptOpenSSLRSA
CryptOpenSSLBignum
])
@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
(wrapMonkeysphere runtimeDeps)
programs;
in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ]
+ wrapPrograms [ lockfileProgs ] [ "monkeysphere" ]
+ wrapPrograms [ gnupg lockfileProgs ] [ "monkeysphere" ]
+ ''
# These 4 programs depend on the program name ($0):
for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do

View file

@ -10,15 +10,6 @@ diff --git a/Makefile b/Makefile
-e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \
-e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):'
diff --git a/src/share/checkperms b/src/share/checkperms
--- a/src/share/checkperms
+++ b/src/share/checkperms
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!/usr/bin/perl
# checkperms: ensure as best we can that a given file can only be
# modified by the given user (or the superuser, naturally). This
diff --git a/src/share/keytrans b/src/share/keytrans
--- a/src/share/keytrans
+++ b/src/share/keytrans
@ -28,17 +19,5 @@ 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