diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-01-31 11:35:42 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-01-31 11:35:42 -0500 |
| commit | c066aca91e4e9595bb0c709673dfc5a51666b4c9 (patch) | |
| tree | 109c3be2df214663e629cfb6d188ad083d5f05fb | |
| parent | 59b27e8cae2cd79f99e62cd89aea6dcaf678bf08 (diff) | |
| parent | 8e6fcc118095adc58335c594f50d367393d8f61a (diff) | |
add pem2openpgp to make install target
add link to pem2openpgp in openpgp2ssh man page
Merge commit 'micah/master'
Conflicts:
doc/george/changelog
| -rwxr-xr-x | Makefile | 2 | ||||
| -rw-r--r-- | doc/george/changelog | 5 | ||||
| -rw-r--r-- | man/man1/openpgp2ssh.1 | 1 |
3 files changed, 7 insertions, 1 deletions
@@ -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 99481c4..24e66f8 100644 --- 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 89df047..8374a9f 100644 --- 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 , |