Merge commit 'dkg/master'

diff --git a/Makefile b/Makefile
index 8d9ab2f1bb0dc33a2b769fc6794662ae6070e00a..6b674f169e0ae6aff5f9f449a523aad37f124ea8 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,8 @@ install: all installman
        mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
-       install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
-       install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
+       install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
+       install src/monkeysphere-authentication src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        install -m 0644 etc/gnupg-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-host.conf$(ETCSUFFIX)

diff --git a/packaging/debian/control b/packaging/debian/control
index 52eccf3f3da8b84a11deca72ab93e49ef5d8ddae..c20b97897f2fba594077ab95be8a497c436c95c0 100644 (file)
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -11,7 +11,7 @@ Dm-Upload-Allowed: yes
 
 Package: monkeysphere
 Architecture: any
-Depends: openssh-client, gnupg, coreutils (>= 6) | base64, lockfile-progs | procmail, adduser, ${shlibs:Depends}
+Depends: openssh-client, gnupg, coreutils (>= 6) | base64, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail, adduser, ${shlibs:Depends}
 Recommends: netcat | socat, ssh-askpass
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections

diff --git a/src/monkeyshell/Makefile b/src/monkeyshell/Makefile
deleted file mode 100644 (file)
index 312938e..0000000
--- a/src/monkeyshell/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-monkeyshell: monkeyshell.c
-       gcc -Wall -Werror --pedantic -o monkeyshell monkeyshell.c

diff --git a/src/monkeyshell/monkeyshell b/src/monkeyshell/monkeyshell
deleted file mode 100755 (executable)
index 95430f5..0000000
Binary files a/src/monkeyshell/monkeyshell and /dev/null differ

diff --git a/src/monkeyshell/monkeyshell.c b/src/monkeyshell/monkeyshell.c
deleted file mode 100644 (file)
index 7ef2a55..0000000
--- a/src/monkeyshell/monkeyshell.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-/* 
-   Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 
-   Date: 2008-09-04 19:11:18-0400
-   License: GPL v3+, if you actually care
-
-   This is a toy "shell" to install on demonstration systems.  If a
-   user can log in successfully, they get this cheery message, and an
-   unusual error code. 
-*/
-
-int main()
-{ 
-  printf("monkeys!\n");
-  return 123;
-}