[git] gnupg-doc - branch, master, updated. 0a24a4f9b47b03292777a82c8e6c64c022c5fe68
by Werner Koch
cvs at cvs.gnupg.org
Tue Sep 9 21:28:52 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 0a24a4f9b47b03292777a82c8e6c64c022c5fe68 (commit)
via 7b7b4aaa1946cfb6e7ee4c09a8c29ee1466d37a8 (commit)
via a168775ff6b4e795cb644894c822310e5fbfaf67 (commit)
from d312f13e757c690b7b90d2ad3abf958c05d3afe8 (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 0a24a4f9b47b03292777a82c8e6c64c022c5fe68
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 9 21:29:20 2014 +0200
swdb: Release of libgpg-error
diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index 61ecce2..3293b3c 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -34,6 +34,7 @@ my $sessid = $q->param("sessid");
# Variables used in the template pages.
my $amount = "";
my $stripeamount = "";
+my $euroamount = "";
my $currency = "";
my $name = "";
my $mail = "";
@@ -89,6 +90,8 @@ sub write_template ($) {
$mail =~ s/</\x26lt;/g;
$message =~ s/</\x26lt;/g;
+ # No need to clean $euroamount.
+
# Create a formatted message.
$message_fmt = $message;
$message_fmt =~ s/\n/<br\x2f>/g;
@@ -134,6 +137,7 @@ sub write_template ($) {
# for the textarea tag.
s/<!--SESSID-->/$sessid/
|| s/(\x22\x2f>)?<!--AMOUNT-->/$amount\1/
+ || s/(\x22\x2f>)?<!--EUROAMOUNT-->/$euroamount\1/
|| s/(\x22\x2f>)?<!--STRIPEAMOUNT-->/$stripeamount\1/
|| s/(\x22\x2f>)?<!--CURRENCY-->/$currency\1/
|| s/(\x22\x2f>)?<!--NAME-->/$name\1/
@@ -327,6 +331,7 @@ sub check_donation ()
$stripeamount = $data{"_amount"};
$amount = $data{"Amount"};
$currency = $data{"Currency"};
+ $euroamount = $data{"Euro"}
# Check the mail address
if ($mail ne '' and $mail !~ /\S+@\S+\.\S+/ ) {
@@ -343,6 +348,7 @@ sub check_donation ()
# Now create a session.
$data{"Stripeamount"} = $stripeamount;
+ $data{"Euroamount"} = $euroamount;
$data{"Name"} = $name;
$data{"Mail"} = $mail;
$data{"Message"} = $message;
@@ -362,6 +368,7 @@ sub resend_main_page ()
$amount = $data{"Amount"};
$currency = $data{"Currency"};
$stripeamount = $data{"Stripeamount"};
+ $euroamount = $data{"Euroamount"};
$name = $data{"Name"};
$mail = $data{"Mail"};
$message = $data{"Message"};
@@ -379,6 +386,7 @@ sub resend_card_checkout ()
$amount = $data{"Amount"};
$currency = $data{"Currency"};
$stripeamount = $data{"Stripeamount"};
+ $euroamount = $data{"Euroamount"};
$name = $data{"Name"};
$mail = $data{"Mail"};
$message = $data{"Message"};
@@ -397,6 +405,7 @@ sub prepare_card_checkout ()
$amount = $data{"Amount"};
$currency = $data{"Currency"};
$stripeamount = $data{"Stripeamount"};
+ $euroamount = $data{"Euroamount"};
$mail = $data{"Mail"};
write_checkout_cc_page();
diff --git a/web/swdb.mac b/web/swdb.mac
index a3bfa8b..15ceeec 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -91,9 +91,9 @@
#
# LIBGPG-ERROR
#
-#+macro: libgpg_error_ver 1.13
-#+macro: libgpg_error_size 478k
-#+macro: libgpg_error_sha1 50fbff11446a7b0decbf65a6e6b0eda17b5139fb
+#+macro: libgpg_error_ver 1.14
+#+macro: libgpg_error_size 540k
+#+macro: libgpg_error_sha1 dd46179e08f6708bb70719422b942f200989d195
#
commit 7b7b4aaa1946cfb6e7ee4c09a8c29ee1466d37a8
Author: Werner Koch <wk at gnupg.org>
Date: Mon Sep 1 11:24:04 2014 +0200
web: Insert the last commit date into each file.
* web/share/gpgweb.el (gpgweb-insert-header): Insert DC.Date.
(gpgweb-postprocess-html): Get a date from git.
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 19d5a55..520466f 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -40,16 +40,11 @@
'(:components ("gpgweb-org" "gpgweb-other")))))
-(defun gpgweb-insert-header (title generated-at)
+(defun gpgweb-insert-header (title committed-at)
"Insert the header.
-Note that using GENERATED-AT is highly problematic because rsync
-would the always update the file. IF would be better to use the
-file date of the source file but that has the problem that git
-does not track it. We need to find a solution for this unless we
-can do without DC.Date. A possible way to fix this is to use a
-source file property which could be updated using Emacs features.
-Or set a new date only if the file really changed. "
+COMMITED-AT is the commit date string of the source file or nil
+if not available."
(goto-char (point-min))
(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>
<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
@@ -57,9 +52,12 @@ Or set a new date only if the file really changed. "
<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">
<head>
<title>" title "</title>
-<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\"/>
-<meta name=\"DC.Language\" content=\"en\" />
-<meta name=\"DC.Title\" content=\"" title "\"/>
+<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n")
+ (when (and committed-at (>= (length committed-at) 10))
+ (insert "<meta name=\"DC.Date\" content=\""
+ (substring committed-at 0 10) "\" />\n"))
+ (insert "<meta name=\"DC.Language\" content=\"en\" />
+<meta name=\"DC.Title\" content=\"" title "\" />
<meta name=\"DC.Description\"
content=\"GnuPG is a free implementation of OpenPGP\" />
<meta name=\"DC.Creator\" content=\"The People of the GnuPG Project\" />
@@ -69,9 +67,6 @@ Or set a new date only if the file really changed. "
<link rel=\"stylesheet\" href=\"/share/site.css\" type=\"text/css\" />
</head>
<body>\n"))
-;;; <meta name=\"DC.Date\" content=\""
-;;; (format-time-string "%Y-%m-%d" generated-at t) "\" />
-
(defconst gpgweb-gnupg-menu-alist
'(("/index.html"
@@ -200,15 +195,16 @@ Or set a new date only if the file really changed. "
;;; - Fixup sitemap.
(defun gpgweb-postprocess-html (plist orgfile htmlfile)
(let* ((visitingp (find-buffer-visiting htmlfile))
- (work-buffer (or visitingp (find-file-noselect htmlfile))))
+ (work-buffer (or visitingp (find-file-noselect htmlfile)))
+ (committed-at (shell-command-to-string
+ (concat "git log -1 --format='%ci' -- " orgfile))))
(prog1 (with-current-buffer work-buffer
(let ((fname (file-name-nondirectory htmlfile))
(fname-2 (replace-regexp-in-string
".*/stage\\(/.*\\)$" "\\1" htmlfile t))
- (title (org-publish-find-title orgfile))
- (generated-at (current-time)))
+ (title (org-publish-find-title orgfile)))
;; Insert header, menu, and footer.
- (gpgweb-insert-header title generated-at)
+ (gpgweb-insert-header title committed-at)
(gpgweb-insert-menu fname-2)
(gpgweb-insert-footer)
@@ -232,6 +228,7 @@ Or set a new date only if the file really changed. "
(basic-save-buffer))
(unless visitingp (kill-buffer work-buffer))))))
+
;;;
;;; The publishing function used by the HTML exporter
;;;
commit a168775ff6b4e795cb644894c822310e5fbfaf67
Author: Werner Koch <wk at gnupg.org>
Date: Mon Sep 1 11:19:39 2014 +0200
web: Release of GPA 0.9.5.
diff --git a/web/index.org b/web/index.org
index be9b0d6..c89694c 100644
--- a/web/index.org
+++ b/web/index.org
@@ -63,6 +63,12 @@ all [[file:news.org][news of previous years]] is also available.
# point or paste the [[news.en.rss][RSS file]] into your aggregator.
+** GPA 0.95 released
+
+GPA is the GNU Privacy Assistant, a frontend to GnuPG. This new
+release has support for ECC keys and improves on the UI server
+feature. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q3/000356.html][{more}]]
+
** GnuPG 2.0.26 released (2014-08-12)
GnuPG 2.0.26 is now available. This is a maintenance release. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q3/000353.html][{more}]]
diff --git a/web/swdb.mac b/web/swdb.mac
index 6580b39..a3bfa8b 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -43,8 +43,8 @@
#
# GPA
#
-#+macro: gpa_ver 0.9.4
-#+macro: gpa_size 714k
+#+macro: gpa_ver 0.9.5
+#+macro: gpa_size 716k
#
-----------------------------------------------------------------------
Summary of changes:
cgi/procdonate.cgi | 9 +++++++++
web/index.org | 6 ++++++
web/share/gpgweb.el | 33 +++++++++++++++------------------
web/swdb.mac | 10 +++++-----
4 files changed, 35 insertions(+), 23 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list