[git] KSBA - branch, master, updated. libksba-1.3.0-3-g7b9662f
by Werner Koch
cvs at cvs.gnupg.org
Fri Nov 16 15:09:06 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 "KSBA is a library to access X.509 certificates and CMS data.".
The branch, master has been updated
via 7b9662f2bf28feb575c4b2b181d88ca61ad43d53 (commit)
via c18bf9d08d95a73192e12580ce5eae3454c07c0d (commit)
from 31f4cbeb71b463a80f6d7842ac5e4df4f5c9d829 (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 7b9662f2bf28feb575c4b2b181d88ca61ad43d53
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 16 13:36:50 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 e6de2a2..fe76192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,8 +33,8 @@ m4_define(mym4_version, [1.3.1])
# 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],
@@ -409,6 +409,7 @@ AC_OUTPUT
echo "
Libksba v${VERSION} has been configured as follows:
+ Revision: mym4_revision (mym4_revision_dec)
Platform: $host
"
commit c18bf9d08d95a73192e12580ce5eae3454c07c0d
Author: Werner Koch <wk at gnupg.org>
Date: Fri Nov 16 13:36:37 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 17c3380..8f6c953 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
-----------------------------------------------------------------------
Summary of changes:
autogen.sh | 4 ++--
configure.ac | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list