[gnunet] branch master updated (79fa97731 -> d6d7bf7df)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 79fa97731 indentation fix
     new 96a4239fe - fix busybox mktemp
     new 8af55509f - fix epoch 1y
     new d6d7bf7df Merge branch 'master' of ssh://gnunet.org/gnunet

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/gns/gnunet-gns-proxy-setup-ca.in | 6 +++---
 src/revocation/revocation.conf.in    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in 
b/src/gns/gnunet-gns-proxy-setup-ca.in
index 412e53f8d..9a298f24a 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -119,9 +119,9 @@ generate_ca()
     infomsg "Generating CA"
     TMPDIR=${TMPDIR:-/tmp}
     if test -e "$TMPDIR"; then
-        GNSCERT=`mktemp -t certXXXXXXXX.pem` || exit 1
-        GNSCAKY=`mktemp -t cakyXXXXXXXX.pem` || exit 1
-        GNSCANO=`mktemp -t canoXXXXXXXX.pem` || exit 1
+        GNSCERT=`mktemp -t cert.pem.XXXXXXXX` || exit 1
+        GNSCAKY=`mktemp -t caky.pem.XXXXXXXX` || exit 1
+        GNSCANO=`mktemp -t cano.pem.XXXXXXXX` || exit 1
     else
         # This warning is mostly pointless.
         warningmsg "You need to export the TMPDIR variable"
diff --git a/src/revocation/revocation.conf.in 
b/src/revocation/revocation.conf.in
index 04393ea9f..d2d7de46e 100644
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -14,6 +14,6 @@ UNIX_MATCH_GID = YES
 # (using only a single-core) with SCRYPT.
 # DO NOT CHANGE THIS VALUE, doing so will break the protocol!
 WORKBITS = 22
-EPOCH_DURATION = 356 d
+EPOCH_DURATION = 365 d
 
 DATABASE = $GNUNET_DATA_HOME/revocation.dat

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.