From cvs at cvs.gnupg.org Thu Oct 13 18:29:35 2011 From: cvs at cvs.gnupg.org (by Marcus Brinkmann) Date: Thu, 13 Oct 2011 18:29:35 +0200 Subject: [git] GnuPG - branch, npth, updated. post-nuke-of-trailing-ws-114-g3a0f06e Message-ID: 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 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 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 ++2011-10-13 Marcus Brinkmann + + * 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 + + * configure.ac: Remove check for gcry_kdf_derive. + 2011-08-10 Werner Koch * 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 + + * 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 + + 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 + + * 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 + + * 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 + + * 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 + + * 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 + + * dotlock.c: Remove support for RISCOS. + 2011-08-10 Werner Koch * 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 From cvs at cvs.gnupg.org Thu Oct 13 18:32:59 2011 From: cvs at cvs.gnupg.org (by Marcus Brinkmann) Date: Thu, 13 Oct 2011 18:32:59 +0200 Subject: [git] GnuPG - branch, npth, updated. post-nuke-of-trailing-ws-115-g63dd3b9 Message-ID: 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 63dd3b9a43ec3ea7be2362e3e77e5a5ce68fc805 (commit) from 3a0f06e3e801fe6f6f0cf7a78fe92118e6f4e743 (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 63dd3b9a43ec3ea7be2362e3e77e5a5ce68fc805 Author: Marcus Brinkmann Date: Thu Oct 13 17:46:38 2011 +0200 Amend last commit. diff --git a/ChangeLog b/ChangeLog index f36d54e..ec4cfa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-10-13 Marcus Brinkmann + * configure.ac: Fix npth version check. + * m4/npth.m4: Fix version check. + * configure.ac: Don't check for PTH but for NPTH. (AH_BOTTOM): Remove PTH_SYSCALL_SOFT. (have_pth): Rename to ... diff --git a/configure.ac b/configure.ac index 26995ce..ebf3515 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ NEED_KSBA_API=1 NEED_KSBA_VERSION=1.2.0 NEED_NPTH_API=1 -NEED_NPTH_VERSION=0.0.1 +NEED_NPTH_VERSION=0.0 PACKAGE=$PACKAGE_NAME ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- The GNU Privacy Guard http://git.gnupg.org From cvs at cvs.gnupg.org Thu Oct 13 18:36:58 2011 From: cvs at cvs.gnupg.org (by Marcus Brinkmann) Date: Thu, 13 Oct 2011 18:36:58 +0200 Subject: [git] GnuPG - branch, npth, updated. post-nuke-of-trailing-ws-117-g0e5d57c Message-ID: 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 0e5d57cc6d839b90d642308085e4800a67f89250 (commit) via 7629ac332c9c31503d6786f7aee7937337de7b1f (commit) from 63dd3b9a43ec3ea7be2362e3e77e5a5ce68fc805 (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 0e5d57cc6d839b90d642308085e4800a67f89250 Author: Marcus Brinkmann Date: Thu Oct 13 17:50:10 2011 +0200 Cast npth_self result for safety. diff --git a/agent/ChangeLog b/agent/ChangeLog index c18e9e5..721abac 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,9 @@ 2011-10-13 Marcus Brinkmann + * gpg-agent.c (start_connection_thread) + (start_connection_thread_ssh): Cast npth_self result to unsigned + long for safety. + * cache.c (new_data): Fix error check. * cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c, diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index abd2441..30ec1d3 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -1778,19 +1778,19 @@ start_connection_thread (void *arg) if (check_nonce (ctrl, &socket_nonce)) { - log_error ("handler 0x%lx nonce check FAILED\n", npth_self()); + log_error ("handler 0x%lx nonce check FAILED\n", (unsigned long) npth_self()); return NULL; } agent_init_default_ctrl (ctrl); if (opt.verbose) log_info (_("handler 0x%lx for fd %d started\n"), - npth_self(), FD2INT(ctrl->thread_startup.fd)); + (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd)); start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd); if (opt.verbose) log_info (_("handler 0x%lx for fd %d terminated\n"), - npth_self(), FD2INT(ctrl->thread_startup.fd)); + (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd)); agent_deinit_default_ctrl (ctrl); xfree (ctrl); @@ -1810,12 +1810,12 @@ start_connection_thread_ssh (void *arg) agent_init_default_ctrl (ctrl); if (opt.verbose) log_info (_("ssh handler 0x%lx for fd %d started\n"), - npth_self(), FD2INT(ctrl->thread_startup.fd)); + (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd)); start_command_handler_ssh (ctrl, ctrl->thread_startup.fd); if (opt.verbose) log_info (_("ssh handler 0x%lx for fd %d terminated\n"), - npth_self(), FD2INT(ctrl->thread_startup.fd)); + (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd)); agent_deinit_default_ctrl (ctrl); xfree (ctrl); commit 7629ac332c9c31503d6786f7aee7937337de7b1f Author: Marcus Brinkmann Date: Thu Oct 13 17:49:45 2011 +0200 Fix error check. diff --git a/agent/ChangeLog b/agent/ChangeLog index ba27270..c18e9e5 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,7 @@ 2011-10-13 Marcus Brinkmann + * cache.c (new_data): Fix error check. + * cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c, trustlist.c: Port to NPth. diff --git a/agent/cache.c b/agent/cache.c index 712da0c..1c8a42b 100644 --- a/agent/cache.c +++ b/agent/cache.c @@ -185,7 +185,7 @@ new_data (const char *string, struct secret_data_s **r_data) d_enc->totallen = total; res = npth_mutex_lock (&encryption_lock); if (res) - log_fatal ("failed to acquire cache encryption mutex: %s\n", strerror (err)); + log_fatal ("failed to acquire cache encryption mutex: %s\n", strerror (res)); err = gcry_cipher_encrypt (encryption_handle, d_enc->data, total, d->data, total - 8); xfree (d); ----------------------------------------------------------------------- Summary of changes: agent/ChangeLog | 6 ++++++ agent/cache.c | 2 +- agent/gpg-agent.c | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) hooks/post-receive -- The GNU Privacy Guard http://git.gnupg.org From cvs at cvs.gnupg.org Mon Oct 24 12:27:01 2011 From: cvs at cvs.gnupg.org (by Werner Koch) Date: Mon, 24 Oct 2011 12:27:01 +0200 Subject: [git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-113-g7dfcc9f Message-ID: 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 7dfcc9f19acfe8f0dc70db8d981b79aac0589cf4 (commit) via d4fa82e688c1844777896f02cb3c8dea8a5d4f9a (commit) from 5319aa952fc202712132f4cb8021b9cda81bad85 (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 7dfcc9f19acfe8f0dc70db8d981b79aac0589cf4 Author: Werner Koch Date: Mon Oct 24 11:38:17 2011 +0200 Allow distribution of dotlock.* also under a modified BSD license diff --git a/common/ChangeLog b/common/ChangeLog index 687bb09..54435f4 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,8 @@ +2011-10-24 Werner Koch + + * dotlock.h, dotlock.c: Add alternative to allow distribution of + these files under a modified BSD license + 2011-09-30 Werner Koch Change the license of all JNLIB parts from LPGLv3+ to to LGPLv3+ diff --git a/common/dotlock.c b/common/dotlock.c index 353f2cf..b4734b9 100644 --- a/common/dotlock.c +++ b/common/dotlock.c @@ -27,6 +27,42 @@ * You should have received a copies of the GNU General Public License * and the GNU Lesser General Public License along with this program; * if not, see . + * + * ALTERNATIVELY, this file may be distributed under the terms of the + * following license, in which case the provisions of this license are + * required INSTEAD OF the GNU Lesser General License or the GNU + * General Public License. If you wish to allow use of your version of + * this file only under the terms of the GNU Lesser General License or + * the GNU General Public License, and not to allow others to use your + * version of this file under the terms of the following license, + * indicate your decision by deleting this paragraph and the license + * below. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. */ /* diff --git a/common/dotlock.h b/common/dotlock.h index 5267ceb..920a81a 100644 --- a/common/dotlock.h +++ b/common/dotlock.h @@ -26,6 +26,42 @@ * You should have received a copies of the GNU General Public License * and the GNU Lesser General Public License along with this program; * if not, see . + * + * ALTERNATIVELY, this file may be distributed under the terms of the + * following license, in which case the provisions of this license are + * required INSTEAD OF the GNU Lesser General License or the GNU + * General Public License. If you wish to allow use of your version of + * this file only under the terms of the GNU Lesser General License or + * the GNU General Public License, and not to allow others to use your + * version of this file under the terms of the following license, + * indicate your decision by deleting this paragraph and the license + * below. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef LIBJNLIB_DOTLOCK_H commit d4fa82e688c1844777896f02cb3c8dea8a5d4f9a Author: Werner Koch Date: Tue Oct 18 14:18:36 2011 +0200 Typo fix and remove of some colloquial terms diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index 7bfbc9d..8920833 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -304,7 +304,7 @@ and to change the default configuration. * Certificate Options:: Certificate related options. * Input and Output:: Input and Output. * CMS Options:: How to change how the CMS is created. -* Esoteric Options:: Doing things one usually don't want to do. +* Esoteric Options:: Doing things one usually do not want to do. @end menu @@ -346,14 +346,14 @@ Change the default name of the policy file to @var{filename}. Specify an agent program to be used for secret key operations. The default value is the @file{/usr/local/bin/gpg-agent}. This is only used as a fallback when the environment variable @code{GPG_AGENT_INFO} is not -set or a running agent can't be connected. +set or a running agent cannot be connected. @item --dirmngr-program @var{file} @opindex dirmnr-program Specify a dirmngr program to be used for @acronym{CRL} checks. The default value is @file{/usr/sbin/dirmngr}. This is only used as a fallback when the environment variable @code{DIRMNGR_INFO} is not set or -a running dirmngr can't be connected. +a running dirmngr cannot be connected. @item --prefer-system-dirmngr @opindex prefer-system-dirmngr @@ -367,7 +367,7 @@ Entirely disable the use of the Dirmngr. @item --no-secmem-warning @opindex no-secmem-warning -Don't print a warning when the so called "secure memory" can't be used. +Do not print a warning when the so called "secure memory" cannot be used. @item --log-file @var{file} @opindex log-file @@ -407,7 +407,7 @@ By default the @acronym{CRL} for trusted root certificates are checked like for any other certificates. This allows a CA to revoke its own certificates voluntary without the need of putting all ever issued certificates into a CRL. The disable option may be used to switch this -extra check off. Due to the caching done by the Dirmngr, there won't be +extra check off. Due to the caching done by the Dirmngr, there will not be any noticeable performance gain. Note, that this also disables possible OCSP checks for trusted root certificates. A more specific way of disabling this check is by adding the ``relax'' keyword to the root CA @@ -428,12 +428,12 @@ command. This option should not be used in a configuration file. @itemx --disable-ocsp @opindex enable-ocsp @opindex disable-ocsp -Be default @acronym{OCSP} checks are disabled. The enable option may +By default @acronym{OCSP} checks are disabled. The enable option may be used to enable OCSP checks via Dirmngr. If @acronym{CRL} checks are also enabled, CRLs will be used as a fallback if for some reason an -OCSP request won't succeed. Note, that you have to allow OCSP +OCSP request will not succeed. Note, that you have to allow OCSP requests in Dirmngr's configuration too (option - at option{--allow-ocsp} and configure dirmngr properly. If you don't do + at option{--allow-ocsp}) and configure Dirmngr properly. If you do not do so you will get the error code @samp{Not supported}. @item --auto-issuer-key-retrieve @@ -463,7 +463,7 @@ Add @var{oid} to the list of ignored certificate extensions. The @code{2.5.29.3}. This option may be used more than once. Critical flagged certificate extensions matching one of the OIDs in the list are treated as if they are actually handled and thus the certificate -won't be rejected due to an unknown critical extension. Use this +will not be rejected due to an unknown critical extension. Use this option with care because extensions are usually flagged as critical for a reason. @@ -505,7 +505,7 @@ Assume the input data is binary encoded. PKCS#12 files. This option may be used to force the passphrase to be encoded in the specified encoding @var{name}. This is useful if the application used to import the key uses a different encoding and thus -won't be able to import a file generated by @command{gpgsm}. Commonly +will not be able to import a file generated by @command{gpgsm}. Commonly used values for @var{name} are @code{Latin1} and @code{CP850}. Note that @command{gpgsm} itself automagically imports any file with a passphrase encoded to the most commonly used encodings. @@ -603,7 +603,7 @@ interoperability problems. @c ******** ESOTERIC OPTIONS *************** @c ******************************************* @node Esoteric Options - at subsection Doing things one usually don't want to do. + at subsection Doing things one usually do not want to do. @table @gnupgtabopt @@ -952,7 +952,7 @@ of af a transfer error, a program error or tampering with the message). @end table @item Error verifying a signature -For some reason the signature could not be verified, i.e. it can't be +For some reason the signature could not be verified, i.e. it cannot be decided whether the signature is valid or invalid. A common reason for this is a missing certificate. @@ -1156,7 +1156,7 @@ Set the recipient for the encryption. @var{userID} should be the internal representation of the key; the server may accept any other way of specification. If this is a valid and trusted recipient the server does respond with OK, otherwise the return is an ERR with the reason why -the recipient can't be used, the encryption will then not be done for +the recipient cannot be used, the encryption will then not be done for this recipient. If the policy is not to encrypt at all if not all recipients are valid, the client has to take care of this. All @code{RECIPIENT} commands are cumulative until a @code{RESET} or an @@ -1204,7 +1204,8 @@ It takes the plaintext from the @code{INPUT} command, writes to the ciphertext to the file descriptor set with the @code{OUTPUT} command, take the recipients from all the recipients set so far. If this command fails the clients should try to delete all output currently done or -otherwise mark it as invalid. @command{GPGSM} does ensure that there won't be any +otherwise mark it as invalid. @command{GPGSM} does ensure that there +will not be any security problem with leftover data on the output in this case. This command should in general not fail, as all necessary checks have @@ -1272,7 +1273,7 @@ to the signer's key. @var{userID} should be the internal representation of the key; the server may accept any other way of specification. If this is a valid and trusted recipient the server does respond with OK, otherwise the return is an ERR with the reason why -the key can't be used, the signature will then not be created using +the key cannot be used, the signature will then not be created using this key. If the policy is not to sign at all if not all keys are valid, the client has to take care of this. All @code{SIGNER} commands are cumulative until a @code{RESET} is done. ----------------------------------------------------------------------- Summary of changes: common/ChangeLog | 5 +++++ common/dotlock.c | 36 ++++++++++++++++++++++++++++++++++++ common/dotlock.h | 36 ++++++++++++++++++++++++++++++++++++ doc/gpgsm.texi | 31 ++++++++++++++++--------------- 4 files changed, 93 insertions(+), 15 deletions(-) hooks/post-receive -- The GNU Privacy Guard http://git.gnupg.org From cvs at cvs.gnupg.org Tue Oct 25 18:26:34 2011 From: cvs at cvs.gnupg.org (by Marcus Brinkmann) Date: Tue, 25 Oct 2011 18:26:34 +0200 Subject: [git] GnuPG - branch, npth, updated. post-nuke-of-trailing-ws-120-geec0b39 Message-ID: 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 eec0b39a477b3d0da243b53492123d1e82340167 (commit) via 7dfcc9f19acfe8f0dc70db8d981b79aac0589cf4 (commit) via d4fa82e688c1844777896f02cb3c8dea8a5d4f9a (commit) from 0e5d57cc6d839b90d642308085e4800a67f89250 (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 eec0b39a477b3d0da243b53492123d1e82340167 Merge: 0e5d57c 7dfcc9f Author: Marcus Brinkmann Date: Tue Oct 25 17:37:53 2011 +0200 Merge branch 'master' into npth Conflicts: common/ChangeLog diff --cc common/ChangeLog index d1090e0,54435f4..840dc03 --- a/common/ChangeLog +++ b/common/ChangeLog @@@ -1,8 -1,8 +1,13 @@@ + 2011-10-24 Werner Koch + + * dotlock.h, dotlock.c: Add alternative to allow distribution of + these files under a modified BSD license + +2011-10-13 Marcus Brinkmann + + * 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 Change the license of all JNLIB parts from LPGLv3+ to to LGPLv3+ ----------------------------------------------------------------------- Summary of changes: common/ChangeLog | 5 +++++ common/dotlock.c | 36 ++++++++++++++++++++++++++++++++++++ common/dotlock.h | 36 ++++++++++++++++++++++++++++++++++++ doc/gpgsm.texi | 31 ++++++++++++++++--------------- 4 files changed, 93 insertions(+), 15 deletions(-) hooks/post-receive -- The GNU Privacy Guard http://git.gnupg.org From cvs at cvs.gnupg.org Tue Oct 25 19:47:25 2011 From: cvs at cvs.gnupg.org (by Marcus Brinkmann) Date: Tue, 25 Oct 2011 19:47:25 +0200 Subject: [git] GPGME - branch, master, updated. gpgme-1.3.1-2-g3ddf4c3 Message-ID: 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 3ddf4c3d4000a9b0b52180c3aa3acf1387a193bf (commit) from 86a439d1d15d42ed7a2e796902b91e8386f9e1d0 (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 3ddf4c3d4000a9b0b52180c3aa3acf1387a193bf Author: Marcus Brinkmann Date: Tue Oct 25 18:59:26 2011 +0200 Remove support for libgpgme-pth. diff --git a/ChangeLog b/ChangeLog index d0ea8a2..e8cb265 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-25 Marcus Brinkmann + + * m4/pth.m4: Removed. + * configure.ac: Remove check for pth and automake conditional + HAVE_PTH. + 2011-06-16 Marcus Brinkmann Release 1.3.1 diff --git a/NEWS b/NEWS index ee8f2cd..3dad99b 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,8 @@ Noteworthy changes in version 1.3.2 (unreleased) ------------------------------------------------ - * ... + * Remove support for libgpgme-pth. As far as we know, this was never used, + and GnuPG is going to use our own npth in the future. Noteworthy changes in version 1.3.1 (2011-06-16) diff --git a/configure.ac b/configure.ac index ca88b84..55e877f 100644 --- a/configure.ac +++ b/configure.ac @@ -171,10 +171,6 @@ case "${host}" in build_w32_qt=$enableval) ;; *) - AC_CHECK_PTH(1.2.0,,,no,have_pth=yes) - if test "$have_pth" = yes; then - AC_DEFINE(HAVE_PTH, ,[Define if we have Pth.]) - fi AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes) if test "$have_pthread" = yes; then AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.]) @@ -218,7 +214,6 @@ AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes) AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes) AM_CONDITIONAL(BUILD_W32_QT, test "$build_w32_qt" = yes) -AM_CONDITIONAL(HAVE_PTH, test "$have_pth" = "yes") AM_CONDITIONAL(HAVE_PTHREAD, test "$have_pthread" = "yes") @@ -983,5 +978,4 @@ echo " FD Passing: $use_descriptor_passing GPGME Pthread: $have_pthread - GPGME Pth: $have_pth " diff --git a/m4/pth.m4 b/m4/pth.m4 deleted file mode 100644 index b558f28..0000000 --- a/m4/pth.m4 +++ /dev/null @@ -1,402 +0,0 @@ -dnl ## -dnl ## GNU Pth - The GNU Portable Threads -dnl ## Copyright (c) 1999-2002 Ralf S. Engelschall -dnl ## -dnl ## This file is part of GNU Pth, a non-preemptive thread scheduling -dnl ## library which can be found at http://www.gnu.org/software/pth/. -dnl ## -dnl ## This library is free software; you can redistribute it and/or -dnl ## modify it under the terms of the GNU Lesser General Public -dnl ## License as published by the Free Software Foundation; either -dnl ## version 2.1 of the License, or (at your option) any later version. -dnl ## -dnl ## This library is distributed in the hope that it will be useful, -dnl ## but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl ## Lesser General Public License for more details. -dnl ## -dnl ## You should have received a copy of the GNU Lesser General Public -dnl ## License along with this library; if not, write to the Free Software -dnl ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -dnl ## USA, or contact Ralf S. Engelschall . -dnl ## -dnl ## pth.m4: Autoconf macro for locating GNU Pth from within -dnl ## configure.in of third-party software packages -dnl ## - -dnl ## -dnl ## Synopsis: -dnl ## AC_CHECK_PTH([MIN-VERSION [, # minimum Pth version, e.g. 1.2.0 -dnl ## DEFAULT-WITH-PTH [, # default value for --with-pth option -dnl ## DEFAULT-WITH-PTH-TEST [,# default value for --with-pth-test option -dnl ## EXTEND-VARS [, # whether CFLAGS/LDFLAGS/etc are extended -dnl ## ACTION-IF-FOUND [, # action to perform if Pth was found -dnl ## ACTION-IF-NOT-FOUND # action to perform if Pth was not found -dnl ## ]]]]]]) -dnl ## Examples: -dnl ## AC_CHECK_PTH(1.2.0) -dnl ## AC_CHECK_PTH(1.2.0,,,no,CFLAGS="$CFLAGS -DHAVE_PTH $PTH_CFLAGS") -dnl ## AC_CHECK_PTH(1.2.0,yes,yes,yes,CFLAGS="$CFLAGS -DHAVE_PTH") -dnl ## -dnl -dnl # auxilliary macros -AC_DEFUN([_AC_PTH_ERROR], [dnl -AC_MSG_RESULT([*FAILED*]) -dnl define(_ac_pth_line,dnl -dnl "+------------------------------------------------------------------------+") -dnl echo " _ac_pth_line" 1>&2 -cat <>/ /' 1>&2 -$1 -EOT -dnl echo " _ac_pth_line" 1>&2 -dnl undefine(_ac_pth_line) -exit 1 -]) -AC_DEFUN([_AC_PTH_VERBOSE], [dnl -if test ".$verbose" = .yes; then - AC_MSG_RESULT([ $1]) -fi -]) -dnl # the user macro -AC_DEFUN([AC_CHECK_PTH], [dnl -dnl -dnl # prerequisites -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -dnl -PTH_CPPFLAGS='' -PTH_CFLAGS='' -PTH_LDFLAGS='' -PTH_LIBS='' -AC_SUBST(PTH_CPPFLAGS) -AC_SUBST(PTH_CFLAGS) -AC_SUBST(PTH_LDFLAGS) -AC_SUBST(PTH_LIBS) -dnl # command line options -AC_MSG_CHECKING(for GNU Pth) -_AC_PTH_VERBOSE([]) -AC_ARG_WITH(pth,dnl -[ --with-pth[=ARG] Build with GNU Pth Library (default=]ifelse([$2],,yes,$2)[)],dnl -,dnl -with_pth="ifelse([$2],,yes,$2)" -)dnl -AC_ARG_WITH(pth-test,dnl -[ --with-pth-test Perform GNU Pth Sanity Test (default=]ifelse([$3],,yes,$3)[)],dnl -,dnl -with_pth_test="ifelse([$3],,yes,$3)" -)dnl -_AC_PTH_VERBOSE([+ Command Line Options:]) -_AC_PTH_VERBOSE([ o --with-pth=$with_pth]) -_AC_PTH_VERBOSE([ o --with-pth-test=$with_pth_test]) -dnl -dnl # configuration -if test ".$with_pth" != .no; then - _pth_subdir=no - _pth_subdir_opts='' - case "$with_pth" in - subdir:* ) - _pth_subdir=yes - changequote(, )dnl - _pth_subdir_opts=`echo $with_pth | sed -e 's/^subdir:[^ ]*[ ]*//'` - with_pth=`echo $with_pth | sed -e 's/^subdir:\([^ ]*\).*$/\1/'` - changequote([, ])dnl - ;; - esac - _pth_version="" - _pth_location="" - _pth_type="" - _pth_cppflags="" - _pth_cflags="" - _pth_ldflags="" - _pth_libs="" - if test ".$with_pth" = .yes; then - # via config script in $PATH - changequote(, )dnl - _pth_version=`(pth-config --version) 2>/dev/null |\ - sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` - changequote([, ])dnl - if test ".$_pth_version" != .; then - _pth_location=`pth-config --prefix` - _pth_type='installed' - _pth_cppflags=`pth-config --cflags` - _pth_cflags=`pth-config --cflags` - _pth_ldflags=`pth-config --ldflags` - _pth_libs=`pth-config --libs --all` - fi - elif test -d "$with_pth"; then - with_pth=`echo $with_pth | sed -e 's;/*$;;'` - _pth_found=no - # via locally included source tree - if test ".$_pth_subdir" = .yes; then - _pth_location="$with_pth" - _pth_type='local' - _pth_cppflags="-I$with_pth" - _pth_cflags="-I$with_pth" - if test -f "$with_pth/ltconfig"; then - _pth_ldflags="-L$with_pth/.libs" - else - _pth_ldflags="-L$with_pth" - fi - _pth_libs="-lpth" - changequote(, )dnl - _pth_version=`grep '^const char PTH_Hello' $with_pth/pth_vers.c |\ - sed -e 's;^.*Version[ ]*\([0-9]*\.[0-9]*[.ab][0-9]*\)[ ].*$;\1;'` - changequote([, ])dnl - _pth_found=yes - ac_configure_args="$ac_configure_args --enable-subdir $_pth_subdir_opts" - with_pth_test=no - fi - # via config script under a specified directory - # (a standard installation, but not a source tree) - if test ".$_pth_found" = .no; then - for _dir in $with_pth/bin $with_pth; do - if test -f "$_dir/pth-config"; then - test -f "$_dir/pth-config.in" && continue # pth-config in source tree! - changequote(, )dnl - _pth_version=`($_dir/pth-config --version) 2>/dev/null |\ - sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` - changequote([, ])dnl - if test ".$_pth_version" != .; then - _pth_location=`$_dir/pth-config --prefix` - _pth_type="installed" - _pth_cppflags=`$_dir/pth-config --cflags` - _pth_cflags=`$_dir/pth-config --cflags` - _pth_ldflags=`$_dir/pth-config --ldflags` - _pth_libs=`$_dir/pth-config --libs --all` - _pth_found=yes - break - fi - fi - done - fi - # in any subarea under a specified directory - # (either a special installation or a Pth source tree) - if test ".$_pth_found" = .no; then - changequote(, )dnl - _pth_found=0 - for _file in x `find $with_pth -name "pth.h" -type f -print`; do - test .$_file = .x && continue - _dir=`echo $_file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` - _pth_version=`($_dir/pth-config --version) 2>/dev/null |\ - sed -e 's/^.*\([0-9]\.[0-9]*[ab.][0-9]*\).*$/\1/'` - if test ".$_pth_version" = .; then - _pth_version=`grep '^#define PTH_VERSION_STR' $_file |\ - sed -e 's;^#define[ ]*PTH_VERSION_STR[ ]*"\([0-9]*\.[0-9]*[.ab][0-9]*\)[ ].*$;\1;'` - fi - _pth_cppflags="-I$_dir" - _pth_cflags="-I$_dir" - _pth_found=`expr $_pth_found + 1` - done - for _file in x `find $with_pth -name "libpth.[aso]" -type f -print`; do - test .$_file = .x && continue - _dir=`echo $_file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'` - _pth_ldflags="-L$_dir" - _pth_libs="-lpth" - _pth_found=`expr $_pth_found + 1` - done - changequote([, ])dnl - if test ".$_pth_found" = .2; then - _pth_location="$with_pth" - _pth_type="uninstalled" - else - _pth_version='' - fi - fi - fi - _AC_PTH_VERBOSE([+ Determined Location:]) - _AC_PTH_VERBOSE([ o path: $_pth_location]) - _AC_PTH_VERBOSE([ o type: $_pth_type]) - if test ".$_pth_version" = .; then - with_pth=no - else -dnl if test ".$with_pth" != .yes; then -dnl _AC_PTH_ERROR([dnl -dnl Unable to locate GNU Pth under $with_pth. -dnl Please specify the correct path to either a GNU Pth installation tree -dnl (use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in -dnl the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a -dnl path to a pth-X.Y.Z/ directory; but make sure the package is already -dnl built, i.e., the "configure; make" step was already performed there).]) -dnl else -dnl _AC_PTH_ERROR([dnl -dnl Unable to locate GNU Pth in any system-wide location (see \$PATH). -dnl Please specify the correct path to either a GNU Pth installation tree -dnl (use --with-pth=DIR if you used --prefix=DIR for installing GNU Pth in -dnl the past) or to a GNU Pth source tree (use --with-pth=DIR if DIR is a -dnl path to a pth-X.Y.Z/ directory; but make sure the package is already -dnl built, i.e., the "configure; make" step was already performed there).]) -dnl fi -dnl fi - dnl # - dnl # Check whether the found version is sufficiently new - dnl # - _req_version="ifelse([$1],,1.0.0,$1)" - for _var in _pth_version _req_version; do - eval "_val=\"\$${_var}\"" - _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'` - _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'` - _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'` - _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'` - case $_rtype in - "a" ) _rtype=0 ;; - "b" ) _rtype=1 ;; - "." ) _rtype=2 ;; - esac - _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ - "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` - eval "${_var}_hex=\"\$_hex\"" - done - _AC_PTH_VERBOSE([+ Determined Versions:]) - _AC_PTH_VERBOSE([ o existing: $_pth_version -> 0x$_pth_version_hex]) - _AC_PTH_VERBOSE([ o required: $_req_version -> 0x$_req_version_hex]) - _ok=0 - if test ".$_pth_version_hex" != .; then - if test ".$_req_version_hex" != .; then - if test $_pth_version_hex -ge $_req_version_hex; then - _ok=1 - fi - fi - fi - if test ".$_ok" = .0; then - _AC_PTH_ERROR([dnl - Found Pth version $_pth_version, but required at least version $_req_version. - Upgrade Pth under $_pth_location to $_req_version or higher first, please.]) - fi - dnl # - dnl # Perform Pth Sanity Compile Check - dnl # - if test ".$with_pth_test" = .yes; then - _ac_save_CPPFLAGS="$CPPFLAGS" - _ac_save_CFLAGS="$CFLAGS" - _ac_save_LDFLAGS="$LDFLAGS" - _ac_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $_pth_cppflags" - CFLAGS="$CFLAGS $_pth_cflags" - LDFLAGS="$LDFLAGS $_pth_ldflags" - LIBS="$LIBS $_pth_libs" - _AC_PTH_VERBOSE([+ Test Build Environment:]) - _AC_PTH_VERBOSE([ o CPPFLAGS=\"$CPPFLAGS\"]) - _AC_PTH_VERBOSE([ o CFLAGS=\"$CFLAGS\"]) - _AC_PTH_VERBOSE([ o LDFLAGS=\"$LDFLAGS\"]) - _AC_PTH_VERBOSE([ o LIBS=\"$LIBS\"]) - cross_compile=no - define(_code1, [dnl - #include - #include - ]) - define(_code2, [dnl - FILE *fp; - if (!(fp = fopen("conftestval", "w"))) - exit(1); - fprintf(fp, "hmm"); - fclose(fp); - pth_init(); - pth_kill(); - if (!(fp = fopen("conftestval", "w"))) - exit(1); - fprintf(fp, "yes"); - fclose(fp); - exit(0); - ]) - _AC_PTH_VERBOSE([+ Performing Sanity Checks:]) - _AC_PTH_VERBOSE([ o pre-processor test]) - AC_TRY_CPP(_code1, _ok=yes, _ok=no) - if test ".$_ok" != .yes; then - _AC_PTH_ERROR([dnl - Found GNU Pth $_pth_version under $_pth_location, but - was unable to perform a sanity pre-processor check. This means - the GNU Pth header pth.h was not found. - We used the following build environment: - >> CPP="$CPP" - >> CPPFLAGS="$CPPFLAGS" - See config.log for possibly more details.]) - fi - _AC_PTH_VERBOSE([ o link check]) - AC_TRY_LINK(_code1, _code2, _ok=yes, _ok=no) - if test ".$_ok" != .yes; then - _AC_PTH_ERROR([dnl - Found GNU Pth $_pth_version under $_pth_location, but - was unable to perform a sanity linker check. This means - the GNU Pth library libpth.a was not found. - We used the following build environment: - >> CC="$CC" - >> CFLAGS="$CFLAGS" - >> LDFLAGS="$LDFLAGS" - >> LIBS="$LIBS" - See config.log for possibly more details.]) - fi - _AC_PTH_VERBOSE([ o run-time check]) - AC_TRY_RUN(AC_LANG_PROGRAM(_code1, _code2), _ok=`cat conftestval`, _ok=no, _ok=no) - if test ".$_ok" != .yes; then - if test ".$_ok" = .no; then - _AC_PTH_ERROR([dnl - Found GNU Pth $_pth_version under $_pth_location, but - was unable to perform a sanity execution check. This usually - means that the GNU Pth shared library libpth.so is present - but \$LD_LIBRARY_PATH is incomplete to execute a Pth test. - In this case either disable this test via --without-pth-test, - or extend \$LD_LIBRARY_PATH, or build GNU Pth as a static - library only via its --disable-shared Autoconf option. - We used the following build environment: - >> CC="$CC" - >> CFLAGS="$CFLAGS" - >> LDFLAGS="$LDFLAGS" - >> LIBS="$LIBS" - See config.log for possibly more details.]) - else - _AC_PTH_ERROR([dnl - Found GNU Pth $_pth_version under $_pth_location, but - was unable to perform a sanity run-time check. This usually - means that the GNU Pth library failed to work and possibly - caused a core dump in the test program. In this case it - is strongly recommended that you re-install GNU Pth and this - time make sure that it really passes its "make test" procedure. - We used the following build environment: - >> CC="$CC" - >> CFLAGS="$CFLAGS" - >> LDFLAGS="$LDFLAGS" - >> LIBS="$LIBS" - See config.log for possibly more details.]) - fi - fi - _extendvars="ifelse([$4],,yes,$4)" - if test ".$_extendvars" != .yes; then - CPPFLAGS="$_ac_save_CPPFLAGS" - CFLAGS="$_ac_save_CFLAGS" - LDFLAGS="$_ac_save_LDFLAGS" - LIBS="$_ac_save_LIBS" - fi - else - _extendvars="ifelse([$4],,yes,$4)" - if test ".$_extendvars" = .yes; then - if test ".$_pth_subdir" = .yes; then - CPPFLAGS="$CPPFLAGS $_pth_cppflags" - CFLAGS="$CFLAGS $_pth_cflags" - LDFLAGS="$LDFLAGS $_pth_ldflags" - LIBS="$LIBS $_pth_libs" - fi - fi - fi - PTH_CPPFLAGS="$_pth_cppflags" - PTH_CFLAGS="$_pth_cflags" - PTH_LDFLAGS="$_pth_ldflags" - PTH_LIBS="$_pth_libs" - AC_SUBST(PTH_CPPFLAGS) - AC_SUBST(PTH_CFLAGS) - AC_SUBST(PTH_LDFLAGS) - AC_SUBST(PTH_LIBS) - _AC_PTH_VERBOSE([+ Final Results:]) - _AC_PTH_VERBOSE([ o PTH_CPPFLAGS=\"$PTH_CPPFLAGS\"]) - _AC_PTH_VERBOSE([ o PTH_CFLAGS=\"$PTH_CFLAGS\"]) - _AC_PTH_VERBOSE([ o PTH_LDFLAGS=\"$PTH_LDFLAGS\"]) - _AC_PTH_VERBOSE([ o PTH_LIBS=\"$PTH_LIBS\"]) -fi -fi -if test ".$with_pth" != .no; then - AC_MSG_RESULT([version $_pth_version, $_pth_type under $_pth_location]) - ifelse([$5], , :, [$5]) -else - AC_MSG_RESULT([no]) - ifelse([$6], , :, [$6]) -fi -]) diff --git a/src/ChangeLog b/src/ChangeLog index 3cbc41d..e53b226 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Marcus Brinkmann + + * Makefile.am: Remove build rules for libgpgme-pth. + * gpgme.m4: Remove support for libgpgme-pth. + 2011-05-26 Marcus Brinkmann * decrypt.c (gpgme_op_decrypt_start, gpgme_op_decrypt): Check CTX. diff --git a/src/Makefile.am b/src/Makefile.am index 18c8b3b..d4f4ba7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,11 +33,6 @@ ltlib_gpgme_pthread = libgpgme-pthread.la else ltlib_gpgme_pthread = endif -if HAVE_PTH -ltlib_gpgme_pth = libgpgme-pth.la -else -ltlib_gpgme_pth = -endif if BUILD_W32_GLIB ltlib_gpgme_glib = libgpgme-glib.la @@ -52,7 +47,7 @@ ltlib_gpgme_qt = endif lib_LTLIBRARIES = libgpgme.la $(ltlib_gpgme_glib) $(ltlib_gpgme_qt) \ - $(ltlib_gpgme_pthread) $(ltlib_gpgme_pth) + $(ltlib_gpgme_pthread) if HAVE_LD_VERSION_SCRIPT libgpgme_version_script_cmd = -Wl,--version-script=$(srcdir)/libgpgme.vers @@ -132,8 +127,6 @@ libgpgme_la_SOURCES = $(main_sources) \ ath.h ath.c $(system_components_not_extra) libgpgme_pthread_la_SOURCES = $(main_sources) \ ath.h ath-pthread.c $(system_components_not_extra) -libgpgme_pth_la_SOURCES = $(main_sources) \ - ath.h ath-pth.c $(system_components_not_extra) if BUILD_W32_GLIB libgpgme_glib_la_SOURCES = $(main_sources) ath.h ath.c w32-glib-io.c @@ -154,9 +147,8 @@ endif # We use a global CFLAGS and CPPFLAGS setting for all library # versions, because then every object file is only compiled once. -AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @PTH_CPPFLAGS@ \ - @QT4_CORE_CFLAGS@ -AM_CFLAGS = @LIBASSUAN_CFLAGS@ @PTH_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@ +AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @QT4_CORE_CFLAGS@ +AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@ if HAVE_W32_SYSTEM # Windows provides us with an endless stream of Tough Love. To spawn @@ -213,13 +205,6 @@ libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ -lpthread @GPG_ERROR_LIBS@ -libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \ - $(libgpgme_version_script_cmd) -version-info \ - @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ -libgpgme_pth_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers -libgpgme_pth_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ - @PTH_LIBS@ @GPG_ERROR_LIBS@ - if BUILD_W32_GLIB libgpgme_glib_la_LDFLAGS = $(no_undefined) \ $(export_symbols) $(libgpgme_version_script_cmd) -version-info \ diff --git a/src/ath-pth.c b/src/ath-pth.c deleted file mode 100644 index 3c7bd54..0000000 --- a/src/ath-pth.c +++ /dev/null @@ -1,186 +0,0 @@ -/* ath-pth.c - Pth module for self-adapting thread-safeness library - Copyright (C) 2002, 2003, 2004 g10 Code GmbH - - This file is part of GPGME. - - GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - GPGME is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ - - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#include - -#include "ath.h" - - -/* The lock we take while checking for lazy lock initialization. */ -static pth_mutex_t check_init_lock = PTH_MUTEX_INIT; - - -uintptr_t -ath_self (void) -{ - return (uintptr_t) pth_self (); -} - - -/* Initialize the mutex *PRIV. If JUST_CHECK is true, only do this if - it is not already initialized. */ -static int -mutex_pth_init (ath_mutex_t *priv, int just_check) -{ - int err = 0; - - if (just_check) - pth_mutex_acquire (&check_init_lock, 0, NULL); - if (!*priv || !just_check) - { - pth_mutex_t *lock = malloc (sizeof (pth_mutex_t)); - if (!lock) - err = ENOMEM; - if (!err) - { - err = pth_mutex_init (lock); - if (err == FALSE) - err = errno; - else - err = 0; - - if (err) - free (lock); - else - *priv = (ath_mutex_t) lock; - } - } - if (just_check) - pth_mutex_release (&check_init_lock); - return err; -} - - -void -ath_init (void) -{ - /* Nothing to do. */ -} - - -int -ath_mutex_init (ath_mutex_t *lock) -{ - return mutex_pth_init (lock, 0); -} - - -int -ath_mutex_destroy (ath_mutex_t *lock) -{ - int err = mutex_pth_init (lock, 1); - if (!err) - { - /* GNU Pth has no destructor function. */ - free (*lock); - } - return err; -} - - -int -ath_mutex_lock (ath_mutex_t *lock) -{ - int ret = mutex_pth_init (lock, 1); - if (ret) - return ret; - - ret = pth_mutex_acquire ((pth_mutex_t *) *lock, 0, NULL); - return ret == FALSE ? errno : 0; -} - - -int -ath_mutex_unlock (ath_mutex_t *lock) -{ - int ret = mutex_pth_init (lock, 1); - if (ret) - return ret; - - ret = pth_mutex_release ((pth_mutex_t *) *lock); - return ret == FALSE ? errno : 0; -} - - -ssize_t -ath_read (int fd, void *buf, size_t nbytes) -{ - return pth_read (fd, buf, nbytes); -} - - -ssize_t -ath_write (int fd, const void *buf, size_t nbytes) -{ - return pth_write (fd, buf, nbytes); -} - - -ssize_t -ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, - struct timeval *timeout) -{ - return pth_select (nfd, rset, wset, eset, timeout); -} - - -ssize_t -ath_waitpid (pid_t pid, int *status, int options) -{ - return pth_waitpid (pid, status, options); -} - - -int -ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr) -{ - return pth_accept (s, addr, length_ptr); -} - - -int -ath_connect (int s, const struct sockaddr *addr, socklen_t length) -{ - return pth_connect (s, addr, length); -} - -int -ath_sendmsg (int s, const struct msghdr *msg, int flags) -{ - /* FIXME: GNU Pth is missing pth_sendmsg. */ - return sendmsg (s, msg, flags); -} - - -int -ath_recvmsg (int s, struct msghdr *msg, int flags) -{ - /* FIXME: GNU Pth is missing pth_recvmsg. */ - return recvmsg (s, msg, flags); -} - diff --git a/src/gpgme.m4 b/src/gpgme.m4 index 44bf43c..fe17f21 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 @@ -98,75 +98,6 @@ AC_DEFUN([AM_PATH_GPGME], AC_SUBST(GPGME_LIBS) ]) -dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS. -dnl -AC_DEFUN([AM_PATH_GPGME_PTH], -[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl - tmp=ifelse([$1], ,1:0.4.2,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_gpgme_api=0 - min_gpgme_version="$tmp" - fi - - AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version) - ok=no - if test "$GPGME_CONFIG" != "no" ; then - if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then - req_major=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - if test "$gpgme_version_major" -gt "$req_major"; then - ok=yes - else - if test "$gpgme_version_major" -eq "$req_major"; then - if test "$gpgme_version_minor" -gt "$req_minor"; then - ok=yes - else - if test "$gpgme_version_minor" -eq "$req_minor"; then - if test "$gpgme_version_micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - # If we have a recent GPGME, we should also check that the - # API is compatible. - if test "$req_gpgme_api" -gt 0 ; then - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - if test "$req_gpgme_api" -ne "$tmp" ; then - ok=no - fi - fi - fi - fi - if test $ok = yes; then - GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags` - GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs` - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - GPGME_PTH_CFLAGS="" - GPGME_PTH_LIBS="" - AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GPGME_PTH_CFLAGS) - AC_SUBST(GPGME_PTH_LIBS) -]) - dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 + NEWS | 3 +- configure.ac | 6 - m4/pth.m4 | 402 ------------------------------------------------------- src/ChangeLog | 5 + src/Makefile.am | 21 +--- src/ath-pth.c | 186 ------------------------- src/gpgme.m4 | 69 ---------- 8 files changed, 16 insertions(+), 682 deletions(-) delete mode 100644 m4/pth.m4 delete mode 100644 src/ath-pth.c hooks/post-receive -- GnuPG Made Easy http://git.gnupg.org