[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-98-ge7bc501

[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 "The GNU Privacy Guard".

The branch, master has been updated
       via  e7bc5012c568da9ceb0a80a8f3fe3edf3dac9564 (commit)
       via  011faa0c68cf0c628ef581193166e9ac9bf22b71 (commit)
       via  ac775780fef3ef63f896e822add9ff6ea7e5119c (commit)
      from  6505a995f93fb82adc7ed560f177901aef6328b5 (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 e7bc5012c568da9ceb0a80a8f3fe3edf3dac9564
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 10:36:53 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 0ec134d..dcb3834 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -287,7 +287,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
   tmp=$(git config --get filter.cleanpo.clean)
   if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
@@ -301,7 +301,7 @@ EOF
 *** Activating commit log message check hook. ***
 EOF
       cp -av scripts/git-hooks/commit-msg .git/hooks/commit-msg
-      chmod -c +x  .git/hooks/commit-msg
+      chmod +x  .git/hooks/commit-msg
   fi
 fi
 

commit 011faa0c68cf0c628ef581193166e9ac9bf22b71
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 10:35:33 2012 +0100

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

diff --git a/configure.ac b/configure.ac
index 0241a9d..90c77fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,8 @@ m4_define([mym4_version], [2.1.0])
 # the decimalized short revision number, a beta version string and a
 # flag indicating a development version (mym4_isgit).  Note that the
 # m4 processing is done by autoconf and not during the configure run.
-m4_define([mym4_revision], m4_esyscmd([git branch -v 2>/dev/null \
-          | awk '/^\* / {printf "%s",$3}']))
+m4_define([mym4_revision],
+          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
 m4_define([mym4_revision_dec],
           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
 m4_define([mym4_betastring],

commit ac775780fef3ef63f896e822add9ff6ea7e5119c
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 15 14:34:20 2012 +0100

    Add an OpenPGP card vendor.
    
    * g10/card-util.c (get_manufacturer): Add Yubico.

diff --git a/g10/card-util.c b/g10/card-util.c
index 533489c..8358685 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -204,8 +204,9 @@ get_manufacturer (unsigned int no)
     case 0x0001: return "PPC Card Systems";
     case 0x0002: return "Prism";
     case 0x0003: return "OpenFortress";
-    case 0x0004: return "Wewid AB";
+    case 0x0004: return "Wewid";
     case 0x0005: return "ZeitControl";
+    case 0x0006: return "Yubico";
 
     case 0x002A: return "Magrathea";
 

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

Summary of changes:
 autogen.sh      |    4 ++--
 configure.ac    |    4 ++--
 g10/card-util.c |    3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org