[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-357-g7788011
by Bernhard Reiter
cvs at cvs.gnupg.org
Mon Jan 29 11:19:15 CET 2018
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 "GnuPG for Windows".
The branch, website has been updated
via 77880110fbb2e133378a6038e5cdbe85e0cfb4e0 (commit)
via 5c48dde66befe7fbda6453d9400f79d33f6148b1 (commit)
from 04a91af8ae6a5813d93bda60ad2bacfa83742d69 (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 77880110fbb2e133378a6038e5cdbe85e0cfb4e0
Author: Bernhard Reiter <bernhard at intevation.de>
Date: Mon Jan 29 11:17:48 2018 +0100
web: Cleanup: Removes deactivated sections.
* Removes deactivated sections from the elder download* pages.
Also removed the unused MIRROR macro as it was not used anymore.
diff --git a/web/download-de.htm4 b/web/download-de.htm4
index 7967012..84607c7 100644
--- a/web/download-de.htm4
+++ b/web/download-de.htm4
@@ -17,37 +17,6 @@ PAGE_START
<div id="main">
-<!--
-<h2>Gpg4win 2.2.2-beta (Veröffentlicht: 2014-08-14)</h2>
-
-<p>Aktuelle Vorabversion von Gpg4win 2.2.2 mit Sicherheitsupdates und Verbesserungen in
-GnuPG, Kleopatra, GpgEX, GpgOL und Pinentry-qt; in verschiedenen
-Varianten verfügbar:</p>
-<ul>
-<li><a
-href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.exe">Full-Installer</a>
-(30 MByte)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.exe.sig">OpenPGP Signatur</a>
-</li>
-<li><a
-href="https://files.gpg4win.org/Beta/gpg4win-light-2.2.2-beta37.exe">Light-Installer</a>
-(13 MByte, ohne Kleopatra und Gpg4win-Kompendium)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-light-2.2.2-beta37.exe.sig">OpenPGP Signatur</a>
-</li>
-<li><a href="https://files.gpg4win.org/Beta/gpg4win-vanilla-2.2.2-beta37.exe">Vanilla-Installer</a>
-(4 MByte, nur GnuPG)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-vanilla-2.2.2-beta37.exe.sig">OpenPGP Signatur</a>
-</li>
-<li><a
-href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.tar.bz2">Quelltextpaket</a> (6 MByte)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.tar.bz2">OpenPGP Signatur</a>
-</li>
-<li><a href="https://files.gpg4win.org/Beta/README-2.2.2-beta37.de.txt">README</a> </li>
-<li>Alle Beta-Versionen und OpenPGP-Signaturen auch per https (mit eigener CA) verfügbar:
-<a href="https://files.gpg4win.org/Beta/">https://files.gpg4win.org/Beta/</a>.</li>
-</ul>
--->
-
<h2>Gpg4win VERSION (Veröffentlicht: DL_DATE)</h2>
<p>Die Vollversion (inklusive des deutschen Gpg4win-Kompendiums) von Gpg4win VERSION
@@ -165,31 +134,10 @@ Neuigkeiten zu Gpg4win informiert zu werden.
<p>Für Behörden: Angestrebt wird eine VS-NfD Zulassung durch das BSI.</p>
-<!--
-<p>
-Ist das Herunterladen immer langsam? Versuchen Sie diesen
-Spiegelserver:<br>
-<a href="MIRROR_IE_URL">Gpg4win Spiegelserver in Irland</a> (betrieben
-von <a href="http://ftp.heanet.ie/about/">HEAnet</a>)
-</p>
---!>
-</div>
+</div> <!-- main -->
<div id="sidebar">
-<!--
- <h3>Gpg4win 2.2.2-beta enthält:</h3>
- <pre>
-<a href="http://www.gnupg.de/index.de.html">GnuPG</a> 2.0.26
-<a href="http://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 2.2.0-gitac229d2
-<a href="http://www.gnupg.de/related_software/gpa/index.de.html">GPA</a> 0.9.4
-<a href="http://www.g10code.de/p-gpgol.html">GpgOL</a> 1.2.1
-<a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.1
-<a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 3.0.0
-<a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0
- </pre>
- <p></p>
--->
<h3>Gpg4win VERSION enthält:</h3>
<pre>
SOFTWAREOVERVIEW
diff --git a/web/download.htm4 b/web/download.htm4
index 3e83739..e4978c1 100644
--- a/web/download.htm4
+++ b/web/download.htm4
@@ -17,37 +17,6 @@ PAGE_START
<div id="main">
-<!--
-<h2>Gpg4win 2.2.2-beta (Released: 2014-08-14)</h2>
-
-<p>Current beta version of Gpg4win 2.2.2 with security updates and improvements in
-GnuPG, Kleopatra, GpgEX, GpgOL and Pinentry-qt; in different variants available:</p>
-<ul>
-<li><a
-href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.exe">Full-Installer</a>
-(30 MByte)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.exe.sig">OpenPGP Signatur</a>
-</li>
-<li><a
-href="https://files.gpg4win.org/Beta/gpg4win-light-2.2.2-beta37.exe">Light-Installer</a>
-(13 MByte, without Kleopatra and Gpg4win Compendium)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-light-2.2.2-beta37.exe.sig">OpenPGP Signatur</a>
-</li>
-<li><a href="https://files.gpg4win.org/Beta/gpg4win-vanilla-2.2.2-beta37.exe">Vanilla-Installer</a>
-(4 MByte, GnuPG only)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-vanilla-2.2.2-beta37.exe.sig">OpenPGP Signatur</a>
-</li>
-<li><a
-href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.tar.bz2">Source code package</a> (6 MByte)
-| <a href="https://files.gpg4win.org/Beta/gpg4win-2.2.2-beta37.tar.bz2">OpenPGP Signatur</a>
-</li>
-<li><a href="https://files.gpg4win.org/Beta/README-2.2.2-beta37.de.txt">README</a> </li>
-<li>All Beta versionen and OpenPGP-Signatures also available via https (with own CA):
-<a href="https://files.gpg4win.org/Beta/">https://files.gpg4win.org/Beta/</a>.</li>
-</ul>
--->
-
-
<h2>Gpg4win VERSION (Released: DL_DATE)</h2>
<p>You can download the full version (including the Gpg4win compendium)
@@ -169,30 +138,9 @@ For public administrations: An an approval to handle governmental documents
that are classified 'restricted' ('VS-NUR FÜR DEN DIENSTGEBRAUCH')
is aimed for by the German Federal Office for Information Security (BSI).
-<!--
-<p>
-Is downloading very slow? Try this mirror server:
-<a href="MIRROR_IE_URL">Gpg4win mirror server in Ireland</a> (run by
-<a href="http://ftp.heanet.ie/about/">HEAnet</a>)
-</p>
-!-->
-</div>
-
+</div> <!-- main -->
<div id="sidebar">
-<!--
- <h3>Gpg4win 2.2.2-beta contains:</h3>
- <pre>
-<a href="http://www.gnupg.de/index.de.html">GnuPG</a> 2.0.26
-<a href="http://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 2.2.0-gitac229d2
-<a href="http://www.gnupg.de/related_software/gpa/index.de.html">GPA</a> 0.9.4
-<a href="http://www.g10code.de/p-gpgol.html">GpgOL</a> 1.2.1
-<a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.1
-<a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 3.0.0
-<a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0
- </pre>
- <p></p>
--->
<h3>Gpg4win VERSION contains:</h3>
<pre>
SOFTWAREOVERVIEW
diff --git a/web/versions.m4 b/web/versions.m4
index ac6ad16..a69c9dc 100644
--- a/web/versions.m4
+++ b/web/versions.m4
@@ -14,7 +14,6 @@ m4_define(`LEN_SRC',`5351730')
m4_define(`LEN_EXE',`26990152')
m4_define(`LEN_EXS',`225630392')
m4_define(`DLPAGE',`I18N(`EN',`download.html')`'I18N(`DE',`download-de.html')')
-m4_define(`MIRROR_IE_URL',`http://ftp.heanet.ie/mirrors/ftp.gpg4win.org/')
m4_define(`SOFTWAREOVERVIEW',`
I18N(`EN', `<a href="https://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="https://www.gnupg.org/index.de.html">GnuPG</a>') 2.2.4
<a href="https://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 3.0.2
commit 5c48dde66befe7fbda6453d9400f79d33f6148b1
Author: Bernhard Reiter <bernhard at intevation.de>
Date: Mon Jan 29 11:11:16 2018 +0100
web: updates some links to https
* Updates to `https` where it is available.
* Changes Development plattform link to dev.gnupg.org.
diff --git a/web/template_header.m4 b/web/template_header.m4
index 0625d82..1c1a03b 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -90,7 +90,7 @@ m4_define(`RQ',`m4_changequote(<,>)m4_dnl`
target="_blank" title="Flattr this">
<img src="img/flattr-icon.png" class="social-icon">
</a>
- <a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary" target="_blank" title="Gpg4win git repository">
+ <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary" target="_blank" title="Gpg4win git repository">
<img src="img/git-icon.png" class="social-icon">
</a>
</li>
@@ -128,11 +128,11 @@ m4_define(`RQ',`m4_changequote(<,>)m4_dnl`
</b></li>
MENU(`donate', `Spenden', `Donate', `donate', SUB, LANG_DE)
MENU(`license', `Lizenz', `License', `license', SUB, LANG_DE)
- m4_ifelse(LANG_DE, `1', `<li><a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Quellcode</a></li>',
- `<li><a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Source Code</a></li>')
- <li><a href="http://wiki.gnupg.org">Wiki</a></li>
- m4_ifelse(LANG_DE, `1', `<li><a href="http://wald.intevation.org/projects/gpg4win/">Entwicklungsplattform</a></li>',
- `<li><a href="http://wald.intevation.org/projects/gpg4win/">Development Platform</a></li>')
+ m4_ifelse(LANG_DE, `1', `<li><a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Quellcode</a></li>',
+ `<li><a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Source Code</a></li>')
+ <li><a href="https://wiki.gnupg.org">Wiki</a></li>
+ m4_ifelse(LANG_DE, `1', `<li><a href="https://dev.gnupg.org/">Entwicklungsplattform</a></li>',
+ `<li><a href="https://dev.gnupg.org/">Development Platform</a></li>')
m4_ifelse(LANG_DE, `1', `<li><a href="Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html">Kurzstudie Gpg4win</a></li>',
`<li><a href="ShortStudy-Sustainable-FS-example-Gpg4win.html">Short Study Gpg4win</a></li>')
MENU(`links', `Links', `Links', `links', SUB, LANG_DE)
diff --git a/web/versions.m4 b/web/versions.m4
index f75543a..ac6ad16 100644
--- a/web/versions.m4
+++ b/web/versions.m4
@@ -16,11 +16,11 @@ m4_define(`LEN_EXS',`225630392')
m4_define(`DLPAGE',`I18N(`EN',`download.html')`'I18N(`DE',`download-de.html')')
m4_define(`MIRROR_IE_URL',`http://ftp.heanet.ie/mirrors/ftp.gpg4win.org/')
m4_define(`SOFTWAREOVERVIEW',`
-I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="http://www.gnupg.de/index.de.html">GnuPG</a>') 2.2.4
-<a href="http://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 3.0.2
-I18N(`EN', `<a href="http://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="http://www.gnupg.de/related_software/gpa/index.de.html">GPA</a>') 0.9.10
-<a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary">GpgOL</a> 2.0.6
-<a href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.5
+I18N(`EN', `<a href="https://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="https://www.gnupg.org/index.de.html">GnuPG</a>') 2.2.4
+<a href="https://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 3.0.2
+I18N(`EN', `<a href="https://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="https://www.gnupg.org/related_software/gpa/index.de.html">GPA</a>') 0.9.10
+<a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary">GpgOL</a> 2.0.6
+<a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.5
<a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 4.0.0
<a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0
')
-----------------------------------------------------------------------
Summary of changes:
web/download-de.htm4 | 54 +-------------------------------------------------
web/download.htm4 | 54 +-------------------------------------------------
web/template_header.m4 | 12 +++++------
web/versions.m4 | 11 +++++-----
4 files changed, 13 insertions(+), 118 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list