Add workarounds for macro regressions in org-mode 8.
authorWerner Koch <wk@gnupg.org>
Wed, 11 Dec 2013 20:00:01 +0000 (21:00 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 11 Dec 2013 20:00:01 +0000 (21:00 +0100)
web/download/index.org
web/download/integrity_check.org
web/index.org
web/related_software/frontends.org
web/share/btn-donate.png [new file with mode: 0644]
web/share/logo-sponsor.png [new file with mode: 0644]
web/share/pace.png [new file with mode: 0644]
web/share/setup.inc
web/swdb.mac

index 9b07567..6bf93ae 100644 (file)
@@ -2,6 +2,9 @@
 #+STARTUP: showall
 #+SETUPFILE: "../share/setup.inc"
 #+macro: check_sig_note  GnuPG distributions are signed. It is wise and more secure to check out for their [[integrity_check.org][integrity]].
+#+macro: ftpopen  @@html:<a href="@@
+#+macro: ftpclose @@html:">FTP</a>@@
+
 
 * Download
 
    GnuPG 2.0 is the new modularized version of GnuPG supporting
    OpenPGP and S/MIME
 
-   | GnuPG {{{gnupg_ver}}} full source code     | {{{gnupg_size}}} | S | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                |                  |   | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2.sig][FTP]] |
+   | GnuPG {{{gnupg_ver}}} full source code     | {{{gnupg_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2{{{ftpclose}}}  |
+   | Signature for previous file                |                  |   | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{gnupg_sha1}}} gnupg-{{{gnupg_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
 ** GnuPG 1.4
 #  <<gnupg1>>
 
-   | GnuPG {{{gnupg1_ver}}} source compressed using /bzip2/     | {{{gnupg1_size}}}       | S | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                                |                         |   | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2.sig][FTP]] |
-   | GnuPG {{{gnupg1_ver}}} source compressed using /gzip/      | {{{gnupg1_size_gz}}}    | S | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.gz][FTP]] |
-   | Signature for previous file                                |                         |   | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.gz.sig][FTP]] |
-   | A patch file to upgrade to a {{{gnupg1_ver}}} source tree  | {{{gnupg1_patch_size}}} | S | [[{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_patch_ver}}}.diff.bz2][FTP]] |
+   | GnuPG {{{gnupg1_ver}}} source compressed using /bzip2/     | {{{gnupg1_size}}}       | S | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file                                |                         |   | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2.sig{{{ftpclose}}} |
+   | GnuPG {{{gnupg1_ver}}} source compressed using /gzip/      | {{{gnupg1_size_gz}}}    | S | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.gz{{{ftpclose}}} |
+   | Signature for previous file                                |                         |   | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.gz.sig{{{ftpclose}}} |
+   | A patch file to upgrade to a {{{gnupg1_ver}}} source tree  | {{{gnupg1_patch_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gnupg/gnupg-{{{gnupg1_patch_ver}}}.diff.bz2{{{ftpclose}}} |
 
    SHA-1 checksums for the above files:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{gnupg1_sha1}}} gnupg-{{{gnupg1_ver}}}.tar.bz2
    {{{gnupg1_sha1_gz}}} gnupg-{{{gnupg1_ver}}}.tar.gz
    {{{gnupg1_patch_sha1}}} gnupg-{{{gnupg1_patch_ver}}}.diff.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    Select one of them. To shorten the download time, you probably want
    to get the /bzip2/ compressed file. Please try another mirror if
@@ -88,8 +91,8 @@
    [[../related_software/gpa/index.org][GPA]] is still work in progress, so don't expect that everything
    works and be careful when using production quality secret keys.
 
-   | GPA {{{gpa_ver}}} full source code | {{{gpa_size}}} | S | [[{{{ftp_base}}}/gcrypt/gpa/gpa-{{{gpa_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file        |                |   | [[{{{ftp_base}}}/gcrypt/gpa/gpa-{{{gpa_ver}}}.tar.bz2.sig][FTP]] |
+   | GPA {{{gpa_ver}}} full source code | {{{gpa_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/gpa/gpa-{{{gpa_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file        |                |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/gpa/gpa-{{{gpa_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    {{{check_sig_note}}}
 
    encryption, decryption, signing, signature verification and key
    management.
 
-   | GPGME {{{gpgme_ver}}} full source code | {{{gpgme_size}}} | S | [[{{{ftp_base}}}/gcrypt/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file            |                  |   | [[{{{ftp_base}}}/gcrypt/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2.sig][FTP]] |
+   | GPGME {{{gpgme_ver}}} full source code | {{{gpgme_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file            |                  |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{gpgme_sha1}}} gpgme-{{{gpgme_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
 
    [[../related_software/libraries.en.html#lib-libgcrypt][Libgcrypt]] is GNU's basic cryptographic library.
 
-   | Libgcrypt {{{libgcrypt_ver}}} full source code | {{{libgcrypt_size}}} | S | [[{{{ftp_base}}}/gcrypt/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                    |                      |   | [[{{{ftp_base}}}/gcrypt/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2.sig][FTP]] |
+   | Libgcrypt {{{libgcrypt_ver}}} full source code | {{{libgcrypt_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file                    |                      |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{libgcrypt_sha1}}} libgcrypt-{{{libgcrypt_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
 
    [[../related_software/libraries.en.html#lib-libksba][Libksba]] is a CMS and X.509 access library.
 
-   | Libksba {{{libksba_ver}}} full source code | {{{libksba_size}}} | S | [[{{{ftp_base}}}/gcrypt/libksba/libksba-{{{libksba_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                |                    |   | [[{{{ftp_base}}}/gcrypt/libksba/libksba-{{{libksba_ver}}}.tar.bz2.sig][FTP]] |
+   | Libksba {{{libksba_ver}}} full source code | {{{libksba_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libksba/libksba-{{{libksba_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file                |                    |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libksba/libksba-{{{libksba_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{libksba_sha1}}} libksba-{{{libksba_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
    GnuPG 2.0. It might also be installed as a system daemon for CRL
    and OCSP checks.
 
-   | DirMngr {{{dirmngr_ver}}} full source code | {{{dirmngr_size}}} | S | [[{{{ftp_base}}}/gcrypt/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                |                    |   | [[{{{ftp_base}}}/gcrypt/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2.sig][FTP]] |
+   | DirMngr {{{dirmngr_ver}}} full source code | {{{dirmngr_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file                |                    |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{dirmngr_sha1}}} dirmngr-{{{dirmngr_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
    [[../related_software/libraries.en.html#lib-libgpg-error][Libgpg-error]] is a small library with error codes and descriptions
    shared by most GnuPG related software.
 
-   | Libgpg-error {{{libgpg_error_ver}}} full source code | {{{libgpg_error_size}}} | S | [[{{{ftp_base}}}/gcrypt/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                          |                         |   | [[{{{ftp_base}}}/gcrypt/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2.sig][FTP]] |
+   | Libgpg-error {{{libgpg_error_ver}}} full source code | {{{libgpg_error_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file                          |                         |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{libgpg_error_sha1}}} libgpg-error-{{{libgpg_error_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
 
    [[../related_software/libraries.en.html#lib-libassuan][Libassuan]] is the IPC library used by some GnuPG related software.
 
-   | Libassuan {{{libassuan_ver}}} full source code | {{{libassuan_size}}} | S | [[{{{ftp_base}}}/gcrypt/libassuan/libassuan-{{{libassuan_ver}}}.tar.bz2][FTP]] |
-   | Signature for previous file                    |                      |   | [[{{{ftp_base}}}/gcrypt/libassuan/libassuan-{{{libassuan_ver}}}.tar.bz2.sig][FTP]] |
+   | Libassuan {{{libassuan_ver}}} full source code | {{{libassuan_size}}} | S | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libassuan/libassuan-{{{libassuan_ver}}}.tar.bz2{{{ftpclose}}} |
+   | Signature for previous file                    |                      |   | {{{ftpopen}}}{{{ftp_base}}}/gcrypt/libassuan/libassuan-{{{libassuan_ver}}}.tar.bz2.sig{{{ftpclose}}} |
 
    SHA-1 checksum for the above file:
-#+begin_example:
+   {{{begin_chksum}}}
    {{{libassuan_sha1}}} libassuan-{{{libassuan_ver}}}.tar.bz2
-#+end_example:
+   {{{end_chksum}}}
 
    {{{check_sig_note}}}
 
   The latest version of the [[../related_software/libraries.en.html#lib-EGD][Entropy Gathering Daemon]] is available at
   the usual GnuPG sites:
 
-  | EGD 0.8 source code.         | 30kB | S | [[ftp://ftp.gnupg.org/gcrypt/egd/egd-0.8.tar.gz][FTP]] |
-  | Signature for previous file. |      |   | [[ftp://ftp.gnupg.org/gcrypt/egd/egd-0.8.tar.gz.asc][FTP]] |
+  | EGD 0.8 source code.         | 30kB | S | {{{ftpopen}}}{{{ftp_base}}}/egd/egd-0.8.tar.gz{{{ftpclose}}} |
+  | Signature for previous file. |      |   | {{{ftpopen}}}{{{ftp_base}}}/egd/egd-0.8.tar.gz.asc{{{ftpclose}}} |
 
   {{{check_sig_note}}}
index 31d7165..2ca4447 100644 (file)
@@ -16,9 +16,9 @@
   signature of the file =gnupg-{{{gnupg_ver}}}.tar.bz2= you would use
   this command:
 
-#+begin_example
-  gpg --verify gnupg-{{{gnupg_ver}}}.tar.bz2.sig
-#+end_example
+  {{{begin_example}}}
+  gpg {{{twodashes}}}verify gnupg-{{{gnupg_ver}}}.tar.bz2.sig
+  {{{end_example}}}
 
   This checks whether the signature file matches the source file. You
   should see a message indicating that the signature is good and made
 
    If you are not able to use an old version of GnuPG, you have to
    verify the SHA1 checksum. Assuming you downloaded the file
-   =gnupg-{{{gnupg_ver}}}.tar.bz2=, you would run the =sha1sum=
+   gnupg-{{{gnupg_ver}}}.tar.bz2, you would run the =sha1sum=
    command like this:
 
-#+begin_example
+   {{{begin_chksum}}}
    sha1sum gnupg-{{{gnupg_ver}}}.tar.bz2
-#+end_example
+   {{{end_chksum}}}
 
    and check that the output matches the SHA-1 checksum reported on
    this site. An example of a =sha1sum= output is:
 
-#+begin_example
+   {{{begin_chksum}}}
    {{{gnupg_sha1}}}  gnupg-{{{gnupg_ver}}}.tar.bz2
-#+end_example
+   {{{end_chksum}}}
 
    To be sure that this page has not been tampered, you may want to
    compare the list below with the one included in the announcement
@@ -56,7 +56,7 @@
    For your convenience, all SHA1 sums available for software that can
    be downloaded from [[ftp://ftp.gnupg.org/][our site]], have been gathered below.
 
-#+begin_example
+   {{{begin_chksum}}}
    {{{dirmngr_sha1}}}  dirmngr-{{{dirmngr_ver}}}.tar.bz2
    {{{gnupg1_patch_sha1}}}  gnupg-{{{gnupg1_patch_ver}}}.diff.bz2
    {{{gnupg1_sha1_gz}}}  gnupg-{{{gnupg1_ver}}}.tar.gz
@@ -69,4 +69,7 @@
    {{{libgpg_error_sha1}}}  libgpg-error-{{{libgpg_error_ver}}}.tar.bz2
    {{{libksba_sha1}}}  libksba-{{{libksba_ver}}}.tar.bz2
    {{{pinentry_sha1}}}  pinentry-{{{pinentry_ver}}}.tar.bz2
-#+end_example
+   {{{end_chksum}}}
+
+
+#eof#
index 66423e7..e7bd97a 100644 (file)
@@ -34,7 +34,6 @@ integrated into an installer and features all required tools.
 
 Project [[http://www.gnupg.org/aegypten/][Aegypten]] developed the S/MIME functionality in GnuPG 2.
 
-
 * Latest news
 #+index: News
 
index e0b0b55..970cd16 100644 (file)
@@ -11,7 +11,7 @@
   homogeneous categories. A frontend may belong to one or more
   categories at a time. A list is sorted in an alphabetical order.
 
-  -  [[GUI frontends]]
+  -  [[GUI%20frontends][GUI frontends]]
   -  [[MUA frontends]]
   -  [[Chat programs]]
   -  [[Network related]]
diff --git a/web/share/btn-donate.png b/web/share/btn-donate.png
new file mode 100644 (file)
index 0000000..f1d9a46
Binary files /dev/null and b/web/share/btn-donate.png differ
diff --git a/web/share/logo-sponsor.png b/web/share/logo-sponsor.png
new file mode 100644 (file)
index 0000000..fc7abfc
Binary files /dev/null and b/web/share/logo-sponsor.png differ
diff --git a/web/share/pace.png b/web/share/pace.png
new file mode 100644 (file)
index 0000000..d627c9a
Binary files /dev/null and b/web/share/pace.png differ
index 19e3b79..d61756a 100644 (file)
@@ -4,3 +4,14 @@
 # FIXME: Figure out a way to use SETUPFILE based on the directory of
 #        the currently SETUPFILE loaded file.
 #+SETUPFILE: "/home/wk/s/gnupg-doc/web/swdb.mac"
+
+
+# Org version 8 des not anymore expand macros in all places.  We use
+# some ugly macros instead of the #+begin_example et al.
+
+#+macro: begin_example @@html:<pre class="example">@@
+#+macro: end_example   @@html:</pre>@@
+#+macro: begin_chksum  @@html:<pre class="example">@@
+#+macro: end_chksum    @@html:</pre>@@
+
+#+macro: twodashes     @@html:--@@
index a896a04..7b4d696 100644 (file)
@@ -5,7 +5,6 @@
 #
 #+macro: ftp_base  ftp://ftp.gnupg.org/gcrypt
 
-
 #
 # GnuPG-2
 #