add pem2openpgp to make install target

add link to pem2openpgp in openpgp2ssh man page
Merge commit 'micah/master'

Conflicts:

	doc/george/changelog

diff --git a/Makefile b/Makefile
index e40c4b18366bb374b690921707d6f9dcda8fc885..8d9ab2f1bb0dc33a2b769fc6794662ae6070e00a 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ 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 $(DESTDIR)$(PREFIX)/bin
+       install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
        install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
        install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere

diff --git a/doc/george/changelog b/doc/george/changelog
index 99481c4d277bac3c02dfc53c5305617474e01bcf..24e66f88f7d3934a173d4551c06baeec9d2a5e34 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,11 @@
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
 
+2009-01-30 - micah
+       * Replaced nullmailer with postfix, nullmailer doesn't handle aliases
+         and insisted either on constantly respooling mail when there was no
+         where to go. 
+
 2009-01-24 - micah
        * Configured /etc/aliases to have root go to mjgoins, micah, dkg, jrollins
        * Configured /etc/nullmailer/remotes to have mail.riseup.net so remote delivery will work

diff --git a/man/man1/openpgp2ssh.1 b/man/man1/openpgp2ssh.1
index 89df0473fd31200c53a8694d563acd76d71edc2d..8374a9f7858765bbfd139b89039857fb08f360a8 100644 (file)
--- a/man/man1/openpgp2ssh.1
+++ b/man/man1/openpgp2ssh.1
@@ -90,6 +90,7 @@ only acts on keys associated with the first primary key
 passed in.  If you send it more than one primary key, it will silently
 ignore later ones.
 .Sh SEE ALSO
+.Xr pem2openpgp 1 ,
 .Xr monkeysphere 1 ,
 .Xr monkeysphere 7 ,
 .Xr ssh 1 ,