[git] gnupg-doc - branch, master, updated. c4e8dde54e3ba7f91c484612c4ed0d2978bcdb13
by Werner Koch
cvs at cvs.gnupg.org
Tue Dec 16 10:37:28 CET 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 c4e8dde54e3ba7f91c484612c4ed0d2978bcdb13 (commit)
via 25ce7c92239477fdcc83e59c7159f13548fd7105 (commit)
via 2b1e6cc2d57fb5aed1e01935f23e1a3218581ae8 (commit)
from 4b80ae2446dac4b4eacf5e9b29170b9fdc763f8c (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 c4e8dde54e3ba7f91c484612c4ed0d2978bcdb13
Author: Werner Koch <wk at gnupg.org>
Date: Tue Dec 16 10:38:26 2014 +0100
web: Fixed the layout of people/.
This fixes a regression due to the change of the "figure" class for
the blogs.
diff --git a/web/people/index.org b/web/people/index.org
index 246c21d..af24b66 100644
--- a/web/people/index.org
+++ b/web/people/index.org
@@ -15,8 +15,9 @@
** Werner Koch
- #+ATTR_HTML: :class people :title Werner Koch
- [[file:werner.png]]
+ #+HTML: <div class="people">
+ #+HTML: <p><img src="werner.png" title="Werner Koch" /></p>
+ #+HTML: </div>
/Core components maintainer/
@@ -33,8 +34,9 @@
** David Shaw
- #+ATTR_HTML: :class people :title David Shaw
- [[file:david.png]]
+ #+HTML: <div class="people">
+ #+HTML: <p><img src="david.png" title="David Shaw" /></p>
+ #+HTML: </div>
/Master of the classic branch/
@@ -49,8 +51,9 @@
** Marcus Brinkmann
- #+ATTR_HTML: :class people :title Marcus Brinkmann
- [[file:marcus.png]]
+ #+HTML: <div class="people">
+ #+HTML: <p><img src="marcus.png" title="Marcus Brinkmann" /></p>
+ #+HTML: </div>
/Hacker emeritus/
@@ -64,8 +67,9 @@
** NIIBE Yutaka
- #+ATTR_HTML: :class people :title NIIBE Yutaka
- [[file:gniibe.png]]
+ #+HTML: <div class="people">
+ #+HTML: <p><img src="gniibe.png" title="NIIBE Yutaka" /></p>
+ #+HTML: </div>
/Smartcards and Libgcrypt/
@@ -77,8 +81,9 @@
** Jussi Kivilinna
- #+ATTR_HTML: :class people :title Jussi Kivilinna
- [[file:jussi.png]]
+ #+HTML: <div class="people">
+ #+HTML: <p><img src="jussi.png" title="Jussi Kivilinna" /></p>
+ #+HTML: </div>
/Optimization/
diff --git a/web/share/site.css b/web/share/site.css
index 8678c06..c2b816a 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -124,13 +124,6 @@ img.rfloat {
margin-left: 1em;
}
-img.people {
- float: left;
- margin-right: 1em;
- margin-bottom: 1em;
- min-width: 120px;
-}
-
/* The figure class is used by the blog entries. We use display
to suppress the figure number inserted by org-mode. */
@@ -622,6 +615,16 @@ td.right {
}
+/* Used by the list of people. */
+.people {
+ float: left;
+ margin-top: 1em;
+ margin-right: 1em;
+ margin-bottom: 1em;
+ min-width: 120px;
+}
+
+
/* Forms */
.inputpanel {
background-color: #FAEBD7;
commit 25ce7c92239477fdcc83e59c7159f13548fd7105
Author: Werner Koch <wk at gnupg.org>
Date: Tue Dec 16 10:13:19 2014 +0100
web: Add fundraising message
diff --git a/web/donate/index.org b/web/donate/index.org
index d92e5dc..793af3b 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -31,14 +31,19 @@
** Ways to donate
- Paying using a credit card is currently our preferred choice. [[https://en.wikipedia.org/wiki/Single_Euro_Payments_Area][SEPA]]
- payments will soon be acceptable but we have not yet automated this
- process. If you have a Paypal account you may use that too.
+ Paying using a credit card is currently our preferred choice. If
+ you have a Paypal account you may use that too.
Because the GnuPG project is not tax exempted, we are not able to
- send you a respective donation receipt. However, if you represent a
- company, you may want to enter into a support contract with [[https://g10code.com][g10^code]]
- or ask for other service options.
+ send you a respective donation receipt. If you can benefit from a
+ donation receipt by a Germany charity you may donate to the GnuPG
+ account at the [[https://www.wauland.de/en/donation.html#61][Wau Holland Stiftung]]; they will use the money raised
+ to pay for development work on GnuPG and Enigmail. If you want to
+ be listed on our [[https://www.gnupg.org/donate/kudos.html][thank you]] page you should indicate this by adding a
+ comment of the form =List me as: NAME= to your donation.
+
+ If you represent a company, you may also enter into a support
+ contract with [[https://g10code.com][g10^code]] or ask for other service options.
** Donation form
@@ -51,15 +56,16 @@
#+BEGIN_HTML
<!--ERRORPANEL-->
- <form action="/cgi-bin/procdonate.cgi" method="post">
+ <form action="/cgi-bin/procdonate.cgi" method="post" class="inputpanel">
<input type="hidden" name="mode" value="main">
<p class="ii">Keep this field clear:
<input type="text" size="40" name="url"></p>
<table border="0" cellpadding="0" cellspacing="4">
<tr>
<td></td>
- <td>How much do you want to donate?
- (choosing “other” allows to donate in other currencies)</td>
+ <td>How much do you want to donate?<br/>
+ <span class="smallnote">(choosing “other” allows
+ to donate in other currencies)</span></td>
</tr>
<tr>
<td align="right">Amount:</td>
@@ -88,6 +94,7 @@
<!--ERR_AMOUNT-->
</td>
</tr>
+ <tr><td> </td></tr>
<tr>
<td align="right">Pay using:</td>
<td>
@@ -103,6 +110,7 @@
value="pp" /><!--CHECK_PP-->PayPal</label>
</td>
</tr>
+ <tr><td> </td></tr>
<tr>
<td></td>
<td>
diff --git a/web/index.org b/web/index.org
index d692170..0e1b493 100644
--- a/web/index.org
+++ b/web/index.org
@@ -2,6 +2,40 @@
#+STARTUP: showall
#+SETUPFILE: "share/setup.inc"
+
+* Securing the future of GnuPG
+
+Work on GnuPG is mostly financed from donations. To continue
+maintaining GnuPG so to keep it strong and secure against the ever
+increasing mass surveillance we need your support. Until the end of
+November we received a total of 6584\thinsp\euro (~5500 net) donations
+for this year. Along with the 18000\thinsp\euro net from the [[https://www.gnupg.org/blog/20140512-rewards-sent.html][Goteo
+campaign]] this paid for less less than 50% of the costs for one
+developer.
+
+#+BEGIN_HTML
+<div class="donation-progress">
+ <div class="donation-progress-bar"
+style="width: 0%"><!--REPLACE-PROGRESS-PERCENT-->
+<p> </p></div>
+ <p><span style="float: left">
+<!--INSERT-PROGRESS-LEFT-->
+ </span>
+ <span style="float: right">
+<!--INSERT-PROGRESS-RIGHT-->
+ </span>
+</div>
+<p class="doclear" style="clear: both"></p>
+#+END_HTML
+
+For a critical project of this size two experienced developers are
+required for proper operation. This requires gross revenues of 120000
+Euro per year. Unfortunately there is currently only one underpaid
+full time developer who is barely able to keep up with the work.
+Please help to secure the future of GnuPG and consider to [[file:donate/index.org][donate]] to
+this project [[file:donate/index.org][now]].
+
+
* The GNU Privacy Guard
#+index: GnuPG
#+index: GPG
@@ -21,13 +55,18 @@ GnuPG is [[http://www.gnu.org/philosophy/free-sw.html][Free Software]] (meaning
be freely used, modified and distributed under the terms of the
[[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]] .
-GnuPG comes in two flavours: [[download][{{{gnupg1_ver}}}]] is the old and very
-portable standalone version, whereas [[download][{{{gnupg_ver}}}]] is the enhanced
-and modern version and suggested for most users.
+GnuPG comes in three flavours:
+
+ - {{{gnupg_ver}}} is the /stable/ version suggested for most users,
-Project [[http://www.gpg4win.org][Gpg4win]] provides a Windows version of GnuPG. It is nicely
-integrated into an installer and features several frontends as well as
-English and German manuals.
+ - {{{gnupg21_ver}}} is the brand-new /modern/ version with support
+ for [[https://en.wikipedia.org/wiki/Elliptic_curve_cryptography][ECC]] and many other new features,
+
+ - and {{{gnupg1_ver}}} is the /classic/ portable version.
+
+Project [[http://www.gpg4win.org][Gpg4win]] provides a Windows version of GnuPG /stable/. It is
+nicely integrated into an installer and features several frontends as
+well as English and German manuals.
* Reconquer your privacy
@@ -40,7 +79,6 @@ used to uncover his secrets about the NSA.
Please visit the [[https://emailselfdefense.fsf.org][Email Self-Defense]] site to learn how and why you
should use GnuPG for your electronic communication.
-
* Latest news
#+index: News
diff --git a/web/share/site.css b/web/share/site.css
index f91beef..8678c06 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -454,6 +454,10 @@ h3 {
font-size: 0.8em;
}
+.smallnote {
+ font-size: 0.8em;
+}
+
#footer {
border-top: 2px solid #5c6064;
margin-top: 5em;
@@ -618,6 +622,11 @@ td.right {
}
+/* Forms */
+.inputpanel {
+ background-color: #FAEBD7;
+}
+
/* Donation stuff. */
.buttonbox {
commit 2b1e6cc2d57fb5aed1e01935f23e1a3218581ae8
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 15 20:48:41 2014 +0100
tools: Add --test option to mkkudos and include the main page.
diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index ae1831e..d477d69 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -2,25 +2,20 @@
set -e
-htdocs="/var/www/www/www.gnupg.org/htdocs"
-#htdocs="/home/wk/s/gnupg-doc/web"
-
-donors="$htdocs/donate/donors.dat"
-donations="$htdocs/donate/donations.dat"
-
-
usage()
{
cat <<EOF
Usage: $0 [OPTIONS]
Options:
--force Force re-creation of files.
+ --test Run in test environment
EOF
exit $1
}
force=no
+testmode=no
while [ $# -gt 0 ]; do
case "$1" in
# Set up `optarg'.
@@ -36,6 +31,9 @@ while [ $# -gt 0 ]; do
--force)
force=yes
;;
+ --test)
+ testmode=yes
+ ;;
--help)
usage 0
;;
@@ -46,6 +44,16 @@ while [ $# -gt 0 ]; do
shift
done
+htdocs="/var/www/www/www.gnupg.org/htdocs"
+donors="$htdocs/donate/donors.dat"
+donations="$htdocs/donate/donations.dat"
+
+if [ $testmode = yes ]; then
+ htdocs="/home/wk/s/gnupg-doc/stage"
+ donors="$htdocs/../scratch/donors.dat"
+ donations="$htdocs/../scratch/donations.dat"
+fi
+
if [ ! -f "$donors" ]; then
echo "mkkudos.sh: '$donors' not found" >&2;
@@ -62,13 +70,17 @@ monyear=$(echo "$tmp" | awk -F: 'BEGIN { m[1] = "January";
m[6] = "June"; m[7] = "July"; m[8] = "August"; m[9] = "September";
m[10] = "October"; m[11] = "November"; m[12] = "December"; }
{printf "%s %d", m[$2] , $1}')
-euro=$(echo "$tmp" | awk -F: '{printf "%d Euro", int($8 + 0.5)}')
-euroyr=$(echo "$tmp" | awk -F: '{printf "%d Euro", int($10 + 0.5)}')
+euro=$(echo "$tmp" | awk -F: '{printf "%d €", int($8 + 0.5)}')
+euroyr=$(echo "$tmp" | awk -F: '{printf "%d €", int($10 + 0.5)}')
n=$(echo "$tmp" | awk -F: '{printf "%d", $7}')
nyr=$(echo "$tmp" | awk -F: '{printf "%d", $9}')
+goal="120000"
+percent=$(echo "$euro:$goal" | awk -F: '{printf "%d",(int($1)*100)/int($2)}')
for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
- "$htdocs/donate/"index.html; do
+ "$htdocs/donate/"index.html \
+ "$htdocs/"index.html
+ do
if [ $force = no ]; then
[ "$file" -ot "$donors" ] || continue
fi
@@ -82,7 +94,7 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
[ -f "$file.tmp" ] && rm "$file.tmp"
awk -F: -v year=$year -v donors="$donors" \
-v monyear="$monyear" -v euro="$euro" -v euroyr="$euroyr" \
- -v n="$n" -v nyr="$nyr" \
+ -v n="$n" -v nyr="$nyr" -v goal="$goal" -v percent="$percent" \
<"$file" >"$file.tmp" '
/<!--BEGIN-DONATIONS-->/ {indon=1; print; insert("") }
/<!--END-DONATIONS-->/ {indon=0}
@@ -110,6 +122,20 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
printf "<!--INSERT-YEAR-N--> %s\n", nyr;
next
}
+ /<!--INSERT-PROGRESS-LEFT-->/ {
+ printf "<!--INSERT-PROGRESS-LEFT-->%s\n",
+ euro;
+ next
+ }
+ /<!--INSERT-PROGRESS-RIGHT-->/ {
+ printf "<!--INSERT-PROGRESS-RIGHT-->goal: %s €\n", goal;
+ next
+ }
+ /<!--REPLACE-PROGRESS-PERCENT-->/ {
+ printf "style=\"width: %d%%\"<!--REPLACE-PROGRESS-PERCENT-->\n",
+ percent;
+ next
+ }
!indon { print }
function insert (tag) {
-----------------------------------------------------------------------
Summary of changes:
tools/mkkudos.sh | 48 +++++++++++++++++++++++++++++++++++-----------
web/donate/index.org | 26 ++++++++++++++++---------
web/index.org | 52 +++++++++++++++++++++++++++++++++++++++++++-------
web/people/index.org | 25 ++++++++++++++----------
web/share/site.css | 26 ++++++++++++++++++-------
5 files changed, 133 insertions(+), 44 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list