pyrox.dev
1diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile
2--- monkeysphere-0.37/Makefile 2014-08-06 19:27:38.000000000 +0200
3+++ monkeysphere-0.37-patched/Makefile 2015-07-31 19:51:57.539373097 +0200
4@@ -42,11 +42,11 @@ install: all installman
5 mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
6 printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
7 install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
8- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
9+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
10 install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
11- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
12+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
13 install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
14- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
15+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
16 install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
17 install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
18 install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
19@@ -59,8 +59,8 @@ install: all installman
20 ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem
21 ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki
22 install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
23- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
24- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
25+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
26+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
27 install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
28 install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
29 install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
30diff -rupN monkeysphere-0.37/src/share/checkperms monkeysphere-0.37-patched/src/share/checkperms
31--- monkeysphere-0.37/src/share/checkperms 2014-08-06 19:27:38.000000000 +0200
32+++ monkeysphere-0.37-patched/src/share/checkperms 2015-07-31 19:52:18.170675985 +0200
33@@ -1,4 +1,4 @@
34-#!/usr/bin/perl -T
35+#!/usr/bin/perl
36
37 # checkperms: ensure as best we can that a given file can only be
38 # modified by the given user (or the superuser, naturally). This
39diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/share/keytrans
40--- monkeysphere-0.37/src/share/keytrans 2014-08-06 19:27:38.000000000 +0200
41+++ monkeysphere-0.37-patched/src/share/keytrans 2015-07-31 20:13:36.664514290 +0200
42@@ -1,4 +1,4 @@
43-#!/usr/bin/perl -T
44+#!/usr/bin/perl
45
46 # keytrans: this is an RSA key translation utility; it is capable of
47 # transforming RSA keys (both public keys and secret keys) between
48@@ -1069,7 +1069,7 @@ sub packetwalk {
49
50
51 for (basename($0)) {
52- if (/^pem2openpgp$/) {
53+ if (/pem2openpgp/) {
54 my $rsa;
55 my $stdin;
56
57@@ -1107,7 +1107,7 @@ for (basename($0)) {
58 }
59 );
60 }
61- elsif (/^openpgp2ssh$/) {
62+ elsif (/openpgp2ssh/) {
63 my $fpr = shift;
64 my $instream;
65 open($instream,'-');
66@@ -1123,7 +1123,7 @@ for (basename($0)) {
67 die "No matching key found.\n";
68 }
69 }
70- elsif (/^openpgp2pem$/) {
71+ elsif (/openpgp2pem/) {
72 my $fpr = shift;
73 my $instream;
74 open($instream,'-');
75@@ -1139,7 +1139,7 @@ for (basename($0)) {
76 die "No matching key found.\n";
77 }
78 }
79- elsif (/^openpgp2spki$/) {
80+ elsif (/openpgp2spki/) {
81 my $fpr = shift;
82 my $instream;
83 open($instream,'-');
84@@ -1151,7 +1151,7 @@ for (basename($0)) {
85 die "No matching key found.\n";
86 }
87 }
88- elsif (/^keytrans$/) {
89+ elsif (/keytrans/) {
90 # subcommands when keytrans is invoked directly are UNSUPPORTED,
91 # UNDOCUMENTED, and WILL NOT BE MAINTAINED.
92 my $subcommand = shift;