[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.16-18-g344d72b
by Werner Koch
cvs at cvs.gnupg.org
Mon Jan 10 15:38:48 CET 2011
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 GNU Privacy Guard".
The branch, STABLE-BRANCH-2-0 has been updated
via 344d72b2f7caaa217941adc8cdb70e722ed8f888 (commit)
via fc959326b575dd07ea0a1c6686ec93a07d280cd4 (commit)
from 46ef7f624393bd7765174a1f2f321d6ac5a41c02 (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 344d72b2f7caaa217941adc8cdb70e722ed8f888
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 10 15:18:09 2011 +0100
Support a git revision string
diff --git a/ChangeLog b/ChangeLog
index c35ea42..99d158a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-10 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Support a git_revision string.
+
2010-07-19 Werner Koch <wk at g10code.com>
Release 2.0.16.
diff --git a/configure.ac b/configure.ac
index 1332bc5..bf1b39f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,11 @@ m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
+m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
+ | awk '/^\* / {printf "%s",$3}']))
AC_INIT([gnupg],
- [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
+ [my_version[]m4_if(my_issvn,[yes],
+ [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
[http://bugs.gnupg.org])
# Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not
commit fc959326b575dd07ea0a1c6686ec93a07d280cd4
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 10 15:16:07 2011 +0100
Fix bug#1311
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..04335fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,135 @@
+Makefile.in
+aclocal.m4
+autom4te.cache/
+configure
+config.h.in
+config.h
+config.log
+config.status
+common/audit-events.h
+common/status-codes.h
+doc/gnupg.info*
+doc/stamp-vti
+doc/version.texi
+po/gnupg2.pot
+po/POTFILES
+stamp-h1
+Makefile
+.deps/
+keyserver/gpg2keys_mailto
+keyserver/gpg2keys_test
+tools/gpg-zip
+
+# Files created by make when not using a VPATH build
+*.o
+po/en at boldquot.insert-header
+po/en at boldquot.po
+po/en at quot.insert-header
+po/en at quot.po
+po/stamp-po
+agent/gpg-agent
+agent/gpg-preset-passphrase
+agent/gpg-protect-tool
+agent/t-protect
+common/libcommon.a
+common/libcommonpth.a
+common/libgpgrl.a
+common/libsimple-pwquery.a
+common/t-b64
+common/t-convert
+common/t-exechelp
+common/t-gettime
+common/t-helpfile
+common/t-percent
+common/t-session-env
+common/t-sexputil
+common/t-sysutils
+doc/FAQ
+doc/addgnupghome.8
+doc/applygnupgdefaults.8
+doc/faq.html
+doc/faq.raw.xref
+doc/gnupg-card-architecture.eps
+doc/gnupg-card-architecture.pdf
+doc/gnupg-card-architecture.png
+doc/gnupg.7
+doc/gpg-agent.1
+doc/gpg-connect-agent.1
+doc/gpg-preset-passphrase.1
+doc/gpg-zip.1
+doc/gpg2.1
+doc/gpgconf.1
+doc/gpgparsemail.1
+doc/gpgsm-gencert.sh.1
+doc/gpgsm.1
+doc/gpgv2.1
+doc/scdaemon.1
+doc/symcryptrun.1
+doc/watchgnupg.1
+doc/yat2m
+doc/yat2m-stamp
+g10/gpg2
+g10/gpgv2
+g10/t-rmd160
+gl/alloca.h
+gl/libgnu.a
+jnlib/libjnlib.a
+jnlib/t-stringhelp
+kbx/kbxutil
+kbx/libkeybox.a
+keyserver/gpg2keys_curl
+keyserver/gpg2keys_finger
+keyserver/gpg2keys_hkp
+keyserver/gpg2keys_kdns
+keyserver/gpg2keys_ldap
+scd/gnupg-pcsc-wrapper
+scd/scdaemon
+sm/gpgsm
+tests/asschk
+tests/gpg-agent.conf
+tests/gpgsm.conf
+tests/inittests.stamp
+tests/openpgp/data-32000
+tests/openpgp/data-500
+tests/openpgp/data-80000
+tests/openpgp/data-9000
+tests/openpgp/gpg-agent.conf
+tests/openpgp/gpg_dearmor
+tests/openpgp/plain-1
+tests/openpgp/plain-2
+tests/openpgp/plain-3
+tests/openpgp/plain-large
+tests/openpgp/prepared.stamp
+tests/openpgp/pubring.gpg
+tests/openpgp/pubring.pkr
+tests/openpgp/secring.gpg
+tests/openpgp/secring.skr
+tests/pkits/ReadMe.txt
+tests/pkits/certpairs/
+tests/pkits/certs/
+tests/pkits/crls/
+tests/pkits/gpg-agent.conf
+tests/pkits/gpgsm.conf
+tests/pkits/inittests.stamp
+tests/pkits/pkcs12/
+tests/pkits/pkits.ldif
+tests/pkits/pkits.schema
+tests/pkits/policies.txt
+tests/pkits/smime/
+tests/pkits/testdir.stamp
+tests/pkits/trustlist.txt
+tests/private-keys-v1.d/
+tests/pubring.kbx
+tests/testdir.stamp
+tests/trustlist.txt
+tools/clean-sat
+tools/gpg-check-pattern
+tools/gpg-connect-agent
+tools/gpgconf
+tools/gpgkey2ssh
+tools/gpgparsemail
+tools/gpgsplit
+tools/make-dns-cert
+tools/mk-tdata
+tools/symcryptrun
+tools/watchgnupg
diff --git a/NEWS b/NEWS
index 8e3ff65..97ba097 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ Noteworthy changes in version 2.0.17 (unreleased)
* Fixed a bug where Scdaemon sends a signal to Gpg-agent running in
non-daemon mode.
+ * Fixed TTY management for pinentries and session variable update
+ problem.
+
Noteworthy changes in version 2.0.16 (2010-07-19)
-------------------------------------------------
diff --git a/common/ChangeLog b/common/ChangeLog
index c0f618e..9c18680 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-10 Werner Koch <wk at g10code.com>
+
+ * session-env.c (update_var): Fix same value test. Fixes
+ bug#1311.
+
2010-09-16 Werner Koch <wk at g10code.com>
* util.h: Add GPG_ERR_MISSING_ISSUER_CERT.
diff --git a/common/session-env.c b/common/session-env.c
index ef36dbc..10f5dfe 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -183,10 +183,11 @@ update_var (session_env_t se, const char *string, size_t namelen,
else if (!strncmp (se->array[idx]->name, string, namelen)
&& strlen (se->array[idx]->name) == namelen)
{
- /* Check if the value is the same; no need to update it,
- except for updating the default flag. */
if (strlen (se->array[idx]->value) == valuelen)
{
+ /* The new value has the same length. We can update it
+ in-place. */
+ memcpy (se->array[idx]->value, value, valuelen);
se->array[idx]->is_default = !!set_default;
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++
ChangeLog | 4 ++
NEWS | 3 +
common/ChangeLog | 5 ++
common/session-env.c | 5 +-
configure.ac | 5 ++-
6 files changed, 154 insertions(+), 3 deletions(-)
create mode 100644 .gitignore
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list