diff options
author | Jameson Graef Rollins <jrollins@finestructure.net> | 2008-11-15 18:21:31 -0500 |
---|---|---|
committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2008-11-15 18:21:31 -0500 |
commit | a66dc768e8a6cd46f9b260e7d3421a03cbefc365 (patch) | |
tree | 70bf23affbfb2b7572185cdc10f49307cac5e031 | |
parent | b259e0e8f928b4ac082fbe66c7c170b611b932c9 (diff) | |
parent | 91f3af2bbc51a1ff185365968790c8fdcab7097f (diff) |
Merge commit 'mlcastle/master'
-rw-r--r-- | COPYING | 2 | ||||
-rw-r--r-- | packaging/debian/changelog | 6 | ||||
-rwxr-xr-x | packaging/debian/monkeysphere.postrm | 1 | ||||
-rwxr-xr-x | packaging/debian/monkeysphere.prerm | 2 | ||||
-rw-r--r-- | website/bugs/useful-information.mdwn | 10 |
5 files changed, 19 insertions, 2 deletions
@@ -7,7 +7,7 @@ It is free software, developed by: Jamie McClelland <jamie@mayfirst.org> Micah Anderson <micah@riseup.net> Matthew Goins <mjgoins@openflows.com> - Mike Castleman <mlcastle@mlcastle.net> + Mike Castleman <m@mlcastle.net> Elliot Winard <enw@caveteen.com> Ross Glover <ross@ross.mayfirst.org> Greg Lyle <greg@stealthisemail.com> diff --git a/packaging/debian/changelog b/packaging/debian/changelog index bed79ea..62f021e 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +monkeysphere (0.21-2) unstable; urgency=low + + * actually rmdir /var/lib/monkeysphere-* during prerm if possible. + + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Sat, 15 Nov 2008 16:36:57 -0500 + monkeysphere (0.21-1) unstable; urgency=low * New upstream release: diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm index 8f87ed3..7c0fede 100755 --- a/packaging/debian/monkeysphere.postrm +++ b/packaging/debian/monkeysphere.postrm @@ -7,7 +7,6 @@ case $1 in purge) - rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere || true echo "removing monkeysphere user..." userdel monkeysphere > /dev/null || true ;; diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm index 433a0aa..00523a1 100755 --- a/packaging/debian/monkeysphere.prerm +++ b/packaging/debian/monkeysphere.prerm @@ -9,6 +9,8 @@ VARLIB="/var/lib/monkeysphere" rm -f "$VARLIB"/gnupg-host/gpg.conf rm -f "$VARLIB"/gnupg-authentication/gpg.conf +rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-host +rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/website/bugs/useful-information.mdwn b/website/bugs/useful-information.mdwn new file mode 100644 index 0000000..0750354 --- /dev/null +++ b/website/bugs/useful-information.mdwn @@ -0,0 +1,10 @@ +I would like to know, at INFO (default) log level, when the +monkeyspehere makes a "real" modification to my known_hosts file; that +is, when it adds or deletes a key. + +Apparently this is hard because monkeysphere is currently configured to +delete all keys and then add good keys, so a key added for the first +time seems to the monkeysphere very similar to a key re-added ten +seconds after last login. + +Still, from a UI perspective, I want to know what monkeysphere is doing. |