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

monkeysphere: 0.37 -> 0.41

Browse Source 
TODO(WIP): This needs more testing and a module.
This commit is contained in:
Michael Weiss 2018-09-06 15:09:48 +02:00
parent 5574b6a152
commit 656b59e3db
2 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,17 @@
{ stdenv, fetchurl, perl, makeWrapper, perlPackages }: { stdenv, fetchurl, makeWrapper
, perl, perlPackages, libassuan, libgcrypt
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monkeysphere-${version}"; name = "monkeysphere-${version}";
version = "0.37"; version = "0.41";
src = fetchurl { src = fetchurl {
url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz"; url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
sha256 = "0nbfd220miflah5l2y20qlmgfpbqi0j8h7qgx1b06h7v2jjbh45m"; sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li";
}; };
buildInputs = [ makeWrapper perl ]; buildInputs = [ makeWrapper perl libassuan libgcrypt ];
patches = [ ./monkeysphere.patch ]; patches = [ ./monkeysphere.patch ];
@ -43,7 +45,8 @@ stdenv.mkDerivation rec {
TLS/SSL communications through the normal use of tools you are TLS/SSL communications through the normal use of tools you are
familiar with, such as your web browser0 or secure shell. familiar with, such as your web browser0 or secure shell.
''; '';
license = licenses.gpl3; license = licenses.gpl3Plus;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ primeos ];
}; };
} }

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

@ -1,51 +1,34 @@
diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile diff --git a/Makefile b/Makefile
--- monkeysphere-0.37/Makefile 2014-08-06 19:27:38.000000000 +0200 --- a/Makefile
+++ monkeysphere-0.37-patched/Makefile 2015-07-31 19:51:57.539373097 +0200 +++ b/Makefile
@@ -42,11 +42,11 @@ install: all installman @@ -52,7 +52,7 @@ clean:
mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere replaced/%: %
printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION mkdir -p $(dir $@)
install src/monkeysphere $(DESTDIR)$(PREFIX)/bin sed < $< > $@ \
- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere - -e 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' \
+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere + -e 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' \
install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin -e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \
- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host -e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):'
+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin diff --git a/src/share/checkperms b/src/share/checkperms
- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication --- a/src/share/checkperms
+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication +++ b/src/share/checkperms
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
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/perl -T -#!/usr/bin/perl -T
+#!/usr/bin/perl +#!/usr/bin/perl
# checkperms: ensure as best we can that a given file can only be # checkperms: ensure as best we can that a given file can only be
# modified by the given user (or the superuser, naturally). This # 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 diff --git a/src/share/keytrans b/src/share/keytrans
--- monkeysphere-0.37/src/share/keytrans 2014-08-06 19:27:38.000000000 +0200 --- a/src/share/keytrans
+++ monkeysphere-0.37-patched/src/share/keytrans 2015-07-31 20:13:36.664514290 +0200 +++ b/src/share/keytrans
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/perl -T -#!/usr/bin/perl -T
+#!/usr/bin/perl +#!/usr/bin/perl
# 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
@@ -1069,7 +1069,7 @@ sub packetwalk { @@ -1083,7 +1083,7 @@ sub packetwalk {
for (basename($0)) { for (basename($0)) {
@ -54,7 +37,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh
my $rsa; my $rsa;
my $stdin; 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 $fpr = shift;
my $instream; my $instream;
open($instream,'-'); open($instream,'-');
@@ -1123,7 +1123,7 @@ for (basename($0)) { @@ -1137,7 +1137,7 @@ for (basename($0)) {
die "No matching key found.\n"; 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 $fpr = shift;
my $instream; my $instream;
open($instream,'-'); open($instream,'-');
@@ -1139,7 +1139,7 @@ for (basename($0)) { @@ -1153,7 +1153,7 @@ for (basename($0)) {
die "No matching key found.\n"; 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 $fpr = shift;
my $instream; my $instream;
open($instream,'-'); open($instream,'-');
@@ -1151,7 +1151,7 @@ for (basename($0)) { @@ -1165,7 +1165,7 @@ for (basename($0)) {
die "No matching key found.\n"; 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, # subcommands when keytrans is invoked directly are UNSUPPORTED,
# UNDOCUMENTED, and WILL NOT BE MAINTAINED. # UNDOCUMENTED, and WILL NOT BE MAINTAINED.
my $subcommand = shift; my $subcommand = shift;
--
2.16.3