Merge branch 'master' of webmaster@george.riseup.net:monkeysphere

diff --git a/debian/changelog b/debian/changelog
index 7e1af90553bc492efda9119bb9dc1f9e871b5882..0b38c6a9990c89301772493e28fd76082d832d48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 monkeysphere (0.10-1) experimental; urgency=low
 
-  * Fix bug in previous uid processing bug fix (stupid stupid).
+  [ Jameson Graef Rollins ]
+  * brown paper bag release: invert test on calculated validity of keys.
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Mon, 18 Aug 2008 13:16:15 -0700
+ -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Mon, 18 Aug 2008 16:22:34 -0400
 
 monkeysphere (0.9-1) experimental; urgency=low
 

diff --git a/doc/TODO b/doc/TODO
index 6006d628b5820b4a5681800380fd25c0c25d3b75..733986e102224cb374510c2cf46adc367381a310 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -14,12 +14,6 @@ Work out the details (and describe a full use case) for assigning a
    do we export it so it's available when a second-party revocation is
    needed?
 
-Actually enable server hostkey publication.
-
-Streamline host key generation, publication, verification.  See
-   doc/george/host-key-publication for what dkg went through on
-   2008-06-19
-
 Ensure that authorized_user_ids are under as tight control as ssh
    expects from authorized_keys: we don't want monkeysphere to be a
    weak link in the filesystem.
@@ -47,7 +41,7 @@ Create ssh2openpgp or convert to full-fledged keytrans.
 
 Resolve the bugs listed in openpgp2ssh(1):BUGS.
 
-Understand and document alternate trustdb models.
+Document alternate trustdb models.
 
 Understand and document the output of gpg --check-trustdb:
  gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
@@ -101,6 +95,3 @@ Fix behavior when add-identity-certifier fails to fetch a key from the
 
 Allow server administrators to add-identity-certifier from a key in
    the filesystem (or on stdin, etc)
-
-Add "monkeysphere-server diagnostics" subcommand to identify missing
-   pieces of monkeysphere server administration setup.

diff --git a/doc/george/changelog b/doc/george/changelog
index 2c32703e88909235b92d6b108a70d3b776b05234..ae5061a61aa206471f361cd376a4ff4d91584daf 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -11,7 +11,10 @@
        * moved monkeysphere apt repo entry to
          /etc/apt/sources.list.d/monkeysphere.list
        * aptitude update && aptitude full-upgrade (including monkeysphere
-         0.8-1)
+         0.9-1)
+       * switched george's monkeysphere-server preferred keyserver to
+         monkeysphere.info for the moment.  Both pgp.mit.edu and
+         subkeys.pgp.net are sluggish right now :/
        
 2008-08-16 - jrollins
        * removed stale branches from jrollins from the master repo

diff --git a/website/news/release-0.10-1.mdwn b/website/news/release-0.10-1.mdwn
new file mode 100644 (file)
index 0000000..c159fa6
--- /dev/null
+++ b/website/news/release-0.10-1.mdwn
@@ -0,0 +1,6 @@
+[[meta title="MonkeySphere 0.10-1 released!"]]
+
+# MonkeySphere 0.10-1 released! #
+
+MonkeySphere 0.10-1 has been released.  This is a bugfix-only release,
+fixing an critical inverted test in 0.9-1.  [[download]] it now!