[git] GCRYPT - branch, LIBGCRYPT-1-5-BRANCH, updated. libgcrypt-1.5.0-15-g322a9b5

by Werner Koch cvs at cvs.gnupg.org
Fri Nov 16 12:32:19 CET 2012


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 crypto library".

The branch, LIBGCRYPT-1-5-BRANCH has been updated
       via  322a9b53e6f7e71aca46a45b12b036ecf46be8ee (commit)
       via  65c2a52a1cce0aa609b3b6c68c0e89890171209b (commit)
      from  6feb29a67a0e6660c876055ee59f2e716ef8e7c2 (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 322a9b53e6f7e71aca46a45b12b036ecf46be8ee
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 11:03:10 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 546dab7..a2f6b01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,9 @@ 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}']))
+m4_define([git_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+
 AC_INIT([libgcrypt],
         [my_version[]m4_if(my_issvn,[yes],
         [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],

commit 65c2a52a1cce0aa609b3b6c68c0e89890171209b
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 11:02:02 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 d9a6586..92cc0d6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -250,7 +250,7 @@ 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
 fi
 

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

Summary of changes:
 autogen.sh   |    2 +-
 configure.ac |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org




More information about the Gnupg-commits mailing list