[git] GnuPG - branch, npth, updated. post-nuke-of-trailing-ws-114-g3a0f06e
by Marcus Brinkmann
cvs at cvs.gnupg.org
Thu Oct 13 18:29:35 CEST 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, npth has been updated
via 3a0f06e3e801fe6f6f0cf7a78fe92118e6f4e743 (commit)
via 36e85416a37fdf8bda8ac5d74ef5f4ee9d1a82cd (commit)
via 5319aa952fc202712132f4cb8021b9cda81bad85 (commit)
via b277bec250fa55343a7b5e484e49a691bf9372aa (commit)
via cdd152bf49026bc1a98336482e3eee30000d59da (commit)
via a2d081a20a27b1ae9bf201fc6b1b9bfa36aa7313 (commit)
via f61b5371c492b0685c179090372f35329e8a2028 (commit)
via bf3d5beb7103b64905c48a2ec33efbfab39cbce0 (commit)
via ed8e267859a00233fee89a6b1b7fb3d74ceced96 (commit)
via 567a31c2a0c6d5cbf700b4667e1bb91389fd2246 (commit)
via 8a033fecfb4c73b8f7d1119272c10e64d9176bcb (commit)
via 537be4ca47eebddd82615d6f1504aa487669536c (commit)
via b73ae3ca36547939c9aaf54c0d05fbc93d47c096 (commit)
via acde3f8ea660ced34ebe34f7d31185c9fdea8295 (commit)
from 2959e9e4d18d8b9f6b476ac8e6ea40adbb03689a (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 3a0f06e3e801fe6f6f0cf7a78fe92118e6f4e743
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Thu Oct 13 17:43:12 2011 +0200
Fix npth version check.
diff --git a/m4/npth.m4 b/m4/npth.m4
index 7797f07..5b60e2c 100644
--- a/m4/npth.m4
+++ b/m4/npth.m4
@@ -23,11 +23,9 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
npth_version=`$NPTH_CONFIG --version`
fi
npth_version_major=`echo $npth_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
npth_version_minor=`echo $npth_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
- npth_version_micro=`echo $npth_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
])
dnl AM_PATH_NPTH([MINIMUM-VERSION,
@@ -36,7 +34,7 @@ dnl Test for libnpth and define NPTH_CFLAGS and NPTH_LIBS.
dnl
AC_DEFUN([AM_PATH_NPTH],
[ AC_REQUIRE([_AM_PATH_NPTH_CONFIG])dnl
- tmp=ifelse([$1], ,1:0.0.1,$1)
+ tmp=ifelse([$1], ,1:0.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_npth_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
min_npth_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
@@ -49,23 +47,16 @@ AC_DEFUN([AM_PATH_NPTH],
ok=no
if test "$NPTH_CONFIG" != "no" ; then
req_major=`echo $min_npth_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
req_minor=`echo $min_npth_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
- req_micro=`echo $min_npth_version | \
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+
if test "$npth_version_major" -gt "$req_major"; then
ok=yes
else
if test "$npth_version_major" -eq "$req_major"; then
- if test "$npth_version_minor" -gt "$req_minor"; then
+ if test "$npth_version_minor" -ge "$req_minor"; then
ok=yes
- else
- if test "$npth_version_minor" -eq "$req_minor"; then
- if test "$npth_version_micro" -ge "$req_micro"; then
- ok=yes
- fi
- fi
fi
fi
fi
commit 36e85416a37fdf8bda8ac5d74ef5f4ee9d1a82cd
Merge: 2959e9e 5319aa9
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date: Thu Oct 13 17:18:05 2011 +0200
Merge branch 'master' into npth
Conflicts:
ChangeLog
common/ChangeLog
diff --cc ChangeLog
index 00e01ab,bd02016..f36d54e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,7 +1,17 @@@
- 2011-09-26 Marcus Brinkmann <marcus at g10code.com>
++2011-10-13 Marcus Brinkmann <marcus at g10code.com>
+
+ * configure.ac: Don't check for PTH but for NPTH.
+ (AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
+ (have_pth): Rename to ...
+ (have_npth): ... this.
+ (USE_GNU_NPTH): Rename to ...
+ (USE_GNU_PTH): ... this.
+ * m4/gnupg-npth.m4: New file.
+
+ 2011-09-23 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Remove check for gcry_kdf_derive.
+
2011-08-10 Werner Koch <wk at g10code.com>
* configure.ac: Fix new autoconf warnings.
diff --cc common/ChangeLog
index 0e0e626,687bb09..d1090e0
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@@ -1,8 -1,46 +1,51 @@@
+2011-10-13 Marcus Brinkmann <marcus at g10code.com>
+
+ * estream.c, exechelp-posix.c, exechelp-w32.c, exechelp-w32ce.c,
+ http.c, init.c, sysutils.c: Port to NPth.
+
+ 2011-09-30 Werner Koch <wk at g10code.com>
+
+ Change the license of all JNLIB parts from LPGLv3+ to to LGPLv3+
+ or GPLv2+.
+
+ * dotlock.h (DOTLOCK_EXT_SYM_PREFIX): New macro.
+
+ 2011-09-29 Werner Koch <wk at g10code.com>
+
+ * dotlock.c (DOTLOCK_USE_PTHREAD): New macro.
+ [DOTLOCK_USE_PTHREAD] (all_lockfiles_mutex): New.
+ (LOCK_all_lockfiles, UNLOCK_all_lockfiles): New. Use them to
+ protect access to all_lockfiles.
+ (dotlock_set_fd, dotlock_get_fd): New.
+
+ 2011-09-28 Werner Koch <wk at g10code.com>
+
+ * dotlock.c (dotlock_take, dotlock_take_unix, dotlock_take_w32):
+ Implement arbitrary timeout values.
+ (dotlock_create): Add arg FLAGS for future extensions.
+
+ 2011-09-27 Werner Koch <wk at g10code.com>
+
+ * dotlock.c (dotlock_take_unix): Check only the link count and not
+ the error return from link.
+ (use_hardlinks_p): New.
+ (dotlock_create_unix): Test for hardlinks.
+ (dotlock_take_unix): Implement O_EXCL locking.
+
+ 2011-09-23 Werner Koch <wk at g10code.com>
+
+ * dotlock.c: Factor Unix and W32 specific code out into specific
+ functions. Define HAVE_POSIX_SYSTEM. Rearrange some functions.
+ (disable_dotlock): Rename to dotlock_disable.
+ (create_dotlock): Rename to dotlock_create.
+ (destroy_dotlock): Rename to dotlock_destroy.
+ (make_dotlock): Rename to dotlock_take.
+ (release_dotlock): Rename to dotlock_release.
+
+ 2011-09-22 Werner Koch <wk at g10code.com>
+
+ * dotlock.c: Remove support for RISCOS.
+
2011-08-10 Werner Koch <wk at g10code.com>
* t-exechelp.c (test_close_all_fds): Don't use the DUMMY_FD var.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +-
common/ChangeLog | 45 ++-
common/argparse.c | 25 +-
common/argparse.h | 25 +-
common/asshelp.c | 6 +-
common/dotlock.c | 1325 ++++++++++++++++++++++++++++------------
common/dotlock.h | 71 ++-
common/dynload.h | 25 +-
common/libjnlib-config.h | 25 +-
common/logging.c | 25 +-
common/logging.h | 25 +-
common/mischelp.c | 25 +-
common/mischelp.h | 25 +-
common/stringhelp.c | 25 +-
common/stringhelp.h | 25 +-
common/strlist.c | 25 +-
common/strlist.h | 25 +-
common/t-dotlock.c | 145 +++++
common/t-stringhelp.c | 25 +-
common/t-support.c | 25 +-
common/t-support.h | 25 +-
common/t-timestuff.c | 25 +-
common/t-w32-reg.c | 25 +-
common/types.h | 25 +-
common/utf8conv.c | 25 +-
common/utf8conv.h | 25 +-
common/util.h | 33 +-
common/w32-afunix.c | 25 +-
common/w32-afunix.h | 25 +-
common/w32-reg.c | 25 +-
common/w32help.h | 25 +-
common/xmalloc.c | 25 +-
common/xmalloc.h | 25 +-
configure.ac | 33 +-
doc/ChangeLog | 6 +
doc/gpg-agent.texi | 4 -
doc/gpg.texi | 1500 +++++++++++++++++++++++++---------------------
doc/gpgsm.texi | 2 -
doc/tools.texi | 1 -
doc/yat2m.c | 103 +++--
g10/ChangeLog | 9 +
g10/gpg.c | 4 +-
g10/gpgv.c | 15 +-
g10/keydb.c | 8 +-
g10/keyring.c | 6 +-
g10/tdbio.c | 24 +-
g13/create.c | 6 +-
g13/g13.c | 2 +-
g13/mount.c | 6 +-
m4/npth.m4 | 23 +-
po/de.po | 56 ++-
sm/gpgsm.c | 2 +-
sm/keydb.c | 12 +-
53 files changed, 2695 insertions(+), 1408 deletions(-)
create mode 100644 common/t-dotlock.c
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list