[git] gnupg-doc - branch, master, updated. d2ac7df3fb9fcaf2f45f6a8e226c14a8500cee23
by Werner Koch
cvs at cvs.gnupg.org
Wed Aug 23 14:43:43 CEST 2017
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 d2ac7df3fb9fcaf2f45f6a8e226c14a8500cee23 (commit)
from 904ba293ec7ee27f4636b04cc7ca8bc94bbc0f14 (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 d2ac7df3fb9fcaf2f45f6a8e226c14a8500cee23
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 23 14:40:16 2017 +0200
swdb: Rename some tags.
We now use the tag "gnupg22" instead of "gnupg21" for the 2.2 branch.
The next development branch 2.3.x will then be availabale under the
tag "gnupg24" so that there is always a fixed tag for each stable
branch. For backward compatibility we keep the "gnupg21" for a while.
Also rename "gnupg" to "gnupg20" for the old-stable branch. We keep
"gnupg" as a duplicate until the release of 2.2.
Adjusted all references on the website.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/web/download/git.org b/web/download/git.org
index 399edb0..c39bbef 100644
--- a/web/download/git.org
+++ b/web/download/git.org
@@ -34,8 +34,8 @@
required files which are not stored in the repository. =autogen.sh=
also checks that you have all required tools installed. Please read
the GIT manual pages before doing so. The =master= revision is the
- development branch; the stable 2.0 version (currently version
- {{{gnupg_ver}}}) is known as =STABLE-BRANCH-2-0=; the old 1.4
+ development branch; the stable 2.2 version (currently version
+ {{{gnupg22_ver}}}) is known as =STABLE-BRANCH-2-2=; the old 1.4
version of GnuPG ({{{gnupg1_ver}}}) is known as =STABLE-BRANCH-1-4=.
Bug reports should go to the developers mailing list. See the page
diff --git a/web/download/index.org b/web/download/index.org
index ce3194f..148243f 100644
--- a/web/download/index.org
+++ b/web/download/index.org
@@ -45,7 +45,7 @@
| Name | Version | Date | Size | Tarball | Signature |
|--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
| | <l> | | <r> | | |
- | [[../software/index.org][GnuPG]] | {{{gnupg21_ver}}} | {{{gnupg21_date}}} | {{{gnupg21_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg21_ver}}}.tar.bz2.sig{{{ftpclose}}} |
+ | [[../software/index.org][GnuPG]] | {{{gnupg22_ver}}} | {{{gnupg22_date}}} | {{{gnupg22_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg22_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg22_ver}}}.tar.bz2.sig{{{ftpclose}}} |
|--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
| [[../software/libgpg-error/index.org][Libgpg-error]] | {{{libgpg_error_ver}}} | {{{libgpg_error_date}}} | {{{libgpg_error_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgpg-error/libgpg-error-{{{libgpg_error_ver}}}.tar.bz2.sig{{{ftpclose}}} |
| [[../software/libgcrypt/index.org][Libgcrypt]] | {{{libgcrypt_ver}}} | {{{libgcrypt_date}}} | {{{libgcrypt_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/libgcrypt/libgcrypt-{{{libgcrypt_ver}}}.tar.bz2.sig{{{ftpclose}}} |
@@ -59,7 +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 | {{{gnupg_ver}}} | {{{gnupg_date}}} | {{{gnupg_size}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_ver}}}.tar.bz2{{{ftpclose}}} | {{{ftpopen}}}{{{ftp_loc_base}}}/gnupg/gnupg-{{{gnupg_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}}} |
|--------------+------------------------+-------------------------+-------------------------+--------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------|
@@ -102,20 +102,20 @@
also that some of them apply security patches on top of the
standard versions but keep the original version number.
- | OS | Where | Description |
- |---------+--------------------+---------------------------------------------|
- | | <18> | |
- | Windows | [[http://gpg4win.org/download.html][Gpg4win]] | Installers for /GnuPG 2.0/ |
- | | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg21_w32_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for the current /GnuPG/ |
- | | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG 1.4/ |
- | OS X | [[http://gpgtools.org][Mac GPG]] | Installer from the gpgtools project |
- | | [[https://sourceforge.net/p/gpgosx/docu/Download/][GnuPG for OS X]] | Installer for /GnuPG 2.1/ |
- | Debian | [[https://www.debian.org][Debian site]] | GnuPG is part of Debian |
- | RPM | [[http://rpmfind.net/][rpmfind]] | RPM packages for different OS |
- | Android | [[https://guardianproject.info/code/gnupg/][Guardian project]] | Provides a GnuPG framework |
- | VMS | [[http://www.antinode.info/dec/sw/gnupg.html][antinode.info]] | A port of GnuPG 1.4 to OpenVMS |
- | RISC OS | [[http://www.sbellon.de/gnupg.html][home page]] | A port of GnuPG to RISC OS |
- |---------+--------------------+---------------------------------------------|
+ | OS | Where | Description |
+ |---------+--------------------+------------------------------------------|
+ | | <18> | |
+ | Windows | [[http://gpg4win.org/download.html][Gpg4win]] | Installers for /GnuPG 2.0/ |
+ | | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg22_w32_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32-{{{gnupg22_w32_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for the current /GnuPG/ |
+ | | {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe{{{ftpclose}}} {{{ftpopen}}}{{{ftp_loc_base}}}/binary/gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe.sig{{{ftpcloseS}}} | Simple installer for /GnuPG 1.4/ |
+ | OS X | [[http://gpgtools.org][Mac GPG]] | Installer from the gpgtools project |
+ | | [[https://sourceforge.net/p/gpgosx/docu/Download/][GnuPG for OS X]] | Installer for /GnuPG 2.1/ |
+ | Debian | [[https://www.debian.org][Debian site]] | GnuPG is part of Debian |
+ | RPM | [[http://rpmfind.net/][rpmfind]] | RPM packages for different OS |
+ | Android | [[https://guardianproject.info/code/gnupg/][Guardian project]] | Provides a GnuPG framework |
+ | VMS | [[http://www.antinode.info/dec/sw/gnupg.html][antinode.info]] | A port of GnuPG 1.4 to OpenVMS |
+ | RISC OS | [[http://www.sbellon.de/gnupg.html][home page]] | A port of GnuPG to RISC OS |
+ |---------+--------------------+------------------------------------------|
# eof #
diff --git a/web/download/integrity_check.org b/web/download/integrity_check.org
index 573b871..b0f4cb6 100644
--- a/web/download/integrity_check.org
+++ b/web/download/integrity_check.org
@@ -16,10 +16,10 @@
If you already have a trusted version of GnuPG installed, you can
check the supplied signature. For example, to check the signature
- of the file gnupg-{{{gnupg_ver}}}.tar.bz2, you can use this command:
+ of the file gnupg-{{{gnupg22_ver}}}.tar.bz2, you can use this command:
{{{begin_example}}}
- $ gpg {{{twodashes}}}verify gnupg-{{{gnupg_ver}}}.tar.bz2.sig gnupg-{{{gnupg_ver}}}.tar.bz2
+ $ gpg {{{twodashes}}}verify gnupg-{{{gnupg22_ver}}}.tar.bz2.sig gnupg-{{{gnupg22_ver}}}.tar.bz2
{{{end_example}}}
*Note: you should never use a GnuPG version you just downloaded to
@@ -86,18 +86,18 @@
for an attacker to trick you into installing a modified version of
the software.
- Assuming you downloaded the file gnupg-{{{gnupg_ver}}}.tar.bz2, you
+ Assuming you downloaded the file gnupg-{{{gnupg22_ver}}}.tar.bz2, you
can run the =sha1sum= command like this:
{{{begin_chksum}}}
- sha1sum gnupg-{{{gnupg_ver}}}.tar.bz2
+ sha1sum gnupg-{{{gnupg22_ver}}}.tar.bz2
{{{end_chksum}}}
and check that the output matches the SHA-1 checksum reported on
this site. An example of a =sha1sum= output is:
{{{begin_chksum}}}
- {{{gnupg_sha1}}} gnupg-{{{gnupg_ver}}}.tar.bz2
+ {{{gnupg22_sha1}}} gnupg-{{{gnupg22_ver}}}.tar.bz2
{{{end_chksum}}}
** List of SHA-1 check-sums
@@ -106,8 +106,8 @@
that can be downloaded from [[ftp://ftp.gnupg.org/][our site]], have been gathered below.
{{{begin_chksum}}}
- {{{gnupg21_sha1}}} gnupg-{{{gnupg21_ver}}}.tar.bz2
- {{{gnupg21_w32_sha1}}} gnupg-w32-{{{gnupg21_w32_ver}}}.exe
+ {{{gnupg22_sha1}}} gnupg-{{{gnupg21_ver}}}.tar.bz2
+ {{{gnupg22_w32_sha1}}} gnupg-w32-{{{gnupg21_w32_ver}}}.exe
{{{libgpg_error_sha1}}} libgpg-error-{{{libgpg_error_ver}}}.tar.bz2
{{{libgcrypt_sha1}}} libgcrypt-{{{libgcrypt_ver}}}.tar.bz2
{{{libksba_sha1}}} libksba-{{{libksba_ver}}}.tar.bz2
@@ -118,7 +118,7 @@
{{{gpgme_sha1}}} gpgme-{{{gpgme_ver}}}.tar.bz2
{{{gpa_sha1}}} gpa-{{{gpa_ver}}}.tar.bz2
{{{dirmngr_sha1}}} dirmngr-{{{dirmngr_ver}}}.tar.bz2
- {{{gnupg_sha1}}} gnupg-{{{gnupg_ver}}}.tar.bz2
+ {{{gnupg20_sha1}}} gnupg-{{{gnupg20_ver}}}.tar.bz2
{{{gnupg1_sha1}}} gnupg-{{{gnupg1_ver}}}.tar.bz2
{{{gnupg1_w32cli_sha1}}} gnupg-w32cli-{{{gnupg1_w32cli_ver}}}.exe
{{{end_chksum}}}
diff --git a/web/download/release_notes.org b/web/download/release_notes.org
index 73111d2..6792da1 100644
--- a/web/download/release_notes.org
+++ b/web/download/release_notes.org
@@ -7,7 +7,7 @@
* Release Notes for GnuPG
- Please read the NEWS file for a more complete list. {{{gnupg21_ver}}}
+ Please read the NEWS file for a more complete list. {{{gnupg22_ver}}}
is the current version of GnuPG.
Note that this page will soon be restructed. The URLs pointing to
diff --git a/web/index.org b/web/index.org
index c507efe..edce9f3 100644
--- a/web/index.org
+++ b/web/index.org
@@ -22,7 +22,7 @@ GnuPG is [[https://www.gnu.org/philosophy/free-sw.html][Free Software]] (meaning
be freely used, modified and distributed under the terms of the
[[https://www.gnu.org/copyleft/gpl.html][GNU General Public License]] .
-The current version of GnuPG is {{{gnupg21_ver}}}. See the [[file:download/index.org][download]]
+The current version of GnuPG is {{{gnupg22_ver}}}. See the [[file:download/index.org][download]]
page for other maintained versions.
[[https://www.gpg4win.org][Gpg4win]] provides a Windows version of the older GnuPG 2.0 branch. It
diff --git a/web/swdb.mac b/web/swdb.mac
index f3393ae..5fdbb5e 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -8,19 +8,21 @@
#+macro: ftp_loc_base /ftp/gcrypt
#
-# 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-2.1
-#
+# GnuPG-2.2
+#
+#+macro: gnupg22_ver 2.1.23
+#+macro: gnupg22_date 2017-08-09
+#+macro: gnupg22_size 6373k
+#+macro: gnupg22_sha1 c470777eaa9657ef3258068507065c9a7caef9eb
+#+macro: gnupg22_sha2 a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77
+#+macro: gnupg22_w32_ver 2.1.23_20170809
+#+macro: gnupg22_w32_date 2017-08-09
+#+macro: gnupg22_w32_size 3794k
+#+macro: gnupg22_w32_sha1 c95f1c2dc3aa06dda2a58ba5aefb362511f666e3
+#+macro: gnupg22_w32_sha2 42045473336c0f20a2d4a2b6f4be5be263a55ccd3eb1f682976d94e9a3cff43f
+
+# temporary keep it as "gnupg21". In the future we will use the name of
+# the stable branch even for the development versions.
#+macro: gnupg21_ver 2.1.23
#+macro: gnupg21_date 2017-08-09
#+macro: gnupg21_size 6373k
@@ -34,6 +36,25 @@
#
+# GnuPG 2.0
+#
+#+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_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
#
#+macro: gnupg1_ver 1.4.22
-----------------------------------------------------------------------
Summary of changes:
web/download/git.org | 4 ++--
web/download/index.org | 32 +++++++++++++--------------
web/download/integrity_check.org | 16 +++++++-------
web/download/release_notes.org | 2 +-
web/index.org | 2 +-
web/swdb.mac | 47 +++++++++++++++++++++++++++++-----------
6 files changed, 62 insertions(+), 41 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list