[git] GPGME - branch, master, updated. gpgme-1.3.2-25-g322552a

[by Werner Koch]

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 "GnuPG Made Easy".

The branch, master has been updated
       via  322552a88db47896881e55c00ca301137cd160c6 (commit)
       via  cd6de92f42cb6e5b85bc376d5544496cb4d6a88a (commit)
       via  1a17acd8e9b7c0ef924f98bfb1502fe12e83c363 (commit)
      from  c97d067f27899d890a99036fcbed9263f4f68875 (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 322552a88db47896881e55c00ca301137cd160c6
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 13:50:58 2012 +0100

    Improve parsing of the GIT revision number.
    
    * configure.ac (git_revision): Use git rev-parse.

diff --git a/configure.ac b/configure.ac
index c5300e3..75b6fcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,8 @@ m4_define(my_isgit, [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
-m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
-          | awk '/^\* / {printf "%s",$3}']))
+m4_define([git_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
 m4_define([my_full_version], [my_version[]m4_if(my_isgit,[yes],
           [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
 
@@ -970,15 +970,15 @@ AC_OUTPUT
 echo "
         GPGME v${VERSION} has been configured as follows:
 
+        Revision:        git_revision  (git_brevis)
+        Platform:        $host
+
         GnuPG path:      $GPG
         GnuPG version:   $GPG_VERSION, min. $NEED_GPG_VERSION
-
         GpgSM path:      $GPGSM
         GpgSM version:   $GPGSM_VERSION, min. $NEED_GPGSM_VERSION
-
         GpgConf path:    $GPGCONF
         GpgConf version: $GPGCONF_VERSION, min. $NEED_GPGCONF_VERSION
-
         G13 path:        $G13
         G13 version:     $G13_VERSION, min. $NEED_G13_VERSION
 
@@ -986,6 +986,5 @@ echo "
 
         UI Server:       $uiserver
         FD Passing:      $use_descriptor_passing
-
         GPGME Pthread:   $have_pthread
 "

commit cd6de92f42cb6e5b85bc376d5544496cb4d6a88a
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 13:45:14 2012 +0100

    Fix non-portable use of chmod in autogen.sh.
    
    * autogen.sh: Remove option -c from chmod.

diff --git a/autogen.sh b/autogen.sh
index 1f22367..abcfc27 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -261,14 +261,14 @@ if [ -d .git ]; then
     and .git/hooks/pre-commit.sample out of the way.
 EOF
       cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
-      chmod -c +x  .git/hooks/pre-commit
+      chmod +x  .git/hooks/pre-commit
   fi
   if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
     cat <<EOF >&2
 *** Activating commit log message check hook. ***
 EOF
       cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
-      chmod -c +x  .git/hooks/commit-msg
+      chmod +x  .git/hooks/commit-msg
   fi
 fi
 

commit 1a17acd8e9b7c0ef924f98bfb1502fe12e83c363
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 15 11:14:58 2012 +0100

    Make _gpgme_encode_percent_string work for memory buffers.
    
    * src/conversion.c (D_gpgme_encode_percent_string): Remove stray
    semicolon.  Reported by Xi Wang.
    --
    Obviously this function is not used with a supplied LEN argument != 0.

diff --git a/src/conversion.c b/src/conversion.c
index 356200c..b47d6de 100644
--- a/src/conversion.c
+++ b/src/conversion.c
@@ -282,7 +282,7 @@ _gpgme_encode_percent_string (const char *src, char **destp, size_t len)
   /* Set up the destination buffer.  */
   if (len)
     {
-      if (len < destlen);
+      if (len < destlen)
 	return gpg_error (GPG_ERR_INTERNAL);
 
       dest = *destp;

-----------------------------------------------------------------------

Summary of changes:
 autogen.sh       |    4 ++--
 configure.ac     |   11 +++++------
 src/conversion.c |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org