diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-09-06 15:09:48 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-09-06 15:13:13 +0200 |
commit | 656b59e3db7a95e9b943aedfcfce239305573705 (patch) | |
tree | 24604ca418473156578b73892f09def48c30a73c /pkgs/tools/security/monkeysphere | |
parent | 5574b6a152b1b3ae5f93ba37c4ffd1981f62bf5a (diff) |
monkeysphere: 0.37 -> 0.41
TODO(WIP): This needs more testing and a module.
Diffstat (limited to 'pkgs/tools/security/monkeysphere')
-rw-r--r-- | pkgs/tools/security/monkeysphere/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/security/monkeysphere/monkeysphere.patch | 65 |
2 files changed, 34 insertions, 46 deletions
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index d1266ca495ede..badea48cec485 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, perl, makeWrapper, perlPackages }: +{ stdenv, fetchurl, makeWrapper +, perl, perlPackages, libassuan, libgcrypt +}: stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.37"; + version = "0.41"; src = fetchurl { - url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz"; - sha256 = "0nbfd220miflah5l2y20qlmgfpbqi0j8h7qgx1b06h7v2jjbh45m"; + url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; + sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li"; }; - buildInputs = [ makeWrapper perl ]; + buildInputs = [ makeWrapper perl libassuan libgcrypt ]; patches = [ ./monkeysphere.patch ]; @@ -43,7 +45,8 @@ stdenv.mkDerivation rec { TLS/SSL communications through the normal use of tools you are familiar with, such as your web browser0 or secure shell. ''; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index 8b343b93454f6..f341ee747bbc2 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -1,51 +1,34 @@ -diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile ---- monkeysphere-0.37/Makefile 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/Makefile 2015-07-31 19:51:57.539373097 +0200 -@@ -42,11 +42,11 @@ install: all installman - mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere - printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION - install src/monkeysphere $(DESTDIR)$(PREFIX)/bin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere - install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host - install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication - install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere -@@ -59,8 +59,8 @@ install: all installman - ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem - ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki - install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28 -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28 - install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions - install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m - install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh -diff -rupN monkeysphere-0.37/src/share/checkperms monkeysphere-0.37-patched/src/share/checkperms ---- monkeysphere-0.37/src/share/checkperms 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/src/share/checkperms 2015-07-31 19:52:18.170675985 +0200 +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ clean: + replaced/%: % + mkdir -p $(dir $@) + sed < $< > $@ \ +- -e 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' \ ++ -e 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' \ + -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 -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/share/keytrans ---- monkeysphere-0.37/src/share/keytrans 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/src/share/keytrans 2015-07-31 20:13:36.664514290 +0200 +diff --git a/src/share/keytrans b/src/share/keytrans +--- a/src/share/keytrans ++++ b/src/share/keytrans @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between -@@ -1069,7 +1069,7 @@ sub packetwalk { +@@ -1083,7 +1083,7 @@ sub packetwalk { for (basename($0)) { @@ -54,7 +37,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $rsa; my $stdin; -@@ -1107,7 +1107,7 @@ for (basename($0)) { +@@ -1121,7 +1121,7 @@ for (basename($0)) { } ); } @@ -63,7 +46,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $fpr = shift; my $instream; open($instream,'-'); -@@ -1123,7 +1123,7 @@ for (basename($0)) { +@@ -1137,7 +1137,7 @@ for (basename($0)) { die "No matching key found.\n"; } } @@ -72,7 +55,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $fpr = shift; my $instream; open($instream,'-'); -@@ -1139,7 +1139,7 @@ for (basename($0)) { +@@ -1153,7 +1153,7 @@ for (basename($0)) { die "No matching key found.\n"; } } @@ -81,7 +64,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh my $fpr = shift; my $instream; open($instream,'-'); -@@ -1151,7 +1151,7 @@ for (basename($0)) { +@@ -1165,7 +1165,7 @@ for (basename($0)) { die "No matching key found.\n"; } } @@ -90,3 +73,5 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh # subcommands when keytrans is invoked directly are UNSUPPORTED, # UNDOCUMENTED, and WILL NOT BE MAINTAINED. my $subcommand = shift; +-- +2.16.3 |