diff options
author | Thomas Roessler <roessler@does-not-exist.org> | 1998-06-08 20:05:39 +0000 |
---|---|---|
committer | Thomas Roessler <roessler@does-not-exist.org> | 1998-06-08 20:05:39 +0000 |
commit | 90bea32a9b22777b4b32e787661aa532c7d77fc2 (patch) | |
tree | c440dc034d44d8b7c95073cc80b7a3f3b3b6c219 | |
parent | 6f8d5623a93d23e714f3252ab1bca02b9fc3bc86 (diff) |
GPG support, first take.
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | acconfig.h | 6 | ||||
-rw-r--r-- | compose.c | 49 | ||||
-rw-r--r-- | config.h.in | 6 | ||||
-rwxr-xr-x | configure | 244 | ||||
-rw-r--r-- | configure.in | 10 | ||||
-rw-r--r-- | gnupgparse.c | 224 | ||||
-rw-r--r-- | init.c | 4 | ||||
-rw-r--r-- | init.h | 12 | ||||
-rw-r--r-- | main.c | 6 | ||||
-rw-r--r-- | pgp.c | 162 | ||||
-rw-r--r-- | pgp.h | 245 | ||||
-rw-r--r-- | pgpinvoke.c | 604 | ||||
-rw-r--r-- | pgpkey.c | 45 | ||||
-rw-r--r-- | pgppubring.c | 19 | ||||
-rw-r--r-- | recvattach.c | 2 |
16 files changed, 1186 insertions, 454 deletions
diff --git a/Makefile.in b/Makefile.in index 0fe9f8a5..0cb4d8cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,7 @@ DISTCLEANFILES=$(VERYCLEANFILES) tags keymap_defs.h *.rej *.orig *~ Makefile.bak # kill these files when making new export distributions NONEXPORT=pgp.c pgp.h pgpinvoke.c pgpkey.c pgppubring.c sha.h sha1dgst.c \ - sha_locl.h OPS.PGP doc/pgp-Notes.txt doc/language.txt \ + gnupgparse.c sha_locl.h OPS.PGP doc/pgp-Notes.txt doc/language.txt \ doc/language50.txt all: mutt @@ -66,12 +66,18 @@ /* Where is PGP 5 located on your system? */ #undef _PGPV3PATH +/* Where is GNU Privacy Guard located on your system? */ +#undef _PGPGPGPATH + /* Do we have PGP 2.*? */ #undef HAVE_PGP2 /* Do we have PGP 5.0 or up? */ #undef HAVE_PGP5 +/* Do we have GPG? */ +#undef HAVE_GPG + /* Where to find ispell on your system? */ #undef ISPELL @@ -120,6 +120,9 @@ static int pgp_send_menu (int bits) char *micalg = NULL; char input_signas[SHORT_STRING]; char input_micalg[SHORT_STRING]; + KEYINFO *secring; + + struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN); mvaddstr (LINES-1, 0, "(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "); clrtoeol (); @@ -131,17 +134,36 @@ static int pgp_send_menu (int bits) if (c == 'a') { unset_option(OPTPGPCHECKTRUST); - if ((p = pgp_ask_for_key (pgp_secring(PGP_SIGN), - NULL, "Sign as: ", NULL, KEYFLAG_CANSIGN, &micalg))) + + if(pgp) { - snprintf (input_signas, sizeof (input_signas), "0x%s", p); - safe_free((void **) &PgpSignAs); - PgpSignAs = safe_strdup(input_signas); - safe_free((void **) &PgpSignMicalg); - PgpSignMicalg = micalg; /* micalg is malloc()ed by pgp_ask_for_key */ - pgp_void_passphrase (); /* probably need a different passphrase */ - safe_free ((void **) &p); - bits |= PGPSIGN; + if(!(secring = pgp->read_secring(pgp))) + { + mutt_error("Can't open your secret key ring!"); + bits &= ~PGPSIGN; + } + else + { + if ((p = pgp_ask_for_key (pgp, secring, "Sign as: ", + NULL, KEYFLAG_CANSIGN, &micalg))) + { + snprintf (input_signas, sizeof (input_signas), "0x%s", p); + safe_free((void **) &PgpSignAs); + PgpSignAs = safe_strdup(input_signas); + safe_free((void **) &PgpSignMicalg); + PgpSignMicalg = micalg; /* micalg is malloc()ed by pgp_ask_for_key */ + pgp_void_passphrase (); /* probably need a different passphrase */ + safe_free ((void **) &p); + bits |= PGPSIGN; + } + + pgp_close_keydb(&secring); + } + } + else + { + bits &= ~PGPSIGN; + mutt_error("An unkown PGP version was defined for signing."); } } else if (c == 'm') @@ -160,7 +182,8 @@ static int pgp_send_menu (int bits) { mutt_error("Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"); } - else { + else + { safe_free((void **) &PgpSignMicalg); PgpSignMicalg = safe_strdup(input_micalg); } @@ -190,10 +213,6 @@ static int pgp_send_menu (int bits) - - - - static void draw_envelope (HEADER *msg, char *fcc) { char buf[STRING]; diff --git a/config.h.in b/config.h.in index efc45ee9..cc48687e 100644 --- a/config.h.in +++ b/config.h.in @@ -75,12 +75,18 @@ /* Where is PGP 5 located on your system? */ #undef _PGPV3PATH +/* Where is GNU Privacy Guard located on your system? */ +#undef _PGPGPGPATH + /* Do we have PGP 2.*? */ #undef HAVE_PGP2 /* Do we have PGP 5.0 or up? */ #undef HAVE_PGP5 +/* Do we have GPG? */ +#undef HAVE_GPG + /* Where to find ispell on your system? */ #undef ISPELL @@ -885,10 +885,55 @@ OPS='$(srcdir)/OPS' if test -f $srcdir/pgp.c; then SUBVERSION=i PGPPATH=no + + # Extract the first word of "gpg", so it can be a program name with args. +set dummy gpg; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:893: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GPG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GPG" in + /*) + ac_cv_path_GPG="$GPG" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GPG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_GPG" && ac_cv_path_GPG="no" + ;; +esac +fi +GPG="$ac_cv_path_GPG" +if test -n "$GPG"; then + echo "$ac_t""$GPG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test $GPG != no ; then + cat >> confdefs.h <<EOF +#define _PGPGPGPATH "$GPG" +EOF + + PGPPATH="$GPG" + cat >> confdefs.h <<\EOF +#define HAVE_GPG 1 +EOF + + fi + # Extract the first word of "pgpk", so it can be a program name with args. set dummy pgpk; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:892: checking for $ac_word" >&5 +echo "configure:937: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -933,7 +978,7 @@ EOF # Extract the first word of "pgp", so it can be a program name with args. set dummy pgp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:937: checking for $ac_word" >&5 +echo "configure:982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +1027,7 @@ EOF fi if test $PGP != no || test $PGPK != no ; then - LIBOBJS="$LIBOBJS pgp.o pgpinvoke.o pgpkey.o pgppubring.o sha1dgst.o" + LIBOBJS="$LIBOBJS pgp.o pgpinvoke.o pgpkey.o pgppubring.o sha1dgst.o gnupgparse.o" OPS="$OPS \$(srcdir)/OPS.PGP" fi fi @@ -997,7 +1042,7 @@ EOF # Extract the first word of "ispell", so it can be a program name with args. set dummy ispell; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1001: checking for $ac_word" >&5 +echo "configure:1046: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1034,7 +1079,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1038: checking how to run the C preprocessor" >&5 +echo "configure:1083: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1049,13 +1094,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1053 "configure" +#line 1098 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1066,13 +1111,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1070 "configure" +#line 1115 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1098,7 +1143,7 @@ echo "$ac_t""$CPP" 1>&6 if test "${with_slang+set}" = set; then withval="$with_slang" echo $ac_n "checking if -ltermlib is required""... $ac_c" 1>&6 -echo "configure:1102: checking if -ltermlib is required" >&5 +echo "configure:1147: checking if -ltermlib is required" >&5 if eval "test \"`echo '$''{'mutt_cv_bsdish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1106,7 +1151,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1110 "configure" +#line 1155 "configure" #include "confdefs.h" #include <sys/param.h> @@ -1119,7 +1164,7 @@ main () #endif } EOF -if { (eval echo configure:1123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then mutt_cv_bsdish=yes else @@ -1136,7 +1181,7 @@ fi echo "$ac_t""$mutt_cv_bsdish" 1>&6 echo $ac_n "checking for S-Lang""... $ac_c" 1>&6 -echo "configure:1140: checking for S-Lang" >&5 +echo "configure:1185: checking for S-Lang" >&5 if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src @@ -1182,16 +1227,16 @@ EOF echo $ac_n "checking if I can compile a test SLang program""... $ac_c" 1>&6 -echo "configure:1186: checking if I can compile a test SLang program" >&5 +echo "configure:1231: checking if I can compile a test SLang program" >&5 cat > conftest.$ac_ext <<EOF -#line 1188 "configure" +#line 1233 "configure" #include "confdefs.h" int main() { SLtt_get_terminfo (); ; return 0; } EOF -if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -1219,7 +1264,7 @@ fi echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:1223: checking for initscr in -lncurses" >&5 +echo "configure:1268: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1227,7 +1272,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 1231 "configure" +#line 1276 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1238,7 +1283,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1261,17 +1306,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1265: checking for $ac_hdr" >&5 +echo "configure:1310: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1270 "configure" +#line 1315 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1312,12 +1357,12 @@ fi echo $ac_n "checking for start_color""... $ac_c" 1>&6 -echo "configure:1316: checking for start_color" >&5 +echo "configure:1361: checking for start_color" >&5 if eval "test \"`echo '$''{'ac_cv_func_start_color'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1321 "configure" +#line 1366 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char start_color(); below. */ @@ -1340,7 +1385,7 @@ start_color(); ; return 0; } EOF -if { (eval echo configure:1344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_start_color=yes" else @@ -1365,12 +1410,12 @@ fi for ac_func in typeahead bkgdset curs_set meta use_default_colors do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1369: checking for $ac_func" >&5 +echo "configure:1414: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1374 "configure" +#line 1419 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1393,7 +1438,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1420,12 +1465,12 @@ done for ac_func in resizeterm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1424: checking for $ac_func" >&5 +echo "configure:1469: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1429 "configure" +#line 1474 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1448,7 +1493,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1477,12 +1522,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1481: checking for ANSI C header files" >&5 +echo "configure:1526: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1486 "configure" +#line 1531 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1490,7 +1535,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1507,7 +1552,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1511 "configure" +#line 1556 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1525,7 +1570,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1529 "configure" +#line 1574 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1546,7 +1591,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1550 "configure" +#line 1595 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1557,7 +1602,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1585,17 +1630,17 @@ for ac_hdr in stdarg.h sys/ioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1589: checking for $ac_hdr" >&5 +echo "configure:1634: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1594 "configure" +#line 1639 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1623,12 +1668,12 @@ done echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1627: checking return type of signal handlers" >&5 +echo "configure:1672: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1632 "configure" +#line 1677 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1645,7 +1690,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1665,12 +1710,12 @@ EOF echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:1669: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:1714: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1674 "configure" +#line 1719 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1682,7 +1727,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -1704,7 +1749,7 @@ fi echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1708: checking size of long" >&5 +echo "configure:1753: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1757,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1716 "configure" +#line 1761 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1723,7 +1768,7 @@ main() exit(0); } EOF -if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1744,12 +1789,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1748: checking for pid_t" >&5 +echo "configure:1793: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1753 "configure" +#line 1798 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1780,12 +1825,12 @@ fi for ac_func in setegid srand48 strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1784: checking for $ac_func" >&5 +echo "configure:1829: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1789 "configure" +#line 1834 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1808,7 +1853,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1836,12 +1881,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1840: checking for $ac_func" >&5 +echo "configure:1885: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1845 "configure" +#line 1890 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1864,7 +1909,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1893,12 +1938,12 @@ done mutt_cv_snprintf=no echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:1897: checking for snprintf" >&5 +echo "configure:1942: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1902 "configure" +#line 1947 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -1921,7 +1966,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -1945,12 +1990,12 @@ mutt_cv_snprintf=yes fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:1949: checking for vsnprintf" >&5 +echo "configure:1994: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1954 "configure" +#line 1999 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -1973,7 +2018,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -2003,12 +2048,12 @@ fi for ac_func in ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2007: checking for $ac_func" >&5 +echo "configure:2052: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2012 "configure" +#line 2057 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2031,7 +2076,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2053,7 +2098,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for chsize in -lx""... $ac_c" 1>&6 -echo "configure:2057: checking for chsize in -lx" >&5 +echo "configure:2102: checking for chsize in -lx" >&5 ac_lib_var=`echo x'_'chsize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2061,7 +2106,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 2065 "configure" +#line 2110 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2072,7 +2117,7 @@ int main() { chsize() ; return 0; } EOF -if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2106,12 +2151,12 @@ done for ac_func in strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2110: checking for $ac_func" >&5 +echo "configure:2155: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2115 "configure" +#line 2160 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2134,7 +2179,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2156,7 +2201,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2160: checking for strftime in -lintl" >&5 +echo "configure:2205: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2164,7 +2209,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2168 "configure" +#line 2213 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2175,7 +2220,7 @@ int main() { strftime() ; return 0; } EOF -if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2228,12 +2273,12 @@ else for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2232: checking for $ac_func" >&5 +echo "configure:2277: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2237 "configure" +#line 2282 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2256,7 +2301,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2327,7 +2372,7 @@ if test "${with_mailpath+set}" = set; then mutt_cv_mailpath=$withval else echo $ac_n "checking where new mail is stored""... $ac_c" 1>&6 -echo "configure:2331: checking where new mail is stored" >&5 +echo "configure:2376: checking where new mail is stored" >&5 if eval "test \"`echo '$''{'mutt_cv_mailpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2356,7 +2401,7 @@ EOF echo $ac_n "checking if $mutt_cv_mailpath is world writable""... $ac_c" 1>&6 -echo "configure:2360: checking if $mutt_cv_mailpath is world writable" >&5 +echo "configure:2405: checking if $mutt_cv_mailpath is world writable" >&5 if eval "test \"`echo '$''{'mutt_cv_worldwrite'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2364,7 +2409,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2368 "configure" +#line 2413 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -2378,7 +2423,7 @@ int main (int argc, char **argv) exit (1); } EOF -if { (eval echo configure:2382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then mutt_cv_worldwrite=yes else @@ -2403,7 +2448,7 @@ EOF else echo $ac_n "checking if $mutt_cv_mailpath is group writable""... $ac_c" 1>&6 -echo "configure:2407: checking if $mutt_cv_mailpath is group writable" >&5 +echo "configure:2452: checking if $mutt_cv_mailpath is group writable" >&5 if eval "test \"`echo '$''{'mutt_cv_groupwrite'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2411,7 +2456,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2415 "configure" +#line 2460 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -2425,7 +2470,7 @@ int main (int argc, char **argv) exit (1); } EOF -if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then mutt_cv_groupwrite=yes else @@ -2461,7 +2506,7 @@ if |