Removed the gnutls component from our APT repo, since gnutls 2.6 is now in debian/unstable. Documented the changes, and changed the warning message that monkeysphere emits too.

2 files changed, 29 insertions, 0 deletions

diff --git a/website/news/gnutls-2.6-enables-monkeysphere.mdwn b/website/news/gnutls-2.6-enables-monkeysphere.mdwn
new file mode 100644
index 0000000..b7894c5
--- /dev/null
+++ b/website/news/gnutls-2.6-enables-monkeysphere.mdwn
@@ -0,0 +1,19 @@
+[[meta title="GnuTLS 2.6.x enables Monkeysphere to read authentication subkeys"]]
+
+We [announced earlier](/news/modified-gnutls-2.4.x-available) that the
+Monkeysphere project was providing patched versions of GnuTLS to
+support one piece of Monkeysphere functionality.  Fortunately, those
+patches are no longer needed, because as of [version
+2.6](http://article.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3135),
+GnuTLS contains the necessary functionality natively.
+
+Therefore, our project will no longer provide patched copies of
+GnuTLS, though we will continue to keep the patch alive in in [our git
+repository](/community) until GnuTLS 2.6 has been more widely adopted.
+
+If you were pulling patched versions of GnuTLS 2.4 from the
+Monkeysphere archive, you may prefer to pull GnuTLS 2.6 from [debian's
+experimental archive](http://wiki.debian.org/DebianExperimental) (at
+least until it GnuTLS 2.6 drops into unstable, which should happen
+shortly after the release of
+[lenny](http://wiki.debian.org/DebianLenny).
diff --git a/website/news/modified-gnutls-2.4.x-available.mdwn b/website/news/modified-gnutls-2.4.x-available.mdwn
index 44e08d0..36cfbfc 100644
--- a/website/news/modified-gnutls-2.4.x-available.mdwn
+++ b/website/news/modified-gnutls-2.4.x-available.mdwn
@@ -1,5 +1,15 @@
 [[meta title="Modified GnuTLS 2.4.x available"]]
 
+-----
+
+**2008-10-25 UPDATE:** [GnuTLS 2.6 has been released, and it contains the
+functionality we needed](/news/gnutls-2.6-enables-monkeysphere).
+Please upgrade to GnuTLS 2.6 if you need Monkeysphere to deal with
+passphrase-protected authentication subkeys.  The information on this
+page is now of historical interest only.
+
+-----
+
 The MonkeySphere project is now making available a patched version of
 [GnuTLS](http://gnutls.org/) version 2.4.x, which enhances the utility
 of the `monkeysphere` package by enabling it to read authentication