Add PGP signature information to changelog and download web pages

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/Makefile.am b/Makefile.am
index acbfcb0..2d59e87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,9 @@ tag: uncommitted-check
        @( echo '1,/<!-- latest-release-start -->/p' ;\
           echo '/<!-- latest-release-end -->/,$$p' ;\
           echo  '/<!-- latest-release-start -->/a\' ;\
-          echo  'The latest release is <a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-$(VERSION).tar.gz">OpenConnect v$(VERSION)</a>, released on $(shell date +%Y-%m-%d) with the following changelog:</p>\' ;\
+          echo  'The latest release is <a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-$(VERSION).tar.gz">OpenConnect v$(VERSION)</a>\' ;\
+          echo  '<i>(<a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-$(VERSION).tar.gz.asc">PGP signature</a>)</i>,\' ;\
+          echo 'released on $(shell date +%Y-%m-%d) with the following changelog:</p>\' ;\
           sed '0,/<b>OpenConnect HEAD/d;/<\/ul><br\/>/,$$d;s/$$/\\/' www/changelog.xml ;\
           echo '     </ul>' ) | \
         sed -n -f - -i www/download.xml
@@ -75,7 +77,8 @@ tag: uncommitted-check
           echo '     <ul>\' ;\
           echo '       <li><i>No changelog entries yet</i></li>\';\
           echo '     </ul><br/>\' ;  echo '  </li>\' ;\
-          echo '  <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-$(VERSION).tar.gz">OpenConnect v$(VERSION)</a></b> &#8212; $(shell date +%Y-%m-%d)' ) | \
+          echo '  <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-$(VERSION).tar.gz">OpenConnect v$(VERSION)</a></b>\' ;\
+          echo '     <i>(<a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-$(VERSION).tar.gz.asc">PGP signature</a>)</i> &#8212; $(shell date +%Y-%m-%d)' ) | \
                sed -f - -i www/changelog.xml
 # stupid syntax highlighting '
        @git commit -s -m "Tag version $(VERSION)" configure.ac version.sh www/download.xml www/changelog.xml

diff --git a/www/changelog.xml b/www/changelog.xml
index f741340..38f51cb 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -24,7 +24,8 @@
        <li>Attempt to make NLS support more portable (with fewer dependencies).</li>
      </ul><br/>
   </li>
-  <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.13.tar.gz">OpenConnect v3.13</a></b> &#8212; 2011-09-30
+  <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.13.tar.gz">OpenConnect v3.13</a></b>
+     <i>(<a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.13.tar.gz.asc">PGP signature</a>)</i> &#8212; 2011-09-30
      <ul>
        <li>Add <tt>--cert-expire-warning</tt> option.</li>
        <li>Give visible warning when server dislikes client SSL certificate.</li>

diff --git a/www/download.xml b/www/download.xml
index 80842a0..242dd35 100644 (file)
--- a/www/download.xml
+++ b/www/download.xml
@@ -15,12 +15,13 @@
 <p>Released versions of OpenConnect are available from the FTP site:</p>
 <ul><li><a href="ftp://ftp.infradead.org/pub/openconnect/"><tt>ftp://ftp.infradead.org/pub/openconnect/</tt></a></li></ul>
 
-<p><i>(Note: Due to a longstanding <a href="https://bugzilla.redhat.com/show_bug.cgi?id=450853">Fedora bug</a>
-you may occasionally find that the FTP server is accessible only by IPv6 and not Legacy IP. If this happens,
-please let me know by sending me an email. Or just join us in the 21st century and <a href="http://en.wikipedia.org/wiki/List_of_IPv6_tunnel_brokers">get IPv6</a>.)</i></p>
+<p>Release tarballs (since 3.13) are signed with the PGP key <a href="http://pgp.mit.edu:11371/pks/lookup?op=vindex&amp;search=0x63762CDA67E2F359">67E2F359</a>.</p>
+
 <p>
 <!-- latest-release-start -->
-The latest release is <a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.13.tar.gz">OpenConnect v3.13</a>, released on 2011-09-30 with the following changelog:</p>
+The latest release is <a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.13.tar.gz">OpenConnect v3.13</a>
+<i>(<a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.13.tar.gz.asc">PGP signature</a>)</i>,
+released on 2011-09-30 with the following changelog:</p>
      <ul>
        <li>Add <tt>--cert-expire-warning</tt> option.</li>
        <li>Give visible warning when server dislikes client SSL certificate.</li>
@@ -32,7 +33,11 @@ The latest release is <a href="ftp://ftp.infradead.org/pub/openconnect/openconne
      </ul>
 <!-- latest-release-end -->
 
-For older releases and change logs, see the <a href="changelog.html">changelog page</a>.
+<p>For older releases and change logs, see the <a href="changelog.html">changelog page</a>.</p>
+
+<p><i>(Note: Due to a longstanding <a href="https://bugzilla.redhat.com/show_bug.cgi?id=450853">Fedora bug</a>
+you may occasionally find that the FTP server is accessible only by IPv6 and not Legacy IP. If this happens,
+please let me know by sending me an email. Or just join us in the 21st century and <a href="http://en.wikipedia.org/wiki/List_of_IPv6_tunnel_brokers">get IPv6</a>.)</i></p>
 
 <h2>Latest sources</h2>