summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING2
-rw-r--r--doc/zimmerman/changelog3
-rw-r--r--packaging/debian/changelog6
-rwxr-xr-xpackaging/debian/monkeysphere.postrm1
-rwxr-xr-xpackaging/debian/monkeysphere.prerm2
-rwxr-xr-xutils/build-freebsd-distinfo2
-rwxr-xr-xutils/build-releasenote2
-rw-r--r--website/bugs/useful-information.mdwn10
-rw-r--r--website/download.mdwn36
-rw-r--r--website/news/release-0.21-1.mdwn10
10 files changed, 52 insertions, 22 deletions
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 <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/doc/zimmerman/changelog b/doc/zimmerman/changelog
index a92198c..e833b1e 100644
--- a/doc/zimmerman/changelog
+++ b/doc/zimmerman/changelog
@@ -14,3 +14,6 @@
http://nynex.net/keydump/ -e robots=off
* install monkeysphere 0.21-2 package
+2008-11-15 - jamie
+ * aptitude install esmtp-run mailx
+ * edited /etc/esmtp-run, configured to relay to bulk.mayfirst.org
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/utils/build-freebsd-distinfo b/utils/build-freebsd-distinfo
index a333ba7..53fcd69 100755
--- a/utils/build-freebsd-distinfo
+++ b/utils/build-freebsd-distinfo
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=`head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
+VERSION=`head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
{
echo "MD5 (monkeysphere_${VERSION}.orig.tar.gz) =" $(md5sum "monkeysphere_${VERSION}.orig.tar.gz" | cut -f1 -d\ )
diff --git a/utils/build-releasenote b/utils/build-releasenote
index f7561da..522917c 100755
--- a/utils/build-releasenote
+++ b/utils/build-releasenote
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=`head -n1 debian/changelog | sed 's/.*(\([^)]*\)).*/\1/'`
+VERSION=`head -n1 packaging/debian/changelog | sed 's/.*(\([^)]*\)).*/\1/'`
{
sed "s/__VERSION__/$VERSION/g" < utils/releasenote.header
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.
diff --git a/website/download.mdwn b/website/download.mdwn
index b73beba..e67d0dc 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -75,38 +75,38 @@ For those that would like to download the source directly, [the source
is available](/community) via [git](http://git.or.cz/).
The [latest
-tarball](http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.20.orig.tar.gz)
+tarball](http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_.orig.tar.gz)
is also available, and has these checksums:
<pre>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-checksums for the monkeysphere 0.20 release:
+checksums for the monkeysphere 0.21 release:
MD5:
-2503b0e83cab1dff339f73a2734ac185 monkeysphere_0.20.orig.tar.gz
+15fe181983565aca0fbe4c41f9f6752e monkeysphere_0.21.orig.tar.gz
SHA1:
-8775a3569f2ac3a3e7977441b93c431677f44435 monkeysphere_0.20.orig.tar.gz
+27e915a45cdbe50a139ed4f4b13746b17c165b0f monkeysphere_0.21.orig.tar.gz
SHA256:
-c8e0e2a2ad26b7690147eabb69e2cffaa1d8c114d3c6878e2f05a5f21387c0dd monkeysphere_0.20.orig.tar.gz
+1535c3f722f5f5c1646a4981efef4a262ac7b23bf4b980c9aee11af2600eedc2 monkeysphere_0.21.orig.tar.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
-iQIVAwUBSR8fFhjmZ/HrivMUAQLMDA/+OYFSqeEilDu+Tw8H4KNUWG6Li5IXf7Yc
-G3FGMueN0ILnnEF4F3XBz4zd0Km1qi5v4dFsLUGtqbd7uUOPXa24G6+T6srRh90x
-6vKcOuPmQeaHZaVwHeliA32yLa5Oh1TuSKZ9imDzqmcbYDW5ekKKNv07dEuS8pbt
-DkJ6XXnPC2Pe1W9jUFsfOQJn797ZjbPxyu1uops2CZTo04nS4pWvVjwiwiNNbzjt
-kknsFObcv9TfbtHQNoMKI7IEjp2TuGT5Au6y0U0mQZnJ3O7VjGZkS0noq4dxIIyN
-vApChk69J8fixQD+DDo9ewBUS+hWkpaJxQyDWrpE8kAlT/jEG89PEpUZtO6E3MlP
-4eHX8keI45+RkthE2uQDQjtAObIn7+RI+LOzTmwPP8WqP71IVeCmhtofKhDO6rIS
-1wOx8JEoW3UbFujsoXmwNdJj9M9TLo0NSbDXsg++3HSivA9AFmAvZWYhQ1nIfOFq
-poK2CXCk2qfRMowhPC4MeBahaErdlvZM/t72zGwtfgS4fmU4nk6Z0QD7ImfBOelo
-kTPw3V7n8rM6cAtdI86d0oYVsEFmqkJH6ih/fBHad8hGniwNeZG9ipeSZUEyvrMg
-u5Y6fMRkUPpikIEchRNUph39NVIKt8YqeiQyrp8t6xSHQucz74uBPOFMaS2VUifH
-oijtS4Im4IA=
-=UeKa
+iQIVAwUBSR8+7BjmZ/HrivMUAQLeKg/+JT4LCXBR/06p/w2KBd1MKqch5Qf2ryIo
+mxCTWtZRgVQSeOFUJ5SXX+Tfs7VZfkV5HuahUH3NmGC6EMhYyB2olwBOOoIAqEKw
+1zVyn49bowCee+gTc3QHyT0Eqgt2ARtzl3/VrHkiw2MaJN3IZXseovyL8ksnEu+u
+s8fq26imtBrrucIxp4ZtHUw/h/YrJohHcJ8QQN5/UWFLug4C4aRFmnzL+oCySxAa
+0au/zFxxRZE5pMhLUvRwwCwPFx2CGBz6y9lAOiDPhhUqh+Bf7JKWJzk35Dj5Tm+2
+lCIzYtfpBkuF9ehCrm8WYF5aFg+gto8Bc6IJci9J6h2npBYIG0IbWOknMZz3+Ti2
+c3EltlJjK0LKEHujDYjf9tkNAxbBdtlYuw8x925ILeK7n8xX0Jr1TDzPyAIYaogv
+IVqsgnvQ489K8k06173kyrPaetyvOlU3bN1zcPdqTyCD6+eBbeCeKXO4324C8iMF
+rQPW4HScOdIidqFuzHyIT7PoY4DwWMgeAVymRSEufifvRcdCvQdlC4MaxxVf5I8A
+ATkD3CrY+5NZeERAGbmlu7Uz+sUk5tLUH0Q2qvjZUIQRctfr4BMheuBubsLR9yP3
+FZ4Q4kl34eU/WU7NtTmIFy7gDhLSIoeQINfYZlNEXQ7Y/RZUOEwoPI/spAXgw6De
+Xpsw0wPZtcM=
+=JDaA
-----END PGP SIGNATURE-----
</pre>
diff --git a/website/news/release-0.21-1.mdwn b/website/news/release-0.21-1.mdwn
new file mode 100644
index 0000000..e807775
--- /dev/null
+++ b/website/news/release-0.21-1.mdwn
@@ -0,0 +1,10 @@
+[[meta title="Monkeysphere 0.21-1 released!"]]
+
+Monkeysphere 0.21-1 has been released.
+
+Notes from the changelog:
+
+<pre>
+</pre>
+
+[[Download]] it now!