[git] gnupg-doc - branch, master, updated. 64dac94489afa59e44763dfd7c2f49ed40312615
by Werner Koch
cvs at cvs.gnupg.org
Tue Jul 1 08:42:23 CEST 2014
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 64dac94489afa59e44763dfd7c2f49ed40312615 (commit)
via 5517f6c45a9f80ac155318abf451fb208a875649 (commit)
from bccd13c3009550cc6e4689e468b004fe10afa6d3 (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 64dac94489afa59e44763dfd7c2f49ed40312615
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
Update for GnuPG 1.4.18 and 2.0.25
diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index 4f7d9c6..e86483e 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -31,14 +31,14 @@
| 2011 | 21 | 553 | 465 |
| 2012 | 53 | 5991 | 4963 |
| 2013 | 148 | 5041 | 4145 |
-| 2014 | 50 | 3244 | |
+| 2014 | 66 | 4059 | |
|------+-----+-------+----------|
| | 272 | 14829 | 9573 |
#+TBLFM: $LR2=vsum(@I.. at II)::$LR3=vsum(@I.. at II)::$LR4=vsum(@I.. at II)
#+HTML: <div id="smallnote">
The "net" column gives the actual value without VAT and PayPal fees.\\
-Last update: 2014-05-26
+Last update: 2014-06-25
#+HTML: </div>
* Hardware and service donations
diff --git a/web/index.org b/web/index.org
index 8467e96..b67c585 100644
--- a/web/index.org
+++ b/web/index.org
@@ -51,10 +51,21 @@ all [[file:news.org][news of previous years]] is also available.
# GnuPG's latest news are available as [[http://feedvalidator.org/check.cgi?url%3Dhttps://www.gnupg.org/news.en.rss][RSS 2.0 compliant]] feed. Just
# point or paste the [[news.en.rss][RSS file]] into your aggregator.
+** GnuPG 2.0.25 and 1.4.18 released (2014-06-30)
+
+To fix a minor regression in the previous releases we released today
+new version sof GnuPG-1 and GnuPG-2: [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000346.html][{2.0.25}]], [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000347.html][{1.4.18}]]
+
+** GnuPG 2.0.24 released (2014-06-24) :important:
+
+GnuPG 2.0.24 is now available. This GnuPG-2 release features a fix
+for a denial of service attack and a few other changes. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000345.html][{more}]]
+
+
** GnuPG 1.4.17 released (2014-06-23) :important:
-GnuPG 1.4.17 is now available. This release features a fix for a
-denial of service attack and a few other minor changes. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000344.html][{more}]]
+GnuPG 1.4.17 is now available. This GnuPG-1 release features a fix
+for a denial of service attack and a few other minor changes. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000344.html][{more}]]
** GnuPG 2.0.23 released (2014-06-03)
diff --git a/web/swdb.mac b/web/swdb.mac
index d506d62..0840198 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -8,29 +8,29 @@
#
# GnuPG-2
#
-#+macro: gnupg_ver 2.0.23
+#+macro: gnupg_ver 2.0.25
#+macro: gnupg_branch STABLE-BRANCH-2-0
-#+macro: gnupg_size 4196k
-#+macro: gnupg_sha1 c90e47ab95a40dd070fd75faef0a05c7b679553b
+#+macro: gnupg_size 4201k
+#+macro: gnupg_sha1 890d77d89f2d187382f95e83e386f2f7ba789436
#
# GnuPG-1
#
-#+macro: gnupg1_ver 1.4.17
+#+macro: gnupg1_ver 1.4.18
#+macro: gnupg1_branch STABLE-BRANCH-1-4
-#+macro: gnupg1_size 3563k
-#+macro: gnupg1_size_gz 4929k
-#+macro: gnupg1_sha1 830c7f749ad92d6577c521addea5e5d920128d42
-#+macro: gnupg1_sha1_gz d5b3c25901f182ea20c31f09669f44681c3aaa89
-#
-#+macro: gnupg1_patch_ver 1.4.15-1.4.16
-#+macro: gnupg1_patch_size 21k
-#+macro: gnupg1_patch_sha1 ff761de4efc3876c57199612c24b677208da7c10
-#
-#+macro: gnupg1_w32cli_ver 1.4.17
-#+macro: gnupg1_w32cli_size 1574k
-#+macro: gnupg1_w32cli_sha1 b2f0db9eebf028d27d0a119334e5e357773dd0d6
+#+macro: gnupg1_size 3564k
+#+macro: gnupg1_size_gz 4930k
+#+macro: gnupg1_sha1 41462d1a97f91abc16a0031b5deadc3095ce88ae
+#+macro: gnupg1_sha1_gz ea7d66c3de7aaf46de9e8678f4fc4a8c329400b2
+#
+#+macro: gnupg1_patch_ver 1.4.17-1.4.18
+#+macro: gnupg1_patch_size 5k
+#+macro: gnupg1_patch_sha1 f30571f855b3ff8becff5378a884638da4c3cc9e
+#
+#+macro: gnupg1_w32cli_ver 1.4.18
+#+macro: gnupg1_w32cli_size 1575k
+#+macro: gnupg1_w32cli_sha1 579de2464528b436f39c5835e766867a1efa5fee
#
commit 5517f6c45a9f80ac155318abf451fb208a875649
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jun 23 18:23:56 2014 +0200
swdb: Update for GnuPG 1.4.17.
diff --git a/tools/append-to-donors.sh b/tools/append-to-donors.sh
index 58efff1..86697ad 100755
--- a/tools/append-to-donors.sh
+++ b/tools/append-to-donors.sh
@@ -4,7 +4,8 @@
pgm="append-to-donors.sh"
set -e
-PATH="/usr/local/bin:$PATH"
+
+PATH=/usr/local/bin:$PATH
htdocs="/var/www/www/www.gnupg.org/htdocs"
@@ -44,6 +45,7 @@ find $journal_dir -type f -name 'journal-????????.log' -print \
jdate=${jdate#journal-}
jyear=$(echo $jdate |sed 's/\(....\).*/\1/')
if [ "$jdate" -ge "$lastdate" ]; then
+ [ "$jdate" -gt "$lastdate" ] && lastline=0
payproc-jrnl -F_lnr -Fdate -F'[name]' \
-S "_lnr > $lastline" -Stype=C -Saccount==1 \
--html --print "$journal_dir/journal-$jdate.log" \
diff --git a/web/index.org b/web/index.org
index 866e132..8467e96 100644
--- a/web/index.org
+++ b/web/index.org
@@ -51,6 +51,12 @@ all [[file:news.org][news of previous years]] is also available.
# GnuPG's latest news are available as [[http://feedvalidator.org/check.cgi?url%3Dhttps://www.gnupg.org/news.en.rss][RSS 2.0 compliant]] feed. Just
# point or paste the [[news.en.rss][RSS file]] into your aggregator.
+** GnuPG 1.4.17 released (2014-06-23) :important:
+
+GnuPG 1.4.17 is now available. This release features a fix for a
+denial of service attack and a few other minor changes. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000344.html][{more}]]
+
+
** GnuPG 2.0.23 released (2014-06-03)
We are pleased to announce the availability of GnuPG 2.0.23. This is
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 59920ee..15d4342 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -203,7 +203,9 @@
(concat "cd " gpgweb-root-dir " && cd " stagedir
"&& rsync -rlt --exclude \"*~\" ./ "
"werner at trithemius.gnupg.org:"
- "/var/www/www/www.gnupg.org/htdocs/"))))
+ "/var/www/www/www.gnupg.org/htdocs/ ;"
+ " ssh werner at trithemius.gnupg.org"
+ " touch /var/www/www/www.gnupg.org/htdocs/donate/donors.dat"))))
(provide 'gpgweb)
diff --git a/web/swdb.mac b/web/swdb.mac
index b443bbf..d506d62 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -13,23 +13,24 @@
#+macro: gnupg_size 4196k
#+macro: gnupg_sha1 c90e47ab95a40dd070fd75faef0a05c7b679553b
+
#
# GnuPG-1
#
-#+macro: gnupg1_ver 1.4.16
+#+macro: gnupg1_ver 1.4.17
#+macro: gnupg1_branch STABLE-BRANCH-1-4
-#+macro: gnupg1_size 3571k
-#+macro: gnupg1_size_gz 4955k
-#+macro: gnupg1_sha1 0bf5e475f3eb6f33d5474d017fe5bf66070e43f4
-#+macro: gnupg1_sha1_gz ea40324a5b2e3a16ffb63ea0ccc950a3faf5b11c
+#+macro: gnupg1_size 3563k
+#+macro: gnupg1_size_gz 4929k
+#+macro: gnupg1_sha1 830c7f749ad92d6577c521addea5e5d920128d42
+#+macro: gnupg1_sha1_gz d5b3c25901f182ea20c31f09669f44681c3aaa89
#
#+macro: gnupg1_patch_ver 1.4.15-1.4.16
-#+macro: gnupg1_patch_size 26k
-#+macro: gnupg1_patch_sha1 ead70b47218ba76da51c16b652bee2a712faf2f6
+#+macro: gnupg1_patch_size 21k
+#+macro: gnupg1_patch_sha1 ff761de4efc3876c57199612c24b677208da7c10
#
-#+macro: gnupg1_w32cli_ver 1.4.16
-#+macro: gnupg1_w32cli_size 1573k
-#+macro: gnupg1_w32cli_sha1 82079c7c183467b4dd3795ca197983cd2494cec4
+#+macro: gnupg1_w32cli_ver 1.4.17
+#+macro: gnupg1_w32cli_size 1574k
+#+macro: gnupg1_w32cli_sha1 b2f0db9eebf028d27d0a119334e5e357773dd0d6
#
-----------------------------------------------------------------------
Summary of changes:
tools/append-to-donors.sh | 4 +++-
web/donate/kudos.org | 4 ++--
web/index.org | 17 +++++++++++++++++
web/share/gpgweb.el | 4 +++-
web/swdb.mac | 33 +++++++++++++++++----------------
5 files changed, 42 insertions(+), 20 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list