From 12d5b6a10438b5933193b079bb52b2438150ddcb Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 15 Nov 2008 16:38:07 -0500 Subject: make sure we clean up /var/lib/monkeysphere during prerm. --- packaging/debian/changelog | 6 ++++++ packaging/debian/monkeysphere.prerm | 2 ++ 2 files changed, 8 insertions(+) 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 Sat, 15 Nov 2008 16:36:57 -0500 + monkeysphere (0.21-1) unstable; urgency=low * New upstream release: diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm index 433a0aa..948bfee 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"/monkeysphere/gnupg-host || true +rmdir --ignore-fail-on-non-empty "$VARLIB"/monkeysphere/gnupg-authentication || true # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. -- cgit v1.2.3 From 786ca25009a33e3cd26281dafb6b4e8c7f22634f Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 15 Nov 2008 16:47:17 -0500 Subject: really fixing prerm --- packaging/debian/monkeysphere.prerm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm index 948bfee..05b29e6 100755 --- a/packaging/debian/monkeysphere.prerm +++ b/packaging/debian/monkeysphere.prerm @@ -9,8 +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"/monkeysphere/gnupg-host || true -rmdir --ignore-fail-on-non-empty "$VARLIB"/monkeysphere/gnupg-authentication || true +rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-host || true +rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication || true # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. -- cgit v1.2.3 From 6f58fa33e52e45d25e2221fbd7c8179c688061b4 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 15 Nov 2008 16:49:28 -0500 Subject: debian packaging: removing unnecessary error masking in {pre,post}rm --- packaging/debian/monkeysphere.postrm | 2 +- packaging/debian/monkeysphere.prerm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm index 8f87ed3..ffb6b6e 100755 --- a/packaging/debian/monkeysphere.postrm +++ b/packaging/debian/monkeysphere.postrm @@ -7,7 +7,7 @@ case $1 in purge) - rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere || true + rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere echo "removing monkeysphere user..." userdel monkeysphere > /dev/null || true ;; diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm index 05b29e6..00523a1 100755 --- a/packaging/debian/monkeysphere.prerm +++ b/packaging/debian/monkeysphere.prerm @@ -9,8 +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 || true -rmdir --ignore-fail-on-non-empty "$VARLIB"/gnupg-authentication || true +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. -- cgit v1.2.3 From 7156551783709dd6e7faa82de3f302a47758dbda Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 15 Nov 2008 16:54:26 -0500 Subject: do not fail in postrm if /var/lib/monkeysphere is already wiped. --- packaging/debian/monkeysphere.postrm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm index ffb6b6e..8f87ed3 100755 --- a/packaging/debian/monkeysphere.postrm +++ b/packaging/debian/monkeysphere.postrm @@ -7,7 +7,7 @@ case $1 in purge) - rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere + rmdir --ignore-fail-on-non-empty /var/lib/monkeysphere || true echo "removing monkeysphere user..." userdel monkeysphere > /dev/null || true ;; -- cgit v1.2.3 From 522b1ad1c3f043802e35af319a323bf96ff3676e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 15 Nov 2008 17:02:33 -0500 Subject: /var/lib/monkeysphere will get taken care of by debhelper appropriately. Leave it alone. --- packaging/debian/monkeysphere.postrm | 1 - 1 file changed, 1 deletion(-) 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 ;; -- cgit v1.2.3 From a6cade3c083ecb296588529ffd1bdc35b8a6586f Mon Sep 17 00:00:00 2001 From: mike castleman Date: Sat, 15 Nov 2008 17:21:54 -0500 Subject: fix my email address --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 070c992..c4aa418 100644 --- a/COPYING +++ b/COPYING @@ -7,7 +7,7 @@ It is free software, developed by: Jamie McClelland Micah Anderson Matthew Goins - Mike Castleman + Mike Castleman Elliot Winard Ross Glover Greg Lyle -- cgit v1.2.3 From 91f3af2bbc51a1ff185365968790c8fdcab7097f Mon Sep 17 00:00:00 2001 From: mike castleman Date: Sat, 15 Nov 2008 18:03:34 -0500 Subject: new bug: useful information --- website/bugs/useful-information.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 website/bugs/useful-information.mdwn 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. -- cgit v1.2.3