[git] gnupg-doc - branch, master, updated. 5c1e39ab92b3f8b0e331374d22bfaf2ecf7a194e

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  5c1e39ab92b3f8b0e331374d22bfaf2ecf7a194e (commit)
      from  b05ad05ae599e642e6e1b13b39f1cfa59f8e376d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5c1e39ab92b3f8b0e331374d22bfaf2ecf7a194e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 29 16:46:10 2017 +0100

    swdb,web: Release gnupg 2.0.30 but remove references from the web.
    
    2.0 will reach end-of0-life in 2 days and thus it does not make sense
    to keep on mention it.

diff --git a/web/download/index.org b/web/download/index.org
index b2f83ae..36da43c 100644
--- a/web/download/index.org
+++ b/web/download/index.org
@@ -59,9 +59,7 @@
    | [[../software/gpgme/index.org][GPGME]]        | {{{gpgme_ver}}}        | {{{gpgme_date}}}        |        {{{gpgme_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2{{{ftpclose}}}                      | {{{ftpopen}}}{{{ftp_loc_base}}}/gpgme/gpgme-{{{gpgme_ver}}}.tar.bz2.sig{{{ftpclose}}}                      |
    | [[../software/gpa/index.org][GPA]]          | {{{gpa_ver}}}          | {{{gpa_date}}}          |          {{{gpa_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gpa/gpa-{{{gpa_ver}}}.tar.bz2{{{ftpclose}}}                            | {{{ftpopen}}}{{{ftp_loc_base}}}/gpa/gpa-{{{gpa_ver}}}.tar.bz2.sig{{{ftpclose}}}                            |
    |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
-   | GnuPG 2.0    | {{{gnupg20_ver}}}      | {{{gnupg20_date}}}      |      {{{gnupg20_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg20_ver}}}.tar.bz2{{{ftpclose}}}                    | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg20_ver}}}.tar.bz2.sig{{{ftpclose}}}                    |
    | GnuPG 1.4    | {{{gnupg1_ver}}}       | {{{gnupg1_date}}}       |       {{{gnupg1_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2{{{ftpclose}}}                     | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg1_ver}}}.tar.bz2.sig{{{ftpclose}}}                     |
-   | Dirmngr 1    | {{{dirmngr_ver}}}      | {{{dirmngr_date}}}      |      {{{dirmngr_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2{{{ftpclose}}}                | {{{ftpopen}}}{{{ftp_loc_base}}}/dirmngr/dirmngr-{{{dirmngr_ver}}}.tar.bz2.sig{{{ftpclose}}}                |
    |--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
 
    {{{check_sig_note}}}
@@ -76,17 +74,10 @@
 
    - /GPA/ is a graphical frontend to GnuPG.
 
-   - /GnuPG 2.0/ is an older branch of GnuPG.  This branch will reach
-     end-of-life on 2017-12-31.
-
    - /GnuPG 1.4/ is the old, single binary version which still support
      the unsafe PGP-2 keys.  This branch has no dependencies on the
-     above listed libraries or the Pinnetry.  However, it lacks many
-     features and will receive only important updates.
-
-   - /Dirmngr/ is an optional tool for use with /GnuPG 2.0/.  A
-     modernized version is included in the current GnuPG (2.1)
-     version.
+     above listed libraries or the Pinentry.  However, it lacks many
+     modern features and will receive only important updates.
 
 
 ** GnuPG binary releases
diff --git a/web/swdb.mac b/web/swdb.mac
index 95e7951..2f87b99 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -39,23 +39,15 @@
 
 
 #
-# GnuPG 2.0
+# GnuPG 2.0  (end-of-life)
 #
-#+macro: gnupg20_ver  2.0.30
-#+macro: gnupg20_date 2016-03-31
-#+macro: gnupg20_size 4311k
-#+macro: gnupg20_sha1 a9f024588c356a55e2fd413574bfb55b2e18794a
-#+macro: gnupg20_sha2 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71
+#+macro: gnupg20_ver  2.0.31
+#+macro: gnupg20_date 2017-12-29
+#+macro: gnupg20_size 4324k
+#+macro: gnupg20_sha1 a7d5021a6a39dd67942e00a1239e37063edb00f0
+#+macro: gnupg20_sha2 095558cfbba52fba582963e97b0c016889570b4712d6b871abeef2cf93e62293
 #+macro: gnupg20_branch  STABLE-BRANCH-2-0
 
-# temporary keep it as "gnupg"
-#+macro: gnupg_ver  2.0.30
-#+macro: gnupg_date 2016-03-31
-#+macro: gnupg_size 4311k
-#+macro: gnupg_sha1 a9f024588c356a55e2fd413574bfb55b2e18794a
-#+macro: gnupg_sha2 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71
-#+macro: gnupg_branch  STABLE-BRANCH-2-0
-
 
 #
 # GnuPG-1
@@ -138,7 +130,7 @@
 
 
 #
-# DirMngr
+# DirMngr (not any longer needed)
 #
 #+macro: dirmngr_ver  1.1.1
 #+macro: dirmngr_date 2013-04-26

-----------------------------------------------------------------------

Summary of changes:
 web/download/index.org | 13 ++-----------
 web/swdb.mac           | 22 +++++++---------------
 2 files changed, 9 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org