[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-89-g816bee1
by Werner Koch
cvs at cvs.gnupg.org
Wed Aug 10 14:52:05 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, master has been updated
via 816bee1fa0d833ac72ea4e7d52465e6e1da2645d (commit)
via 14442d2be06750665125aab81671174a98e4e614 (commit)
via 7316b53426eeb4dfe6a62fdff5cfeaf1a2674f52 (commit)
via 28eac436bbe894c0464a3b3d3ad20ed841d0ca9d (commit)
via 81389383a3169fe5130162dbb4cbc4bb0e806c3a (commit)
from 14e0b60efd9d9ef40cdae7e3b5ad2b41e62c1186 (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 816bee1fa0d833ac72ea4e7d52465e6e1da2645d
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 10 14:11:30 2011 +0200
Fixed set but unused variable bugs
diff --git a/agent/ChangeLog b/agent/ChangeLog
index b4a333a..ec2dca2 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * genkey.c (check_passphrase_pattern): Use gpg_strerror instead of
+ strerror.
+ * command-ssh.c (ssh_receive_mpint_list): Remove unused var
+ ELEMS_PUBLIC_N.
+ * gpg-agent.c (main): Remove unused var MAY_COREDUMP.
+
2011-08-09 Ben Kibbey <bjk at luxsci.net>
* command.c (option_handler): Have option s2k-count match the
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index ae193ec..7b4d479 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -933,7 +933,6 @@ static gpg_error_t
ssh_receive_mpint_list (estream_t stream, int secret,
ssh_key_type_spec_t key_spec, gcry_mpi_t **mpi_list)
{
- unsigned int elems_public_n;
const char *elems_public;
unsigned int elems_n;
const char *elems;
@@ -952,7 +951,6 @@ ssh_receive_mpint_list (estream_t stream, int secret,
elems_n = strlen (elems);
elems_public = key_spec.elems_key_public;
- elems_public_n = strlen (elems_public);
mpis = xtrycalloc (elems_n + 1, sizeof *mpis );
if (!mpis)
diff --git a/agent/genkey.c b/agent/genkey.c
index e01a7bc..09f1c72 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -106,7 +106,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
if (!infp)
{
err = gpg_error_from_syserror ();
- log_error (_("error creating temporary file: %s\n"), strerror (errno));
+ log_error (_("error creating temporary file: %s\n"), gpg_strerror (err));
return 1; /* Error - assume password should not be used. */
}
@@ -114,7 +114,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
{
err = gpg_error_from_syserror ();
log_error (_("error writing to temporary file: %s\n"),
- strerror (errno));
+ gpg_strerror (err));
fclose (infp);
return 1; /* Error - assume password should not be used. */
}
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index a548664..0616875 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -568,7 +568,6 @@ main (int argc, char **argv )
{
ARGPARSE_ARGS pargs;
int orig_argc;
- int may_coredump;
char **orig_argv;
FILE *configfp = NULL;
char *configname = NULL;
@@ -642,7 +641,7 @@ main (int argc, char **argv )
setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
- may_coredump = disable_core_dumps ();
+ disable_core_dumps ();
/* Set default options. */
parse_rereadable_options (NULL, 0); /* Reset them to default values. */
diff --git a/common/ChangeLog b/common/ChangeLog
index c56bc4d..95aef65 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * t-exechelp.c (test_close_all_fds): Don't use the DUMMY_FD var.
+
+ * pka.c (get_pka_info): Remove unused var.
+
+ * signal.c (got_fatal_signal): Remove unused var.
+
+ * estream.c (es_fread, es_fwrite): Remove unused var.
+
2011-07-20 Werner Koch <wk at g10code.com>
* ssh-utils.c, ssh-utils.h: New.
diff --git a/common/estream.c b/common/estream.c
index 5b55674..8087a62 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -3425,12 +3425,11 @@ es_fread (void *ES__RESTRICT ptr, size_t size, size_t nitems,
estream_t ES__RESTRICT stream)
{
size_t ret, bytes;
- int err;
if (size * nitems)
{
ESTREAM_LOCK (stream);
- err = es_readn (stream, ptr, size * nitems, &bytes);
+ es_readn (stream, ptr, size * nitems, &bytes);
ESTREAM_UNLOCK (stream);
ret = bytes / size;
@@ -3447,12 +3446,11 @@ es_fwrite (const void *ES__RESTRICT ptr, size_t size, size_t nitems,
estream_t ES__RESTRICT stream)
{
size_t ret, bytes;
- int err;
if (size * nitems)
{
ESTREAM_LOCK (stream);
- err = es_writen (stream, ptr, size * nitems, &bytes);
+ es_writen (stream, ptr, size * nitems, &bytes);
ESTREAM_UNLOCK (stream);
ret = bytes / size;
diff --git a/common/pka.c b/common/pka.c
index 7ac70d9..89761f5 100644
--- a/common/pka.c
+++ b/common/pka.c
@@ -175,7 +175,7 @@ get_pka_info (const char *address, unsigned char *fpr)
#else /*!USE_ADNS*/
unsigned char answer[PACKETSZ];
int anslen;
- int qdcount, ancount, nscount, arcount;
+ int qdcount, ancount;
int rc;
unsigned char *p, *pend;
const char *domain;
@@ -212,8 +212,6 @@ get_pka_info (const char *address, unsigned char *fpr)
qdcount = ntohs (header.qdcount);
ancount = ntohs (header.ancount);
- nscount = ntohs (header.nscount);
- arcount = ntohs (header.arcount);
if (!ancount)
return NULL; /* Got no answer. */
diff --git a/common/signal.c b/common/signal.c
index 9f11b99..28b2acc 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -89,8 +89,6 @@ get_signal_name( int signum )
static RETSIGTYPE
got_fatal_signal (int sig)
{
- /* Dummy result variable to suppress gcc warning. */
- int res;
const char *s;
if (caught_fatal_sig)
@@ -100,14 +98,14 @@ got_fatal_signal (int sig)
if (cleanup_fnc)
cleanup_fnc ();
/* Better don't translate these messages. */
- res = write (2, "\n", 1 );
+ (void)write (2, "\n", 1 );
s = log_get_prefix (NULL);
if (s)
- res = write(2, s, strlen (s));
- res = write (2, ": signal ", 9 );
+ (void)write(2, s, strlen (s));
+ (void)write (2, ": signal ", 9 );
s = get_signal_name(sig);
if (s)
- res = write (2, s, strlen(s) );
+ (void) write (2, s, strlen(s) );
else
{
/* We are in a signal handler so we can't use any kind of printf
@@ -117,7 +115,7 @@ got_fatal_signal (int sig)
things are messed up because we modify its value. Although
this is a bug in that system, we will protect against it. */
if (sig < 0 || sig >= 100000)
- res = write (2, "?", 1);
+ (void)write (2, "?", 1);
else
{
int i, value, any=0;
@@ -126,7 +124,7 @@ got_fatal_signal (int sig)
{
if (value >= i || ((any || i==1) && !(value/i)))
{
- res = write (2, "0123456789"+(value/i), 1);
+ (void)write (2, "0123456789"+(value/i), 1);
if ((value/i))
any = 1;
value %= i;
@@ -134,7 +132,7 @@ got_fatal_signal (int sig)
}
}
}
- res = write (2, " caught ... exiting\n", 20);
+ (void)write (2, " caught ... exiting\n", 20);
/* Reset action to default action and raise signal again */
init_one_signal (sig, SIG_DFL, 0);
diff --git a/common/t-exechelp.c b/common/t-exechelp.c
index e4c88d1..19079d3 100644
--- a/common/t-exechelp.c
+++ b/common/t-exechelp.c
@@ -76,7 +76,6 @@ test_close_all_fds (void)
int max_fd = get_max_fds ();
int *array;
int fd;
- int dummy_fd;
int initial_count, count, n;
#if 0
char buffer[100];
@@ -93,10 +92,10 @@ test_close_all_fds (void)
free (array);
/* Some dups to get more file descriptors and close one. */
- dummy_fd = dup (1);
- dummy_fd = dup (1);
+ dup (1);
+ dup (1);
fd = dup (1);
- dummy_fd = dup (1);
+ dup (1);
close (fd);
array = xget_all_open_fds ();
@@ -137,14 +136,14 @@ test_close_all_fds (void)
int except[] = { 20, 23, 24, -1 };
for (n=initial_count; n < 31; n++)
- dummy_fd = dup (1);
+ dup (1);
array = xget_all_open_fds ();
if (verbose)
print_open_fds (array);
free (array);
for (n=0; n < 5; n++)
{
- dummy_fd = dup (1);
+ dup (1);
array = xget_all_open_fds ();
if (verbose)
print_open_fds (array);
diff --git a/common/t-timestuff.c b/common/t-timestuff.c
index c9c8fe5..8e5fa65 100644
--- a/common/t-timestuff.c
+++ b/common/t-timestuff.c
@@ -81,10 +81,9 @@ test_timegm (void)
};
int tidx;
- time_t now, atime, counter;
+ time_t now, atime;
struct tm tbuf, tbuf2, *tp;
- counter = 0;
for (tidx=0; tidx < DIM (tvalues); tidx++)
{
if (tvalues[tidx].year == -1)
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6de122f..8ab0db5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * export.c (transfer_format_to_openpgp): Don't parse unneeded CSUM.
+
+ * import.c (import_secret_one): Use arg OPTIONS instead of global
+ import options var.
+
+ * sig-check.c (do_check): Remove unused var CTX.
+
+ * build-packet.c (do_user_id): Return value.
+
2011-07-29 Werner Koch <wk at g10code.com>
* tdbio.c (open_db): Do not print read-only warning in quiet mode.
diff --git a/g10/build-packet.c b/g10/build-packet.c
index f2ef691..159b783 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -242,19 +242,19 @@ write_fake_data (IOBUF out, gcry_mpi_t a)
static int
do_user_id( IOBUF out, int ctb, PKT_user_id *uid )
{
- int rc;
+ int rc;
- if( uid->attrib_data )
- {
- write_header(out, ctb, uid->attrib_len);
- rc = iobuf_write( out, uid->attrib_data, uid->attrib_len );
- }
- else
- {
- write_header2( out, ctb, uid->len, 2 );
- rc = iobuf_write( out, uid->name, uid->len );
- }
- return 0;
+ if (uid->attrib_data)
+ {
+ write_header(out, ctb, uid->attrib_len);
+ rc = iobuf_write( out, uid->attrib_data, uid->attrib_len );
+ }
+ else
+ {
+ write_header2( out, ctb, uid->len, 2 );
+ rc = iobuf_write( out, uid->name, uid->len );
+ }
+ return rc;
}
diff --git a/g10/export.c b/g10/export.c
index 1b575dd..7deee6b 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -377,7 +377,6 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
u32 s2k_count = 0;
size_t npkey, nskey;
gcry_mpi_t skey[10]; /* We support up to 9 parameters. */
- u16 desired_csum;
int skeyidx = 0;
struct seckey_info *ski;
@@ -509,20 +508,21 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
skey[skeyidx++] = NULL;
gcry_sexp_release (list);
- list = gcry_sexp_find_token (top_list, "csum", 0);
- if (list)
- {
- string = gcry_sexp_nth_string (list, 1);
- if (!string)
- goto bad_seckey;
- desired_csum = strtoul (string, NULL, 10);
- xfree (string);
- }
- else
- desired_csum = 0;
+ /* We have no need for the CSUM valuel thus we don't parse it. */
+ /* list = gcry_sexp_find_token (top_list, "csum", 0); */
+ /* if (list) */
+ /* { */
+ /* string = gcry_sexp_nth_string (list, 1); */
+ /* if (!string) */
+ /* goto bad_seckey; */
+ /* desired_csum = strtoul (string, NULL, 10); */
+ /* xfree (string); */
+ /* } */
+ /* else */
+ /* desired_csum = 0; */
+ /* gcry_sexp_release (list); list = NULL; */
- gcry_sexp_release (list); list = NULL;
gcry_sexp_release (top_list); top_list = NULL;
/* log_debug ("XXX is_v4=%d\n", is_v4); */
diff --git a/g10/import.c b/g10/import.c
index ffbcf16..b48f126 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1596,7 +1596,7 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock,
public key block, and below we will output another one for
the secret keys. FIXME? */
import_one (ctrl, fname, pub_keyblock, stats,
- NULL, NULL, opt.import_options, 1);
+ NULL, NULL, options, 1);
/* Fixme: We should check for an invalid keyblock and
cancel the secret key import in this case. */
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 973fa8d..62b193a 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2683,7 +2683,6 @@ show_key_with_all_names (KBNODE keyblock, int only_marked, int with_revoker,
KBNODE node;
int i;
int do_warn = 0;
- byte pk_version = 0;
PKT_public_key *primary = NULL;
if (opt.with_colons)
@@ -2719,7 +2718,6 @@ show_key_with_all_names (KBNODE keyblock, int only_marked, int with_revoker,
do_warn = 1;
}
- pk_version = pk->version;
primary = pk;
}
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 531497e..134bcfa 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -263,7 +263,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest,
{
gcry_mpi_t result = NULL;
int rc = 0;
- struct cmp_help_context_s ctx;
if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) )
return rc;
@@ -316,8 +315,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest,
result = encode_md_value (pk, digest, sig->digest_algo );
if (!result)
return G10ERR_GENERAL;
- ctx.sig = sig;
- ctx.md = digest;
rc = pk_verify( pk->pubkey_algo, result, sig->data, pk->pkey );
gcry_mpi_release (result);
diff --git a/kbx/keybox-openpgp.c b/kbx/keybox-openpgp.c
index 4306ed1..37e2771 100644
--- a/kbx/keybox-openpgp.c
+++ b/kbx/keybox-openpgp.c
@@ -170,7 +170,6 @@ parse_key (const unsigned char *data, size_t datalen,
const unsigned char *data_start = data;
int i, version, algorithm;
size_t n;
- unsigned long timestamp, expiredate;
int npkey;
unsigned char hashbuffer[768];
const unsigned char *mpi_n = NULL;
@@ -184,21 +183,15 @@ parse_key (const unsigned char *data, size_t datalen,
if (version < 2 || version > 4 )
return gpg_error (GPG_ERR_INV_PACKET); /* Invalid version. */
- timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3]));
+ /*timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3]));*/
data +=4; datalen -=4;
if (version < 4)
{
- unsigned short ndays;
-
if (datalen < 2)
return gpg_error (GPG_ERR_INV_PACKET);
- ndays = ((data[0]<<8)|(data[1]));
data +=2; datalen -= 2;
- expiredate = ndays? (timestamp + ndays * 86400L) : 0;
}
- else
- expiredate = 0; /* This is stored in the self-signature. */
if (!datalen)
return gpg_error (GPG_ERR_INV_PACKET);
diff --git a/scd/apdu.c b/scd/apdu.c
index 176ab91..ac563ad 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1602,7 +1602,7 @@ open_pcsc_reader_wrapped (const char *portstr)
unsigned char msgbuf[9];
int err;
unsigned int dummy_status;
- int sw = SW_HOST_CARD_IO_ERROR;
+
/* Note that we use the constant and not the fucntion because this
code won't be be used under Windows. */
const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";
@@ -1746,7 +1746,6 @@ open_pcsc_reader_wrapped (const char *portstr)
if (err)
{
log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err));
- sw = pcsc_error_to_sw (err);
goto command_failed;
}
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index f2f6d52..ee974ac 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -384,7 +384,7 @@ handle_open (unsigned char *argbuf, size_t arglen)
long err;
const char * portstr;
char *list = NULL;
- unsigned long nreader, listlen, atrlen;
+ unsigned long nreader, atrlen;
char *p;
unsigned long card_state, card_protocol;
unsigned char atr[33];
@@ -431,7 +431,6 @@ handle_open (unsigned char *argbuf, size_t arglen)
return;
}
- listlen = nreader;
p = list;
while (nreader)
{
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 5702395..0999847 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -375,7 +375,6 @@ main (int argc, char **argv )
ARGPARSE_ARGS pargs;
int orig_argc;
gpg_error_t err;
- int may_coredump;
char **orig_argv;
FILE *configfp = NULL;
char *configname = NULL;
@@ -442,7 +441,7 @@ main (int argc, char **argv )
setup_libgcrypt_logging ();
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
- may_coredump = disable_core_dumps ();
+ disable_core_dumps ();
/* Set default options. */
opt.allow_admin = 1;
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 9e6d92f..aee3efc 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * keydb.c (keydb_add_resource): Remove unsued var CREATED_FNAME.
+
+ * gpgsm.c (main): Remove unused var FNAME.
+
2011-07-21 Werner Koch <wk at g10code.com>
* call-dirmngr.c (get_cached_cert, get_cached_cert_data_cb): New.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index c6732fc..f08e0f8 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -862,7 +862,6 @@ main ( int argc, char **argv)
ARGPARSE_ARGS pargs;
int orig_argc;
char **orig_argv;
- const char *fname;
/* char *username;*/
int may_coredump;
strlist_t sl, remusr= NULL, locusr=NULL;
@@ -1635,8 +1634,6 @@ main ( int argc, char **argv)
if (log_get_errorcount(0))
gpgsm_exit(1); /* Must stop for invalid recipients. */
- fname = argc? *argv : NULL;
-
/* Dispatch command. */
switch (cmd)
{
diff --git a/sm/keydb.c b/sm/keydb.c
index d3b911e..fe5d0e7 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -82,7 +82,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
int rc = 0;
FILE *fp;
KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
- const char *created_fname = NULL;
if (auto_created)
*auto_created = 0;
@@ -194,7 +193,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
if (!opt.quiet)
log_info (_("keybox `%s' created\n"), filename);
- created_fname = filename;
if (auto_created)
*auto_created = 1;
}
commit 14442d2be06750665125aab81671174a98e4e614
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 10 13:39:38 2011 +0200
Fix autoconf warnings and update config.* files.
diff --git a/ChangeLog b/ChangeLog
index edd82ed..475aa0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Fix new autoconf warnings.
+
2011-05-20 Werner Koch <wk at g10code.com>
* configure.ac: Require libgpg-error 1.10.
diff --git a/configure.ac b/configure.ac
index c7be7f7..69c2370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,10 +31,10 @@ 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}']))
-AC_INIT([gnupg],
- [my_version[]m4_if(my_issvn,[yes],
- [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
- [http://bugs.gnupg.org])
+m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
+ [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+
+AC_INIT([gnupg],[my_full_version], [http://bugs.gnupg.org])
# Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not
# sufficient.
@@ -940,10 +940,10 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
# it does not support v6.
AC_MSG_CHECKING([whether the resolver is usable])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
[[unsigned char answer[PACKETSZ];
res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
dn_skipname(0,0);
@@ -957,11 +957,11 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
if test x"$have_resolver" != xyes ; then
AC_MSG_CHECKING(
[whether I can make the resolver usable with BIND_8_COMPAT])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#define BIND_8_COMPAT
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define BIND_8_COMPAT
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
[[unsigned char answer[PACKETSZ];
res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
dn_skipname(0,0); dn_expand(0,0,0,0,0);
@@ -1213,8 +1213,8 @@ GNUPG_TIME_T_UNSIGNED
# Ensure that we have UINT64_C before we bother to check for uint64_t
# Fixme: really needed in gnupg? I think it is only useful in libcgrypt.
AC_CACHE_CHECK([for UINT64_C],[gnupg_cv_uint64_c_works],
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <inttypes.h>
- uint64_t foo=UINT64_C(42);]),
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <inttypes.h>]],
+ [[uint64_t foo=UINT64_C(42);]])],
gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no))
if test "$gnupg_cv_uint64_c_works" = "yes" ; then
AC_CHECK_SIZEOF(uint64_t)
@@ -1450,7 +1450,7 @@ if test "$GCC" = yes; then
AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wno-missing-field-initializers"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_wopt=yes,_gcc_wopt=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
AC_MSG_RESULT($_gcc_wopt)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_wopt" = xyes ; then
@@ -1459,7 +1459,7 @@ if test "$GCC" = yes; then
AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wdeclaration-after-statement"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_wopt=yes,_gcc_wopt=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
AC_MSG_RESULT($_gcc_wopt)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_wopt" = xyes ; then
@@ -1472,7 +1472,7 @@ if test "$GCC" = yes; then
AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wno-pointer-sign"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
AC_MSG_RESULT($_gcc_psign)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_psign" = xyes ; then
@@ -1482,7 +1482,7 @@ if test "$GCC" = yes; then
AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
_gcc_cflags_save=$CFLAGS
CFLAGS="-Wpointer-arith"
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
AC_MSG_RESULT($_gcc_psign)
CFLAGS=$_gcc_cflags_save;
if test x"$_gcc_psign" = xyes ; then
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 29af1fb..56c20df 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * readline.m4, libcurl.m4: Fix use of AC_LANG_PROGRAM.
+ * libcurl.m4: s/ifelse/m4_if/.
+
2011-02-25 Werner Koch <wk at g10code.com>
* ksba.m4: Update from git master.
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index a9bfa2e..a0d258d 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -58,7 +58,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
AC_ARG_WITH(libcurl,
AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
- [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
+ [_libcurl_with=$withval],[_libcurl_with=m4_if([$1],,[yes],[$1])])
if test "$_libcurl_with" != "no" ; then
@@ -82,7 +82,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
[libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
- _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
+ _libcurl_wanted=`echo m4_if([$2],,[0],[$2]) | $_libcurl_version_parse`
if test $_libcurl_wanted -gt 0 ; then
AC_CACHE_CHECK([for libcurl >= version $2],
@@ -141,9 +141,9 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
_libcurl_save_libs=$LIBS
LIBS="$LIBCURL $LIBS"
- AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[include <curl/curl.h>]],[[
/* Try and use a few common options to force a failure if we are
- missing symbols or can't link. */
+ missing symbols or cannot link. */
int x;
curl_easy_setopt(NULL,CURLOPT_URL,NULL);
x=CURL_ERROR_SIZE;
@@ -152,7 +152,7 @@ x=CURLOPT_FILE;
x=CURLOPT_ERRORBUFFER;
x=CURLOPT_STDERR;
x=CURLOPT_VERBOSE;
-]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+]])],[libcurl_cv_lib_curl_usable=yes],[libcurl_cv_lib_curl_usable=no])
CPPFLAGS=$_libcurl_save_cppflags
LIBS=$_libcurl_save_libs
@@ -229,10 +229,10 @@ x=CURLOPT_VERBOSE;
if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
# This is the IF-NO path
- ifelse([$4],,:,[$4])
+ m4_if([$4],,:,[$4])
else
# This is the IF-YES path
- ifelse([$3],,:,[$3])
+ m4_if([$3],,:,[$3])
fi
unset _libcurl_with
diff --git a/m4/readline.m4 b/m4/readline.m4
index d252346..783f401 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -30,18 +30,18 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane])
- AC_LINK_IFELSE(AC_LANG_PROGRAM([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include <readline/readline.h>
#include <readline/history.h>
-],[
+]],[[
rl_completion_func_t *completer;
add_history("foobar");
rl_catch_signals=0;
rl_inhibit_completion=0;
rl_attempted_completion_function=NULL;
rl_completion_matches(NULL,NULL);
-]),_found_readline=yes,_found_readline=no)
+]])],[_found_readline=yes],[_found_readline=no])
AC_MSG_RESULT([$_found_readline])
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 9b536bf..c183599 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * config.guess, config.sub: Update to version 2011-06-03.
+
2010-10-26 Werner Koch <wk at g10code.com>
* config.guess: Update to version 2010-09-24.
diff --git a/scripts/config.guess b/scripts/config.guess
index 4c8f032..b02565c 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2010-09-24'
+timestamp='2011-06-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -92,7 +92,7 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' HUP INT TERM
+trap 'exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -481,8 +484,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -595,52 +598,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -770,14 +773,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@@ -867,7 +870,7 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
@@ -892,7 +901,7 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -960,7 +969,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -969,7 +978,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
@@ -978,7 +987,7 @@ EOF
echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -987,11 +996,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1023,7 +1032,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@@ -1051,13 +1060,13 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1092,8 +1101,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
@@ -1136,10 +1145,10 @@ EOF
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
@@ -1165,11 +1174,11 @@ EOF
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1282,13 +1291,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1328,11 +1337,11 @@ main ()
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
diff --git a/scripts/config.sub b/scripts/config.sub
index 320e303..f9fcdc8 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2010-09-11'
+timestamp='2011-06-03'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -158,8 +158,8 @@ case $os in
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ -bluegene*)
+ os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
@@ -175,10 +175,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -286,9 +286,10 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
@@ -296,12 +297,12 @@ case $basic_machine in
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
@@ -325,6 +326,18 @@ case $basic_machine in
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -382,24 +395,26 @@ case $basic_machine in
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -424,7 +439,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -507,7 +522,7 @@ case $basic_machine in
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
@@ -539,7 +554,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -755,7 +770,7 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
@@ -862,10 +877,10 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
- neo-tandem)
+ neo-tandem)
basic_machine=neo-tandem
;;
- nse-tandem)
+ nse-tandem)
basic_machine=nse-tandem
;;
nsr-tandem)
@@ -950,9 +965,10 @@ case $basic_machine in
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -1046,6 +1062,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1102,13 +1121,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1178,6 +1192,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1275,11 +1292,11 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ -auroraux)
+ os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1364,7 +1381,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1413,7 +1430,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1458,8 +1475,8 @@ case $os in
-dicos*)
os=-dicos
;;
- -nacl*)
- ;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1482,10 +1499,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1497,8 +1514,8 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
;;
tic54x-*)
os=-coff
@@ -1534,7 +1551,7 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1561,7 +1578,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
commit 7316b53426eeb4dfe6a62fdff5cfeaf1a2674f52
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 10 13:26:17 2011 +0200
Typo fix
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 73fa2ef..b212153 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -1369,7 +1369,7 @@ used a default value is used.
@ifset gpgtwoone
@item s2k-count
-Instead of using the standard S2K counted (which is computed on the
+Instead of using the standard S2K count (which is computed on the
fly), the given S2K count is used for new keys or when changing the
passphrase of a key. Values below 65536 are considered to be 0. This
option is valid for the entire session or until reset to 0. This
commit 28eac436bbe894c0464a3b3d3ad20ed841d0ca9d
Author: Ben Kibbey <bjk at luxsci.net>
Date: Tue Aug 9 18:56:16 2011 -0400
Update option s2k-count to match the documentation.
The option would previously return an error if its value was < 65536.
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 60ea7ee..b4a333a 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-09 Ben Kibbey <bjk at luxsci.net>
+
+ * command.c (option_handler): Have option s2k-count match the
+ documentation.
+
2011-07-27 Werner Koch <wk at g10code.com>
* call-scd.c (struct inq_needpin_s): Add field ANY_INQ_SEEN.
diff --git a/agent/command.c b/agent/command.c
index 4fbbfb5..6973e78 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2505,10 +2505,10 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
else if (!strcmp (key, "s2k-count"))
{
ctrl->s2k_count = *value? strtoul(value, NULL, 10) : 0;
- if (ctrl->s2k_count && ctrl->s2k_count < 65536) {
+ if (ctrl->s2k_count && ctrl->s2k_count < 65536)
+ {
ctrl->s2k_count = 0;
- err = gpg_error (GPG_ERR_INV_VALUE);
- }
+ }
}
else
err = gpg_error (GPG_ERR_UNKNOWN_OPTION);
commit 81389383a3169fe5130162dbb4cbc4bb0e806c3a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Aug 10 11:47:04 2011 +0200
Made the KILLAGENT and KILLSCD commands working again.
This requires that GnuPG is build with a newer version of Libassuan
(2.0.3).
diff --git a/NEWS b/NEWS
index ed37e3b..08d6bfe 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Noteworthy changes in version 2.1.0beta3
* Support the SSH confirm flag.
+ * The Assuan commands KILLAGENT and KILLSCD are working again.
+
Noteworthy changes in version 2.1.0beta2 (2011-03-08)
-----------------------------------------------------
diff --git a/agent/command.c b/agent/command.c
index b03c786..4fbbfb5 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2259,7 +2259,12 @@ cmd_killagent (assuan_context_t ctx, char *line)
return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket");
ctrl->server_local->stopme = 1;
+#ifdef ASSUAN_FORCE_CLOSE
+ assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
+ return 0;
+#else
return gpg_error (GPG_ERR_EOF);
+#endif
}
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 4f2d2f2..45c9c7c 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-10 Werner Koch <wk at g10code.com>
+
+ * command.c (cmd_killscd): Use the new assuan force close flag
+ if available.
+
2011-08-08 Werner Koch <wk at g10code.com>
* app-openpgp.c (do_decipher): Take care of accidentally passed
diff --git a/scd/command.c b/scd/command.c
index a579b24..9bb5005 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1862,7 +1862,15 @@ cmd_killscd (assuan_context_t ctx, char *line)
(void)line;
ctrl->server_local->stopme = 1;
+#ifdef ASSUAN_FORCE_CLOSE
+ assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
+ return 0;
+#else
+ /* Actually returning an EOF does not anymore work with modern
+ Libassuan versions. However we keep that non working code until
+ we make a Libassuan with the force close flag a requirement. */
return gpg_error (GPG_ERR_EOF);
+#endif
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 +
NEWS | 2 +
agent/ChangeLog | 13 +++
agent/command-ssh.c | 2 -
agent/command.c | 11 ++-
agent/genkey.c | 4 +-
agent/gpg-agent.c | 3 +-
common/ChangeLog | 10 +++
common/estream.c | 6 +-
common/pka.c | 4 +-
common/signal.c | 16 ++--
common/t-exechelp.c | 11 +--
common/t-timestuff.c | 3 +-
configure.ac | 28 +++---
doc/gpg-agent.texi | 2 +-
g10/ChangeLog | 11 +++
g10/build-packet.c | 24 +++---
g10/export.c | 26 +++---
g10/import.c | 2 +-
g10/keyedit.c | 2 -
g10/sig-check.c | 3 -
kbx/keybox-openpgp.c | 9 +--
m4/ChangeLog | 5 +
m4/libcurl.m4 | 14 ++--
m4/readline.m4 | 6 +-
scd/ChangeLog | 5 +
scd/apdu.c | 3 +-
scd/command.c | 8 ++
scd/pcsc-wrapper.c | 3 +-
scd/scdaemon.c | 3 +-
scripts/ChangeLog | 4 +
scripts/config.guess | 217 ++++++++++++++++++++++++++------------------------
scripts/config.sub | 113 +++++++++++++++-----------
sm/ChangeLog | 6 ++
sm/gpgsm.c | 3 -
sm/keydb.c | 2 -
36 files changed, 328 insertions(+), 260 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list