Hello community, here is the log from the commit of package mailx for openSUSE:Factory checked in at Mon May 16 09:25:55 CEST 2011.
-------- --- mailx/mailx.changes 2011-04-09 23:31:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/mailx/mailx.changes 2011-05-13 13:37:35.000000000 +0200 @@ -1,0 +2,38 @@ +Fri May 13 13:29:52 CEST 2011 - [email protected] + +- Update to heirloom mailx 12.5 + * Better detection of base64 encoded text if acrossed a line + * A null pointer dereference that lead to a segmentation fault + when the user hit return at a yes/no question has been fixed + * When both standard input and standard output refer to a + terminal, ignore SIGPIPE + * With the "-E" command line option or if the "skipemptybody" + variable is set, outgoing messages that contain no text in + their first or only part are not sent but silently discarded. + * When an attachment that would have a "text/something" content + type contains illegal byte sequences, it is now reliably sent + out with the "application/octet-stream" content type instead + * Fixed a bug that caused messages to be truncated with IMAP servers that + use LF as line ending in message data, such as Google Mail (reported by + Matthew L. Shobe). + * Do not run filename expansion for IMAP or POP3 mailboxes names, making + it possible to select mailboxes that contain both brackets and spaces + in their names (reported by Matthew L. Shobe). + * Fixed the format of the timezone in "Date" header fields for zones in + the Western Hemisphere whose offsets are not an integral number of hours + (patch by Matthew Fischer). + * Fixed a message corruption that occurred when the "inc" command was used + with a mbox format mailbox after encrypted messages had been viewed + (reported by Martin Neitzel). + * Fixed a condition that caused mailx to hang when looking at a message, + copying that message, and issuing a "z" command evaluating an uncached + portion of an IMAP folder. + * Make it compile with OpenSSL 1.0.0-beta2 + * For RFC 2047 MIME "encoded-word" parts in headers, assume that the end of + each word resets the conversion state (Yedidyah Bar-David). + * When the ORGANIZATION variable has an empty value, do not generate an + "Organization:" header field. Previously, this condition resulted in + mailx refusing to send mail +- Fix my Reply-To patch found by milli + +------------------------------------------------------------------ calling whatdependson for head-i586 Old: ---- mailx-12.1-replyto.patch mailx-12.2-mime.dif mailx-12.2.dif mailx-12.2.tar.bz2 New: ---- mailx-12.5-mime.dif mailx-12.5-replyto.patch mailx-12.5.dif mailx-12.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailx.spec ++++++ --- /var/tmp/diff_new_pack.LCmmfh/_old 2011-05-16 09:24:48.000000000 +0200 +++ /var/tmp/diff_new_pack.LCmmfh/_new 2011-05-16 09:24:48.000000000 +0200 @@ -26,13 +26,13 @@ Provides: mail Recommends: smtp_daemon AutoReqProv: on -Version: 12.2 -Release: 158 +Version: 12.5 +Release: 1 Summary: A MIME-Capable Implementation of the mailx Command Source: mailx-%{version}.tar.bz2 Patch: mailx-%{version}.dif Patch1: nail-11.25-path.dif -Patch2: mailx-12.1-replyto.patch +Patch2: mailx-%{version}-replyto.patch Patch3: nail-11.25-ttychar.dif Patch4: nail-11.25-toaddr.dif Patch5: mailx-%{version}-mime.dif @@ -53,8 +53,8 @@ %patch3 -p0 -b .ttychr %patch4 -p0 -b .toaddr %patch5 -p0 -b .mime +%patch6 -p0 -b .ssl %patch -p0 -%patch6 %build CC=gcc ++++++ mailx-12.2-mime.dif -> mailx-12.5-mime.dif ++++++ --- mailx/mailx-12.2-mime.dif 2011-02-03 12:05:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/mailx/mailx-12.5-mime.dif 2011-05-13 13:37:33.000000000 +0200 @@ -1,5 +1,5 @@ --- def.h -+++ def.h 2007-04-17 11:32:43.960721000 +0000 ++++ def.h 2011-05-13 11:04:51.779926337 +0000 @@ -142,7 +142,8 @@ enum mimeclean { MIME_LONGLINES = 002, /* has lines too long for RFC 2822 */ MIME_CTRLCHAR = 004, /* contains control characters */ @@ -11,20 +11,22 @@ enum tdflags { --- mime.c -+++ mime.c 2007-04-17 13:08:06.352702764 +0000 -@@ -258,7 +258,10 @@ getcharset(int isclean) ++++ mime.c 2011-05-13 11:04:51.779926337 +0000 +@@ -258,8 +258,11 @@ getcharset(int isclean) if (isclean & (MIME_CTRLCHAR|MIME_HASNUL)) charset = NULL; else if (isclean & MIME_HIGHBIT) { -- charset = wantcharset ? wantcharset : value("charset"); +- charset = (wantcharset && wantcharset != (char *)-1) ? +- wantcharset : value("charset"); + if (isclean & MIME_UTF8) + charset = defcharset; + if (charset == NULL) -+ charset = wantcharset ? wantcharset : value("charset"); ++ charset = (wantcharset && wantcharset != (char *)-1) ? ++ wantcharset : value("charset"); if (charset == NULL) { char *t = value("ttycharset"); if (t == NULL || (ascncasecmp("ANSI_X3.4", t, 9) == 0)) -@@ -742,6 +745,7 @@ mime_isclean(FILE *f) +@@ -737,6 +740,7 @@ mime_isclean(FILE *f) lastc = c; c = getc(f); curlen++; @@ -32,7 +34,7 @@ if (c == '\n' || c == EOF) { /* * RFC 821 imposes a maximum line length of 1000 -@@ -754,10 +758,38 @@ mime_isclean(FILE *f) +@@ -749,10 +753,38 @@ mime_isclean(FILE *f) curlen = 1; } else if (c & 0200) { isclean |= MIME_HIGHBIT; @@ -72,7 +74,7 @@ isclean |= MIME_CTRLCHAR; } } while (c != EOF); -@@ -826,13 +858,16 @@ get_mime_convert(FILE *fp, char **conten +@@ -826,12 +858,15 @@ get_mime_convert(FILE *fp, char **conten * ^I or ^L in text/plain bodies. However, some * obscure character sets actually contain these * characters, so the content type can be set. @@ -81,9 +83,8 @@ */ if ((*contenttype = value("contenttype-cntrl")) == NULL) *contenttype = "application/octet-stream"; - } else + } else if (*contenttype == NULL) *contenttype = "text/plain"; - *charset = getcharset(*isclean); - } + } else if (ascncasecmp(*contenttype, "text/", 5) == 0) + *charset = getcharset(*isclean); @@ -91,96 +92,25 @@ } --- sendout.c -+++ sendout.c 2007-04-17 13:11:40.576871634 +0000 -@@ -206,7 +206,7 @@ attach_file(struct attachment *ap, FILE - size_t bufsize, count; - int lastc = EOF; - #ifdef HAVE_ICONV -- char *tcs; -+ char *tcs = NULL; - #endif - - if ((fi = Fopen(ap->a_name, "r")) == NULL) { -@@ -231,8 +231,16 @@ attach_file(struct attachment *ap, FILE ++++ sendout.c 2011-05-13 11:07:31.623926237 +0000 +@@ -230,6 +230,11 @@ attach_file1(struct attachment *ap, FILE + "\n--%s\n" + "Content-Type: %s", send_boundary, contenttype); ++ tcs = gettcharset(); ++#ifdef HAVE_ICONV ++ if (wantcharset && ascncasecmp(wantcharset, "ANSI_X3.4", 9)) ++ charset = wantcharset; ++#endif if (charset == NULL) putc('\n', fo); -- else -- fprintf(fo, ";\n charset=%s\n", charset); -+ else { -+#ifdef HAVE_ICONV -+ if (wantcharset && ascncasecmp(wantcharset, "ANSI_X3.4", 9)) -+ tcs = wantcharset; -+ if (tcs) -+ fprintf(fo, ";\n charset=%s\n", tcs); -+ else -+#endif -+ fprintf(fo, ";\n charset=%s\n", charset); -+ } - if (ap->a_content_disposition == NULL) - ap->a_content_disposition = "attachment"; - fprintf(fo, "Content-Transfer-Encoding: %s\n" -@@ -254,16 +262,15 @@ attach_file(struct attachment *ap, FILE - iconv_close(iconvd); - iconvd = (iconv_t)-1; - } -- tcs = gettcharset(); + else +@@ -259,7 +264,7 @@ attach_file1(struct attachment *ap, FILE if ((isclean & (MIME_HASNUL|MIME_CTRLCHAR)) == 0 && ascncasecmp(contenttype, "text/", 5) == 0 && isclean & MIME_HIGHBIT && -- charset != NULL && asccasecmp(charset, tcs)) { -- if ((iconvd = iconv_open_ft(charset, tcs)) == (iconv_t)-1 && +- charset != NULL) { + charset != NULL && tcs != NULL && asccasecmp(charset, tcs)) { -+ if ((iconvd = iconv_open_ft(tcs, charset)) == (iconv_t)-1 && + if ((iconvd = iconv_open_ft(charset, tcs)) == (iconv_t)-1 && errno != 0) { if (errno == EINVAL) - fprintf(stderr, catgets(catd, CATSET, 179, -- "Cannot convert from %s to %s\n"), tcs, charset); -+ "Cannot convert from %s to %s\n"), charset, tcs); - else - perror("iconv_open"); - Fclose(fi); -@@ -467,6 +474,7 @@ infix(struct header *hp, FILE *fi, int d - } - if ((isclean & (MIME_HASNUL|MIME_CTRLCHAR)) == 0 && - ascncasecmp(contenttype, "text/", 5) == 0 && -+ ascncasecmp(tcs, "ANSI_X3.4", 9) && - isclean & MIME_HIGHBIT && - charset != NULL && asccasecmp(charset, tcs)) { - if (iconvd != (iconv_t)-1) -@@ -1162,8 +1170,9 @@ puthead(struct header *hp, FILE *fo, enu - return 1; - if ((addr = hp->h_organization) != NULL || - (addr = value("ORGANIZATION")) != NULL) { -+ size_t len = strlen(addr); - fwrite("Organization: ", sizeof (char), 14, fo); -- if (mime_write(addr, sizeof *addr, strlen(addr), fo, -+ if (len && mime_write(addr, sizeof *addr, len, fo, - action == SEND_TODISP ? - CONV_NONE:CONV_TOHDR, - action == SEND_TODISP ? -@@ -1208,9 +1217,10 @@ puthead(struct header *hp, FILE *fo, enu - if (hp->h_subject != NULL && w & GSUBJECT) { - fwrite("Subject: ", sizeof (char), 9, fo); - if (ascncasecmp(hp->h_subject, "re: ", 4) == 0) { -+ size_t len = strlen(hp->h_subject + 4); - fwrite("Re: ", sizeof (char), 4, fo); -- if (mime_write(hp->h_subject + 4, sizeof *hp->h_subject, -- strlen(hp->h_subject + 4), -+ if (len && mime_write(hp->h_subject + 4, -+ sizeof *hp->h_subject, len, - fo, action == SEND_TODISP ? - CONV_NONE:CONV_TOHDR, - action == SEND_TODISP ? -@@ -1218,8 +1228,9 @@ puthead(struct header *hp, FILE *fo, enu - NULL, (size_t)0) == 0) - return 1; - } else if (*hp->h_subject) { -- if (mime_write(hp->h_subject, sizeof *hp->h_subject, -- strlen(hp->h_subject), -+ size_t len = strlen(hp->h_subject); -+ if (len && mime_write(hp->h_subject, -+ sizeof *hp->h_subject, len, - fo, action == SEND_TODISP ? - CONV_NONE:CONV_TOHDR, - action == SEND_TODISP ? ++++++ mailx-12.1-replyto.patch -> mailx-12.5-replyto.patch ++++++ --- mailx/mailx-12.1-replyto.patch 2006-12-19 00:17:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/mailx/mailx-12.5-replyto.patch 2011-05-13 13:37:33.000000000 +0200 @@ -1,6 +1,6 @@ --- collect.c -+++ collect.c 2006-07-20 13:21:32.000000000 +0200 -@@ -718,7 +718,7 @@ cont: ++++ collect.c 2006-07-20 11:21:32.000000000 +0000 +@@ -720,7 +720,7 @@ cont: * Grab a bunch of headers. */ do @@ -9,7 +9,7 @@ value("bsdcompat") != NULL && value("bsdorder") != NULL); while (hp->h_to == NULL); -@@ -741,13 +741,21 @@ cont: +@@ -743,13 +743,21 @@ cont: break; case 's': /* @@ -33,7 +33,7 @@ /* * Edit the attachment list. --- def.h -+++ def.h 2006-07-20 13:21:32.000000000 +0200 ++++ def.h 2006-07-20 11:21:32.000000000 +0000 @@ -393,7 +393,7 @@ enum gfield { GUA = 128, /* User-Agent field */ GMIME = 256, /* MIME 1.0 fields */ @@ -53,29 +53,28 @@ #define visible(mp) (((mp)->m_flag&(MDELETED|MHIDDEN|MKILL))==0|| \ dot==(mp) && (mp)->m_flag&MKILL) --- extern.h -+++ extern.h 2006-07-20 13:21:32.000000000 +0200 -@@ -456,7 +456,8 @@ int send(struct message *mp, FILE *obuf, ++++ extern.h 2011-05-13 09:07:33.891926124 +0000 +@@ -457,7 +457,7 @@ int send(struct message *mp, FILE *obuf, + char *prefix, enum sendaction action, off_t *stats); + /* sendout.c */ char *makeboundary(void); - int mail(struct name *to, struct name *cc, struct name *bcc, +-int mail(struct name *to, struct name *cc, struct name *bcc, ++int mail(struct name *to, struct name *cc, struct name *bcc, struct name *replyto, struct name *smopts, char *subject, struct attachment *attach, -- char *quotefile, int recipient_record, int tflag); -+ char *quotefile, int recipient_record, int tflag, -+ struct name * replyto); + char *quotefile, int recipient_record, int tflag, int Eflag); int sendmail(void *v); - int Sendmail(void *v); - enum okay mail1(struct header *hp, int printheaders, struct message *quote, --- mailx.1 -+++ mailx.1 2006-07-20 13:23:09.000000000 +0200 ++++ mailx.1 2011-05-13 09:11:27.640426515 +0000 @@ -43,7 +43,7 @@ mailx \- send and receive Internet mail .PD 0 .HP .ad l --\fBmailx\fR [\fB\-BDdFintv~\fR] -+\fBmailx\fR [\fB\-BDdFintv~\fR] [\fB\-R\fI\ address\fR ] +-\fBmailx\fR [\fB\-BDdEFintv~\fR] ++\fBmailx\fR [\fB\-BDdEFintv~\fR] [\fB\-R\fR [\fIaddress\fR]] [\fB\-s\fI\ subject\fR] [\fB\-a\fI\ attachment\fR ] [\fB\-c\fI\ cc-addr\fR] [\fB\-b\fI\ bcc-addr\fR] [\fB\-r\fI\ from-addr\fR] [\fB\-h\fI\ hops\fR] -@@ -192,8 +192,12 @@ it is recommended to set the +@@ -203,8 +203,12 @@ it is recommended to set the .I from variable directly instead. .TP @@ -89,7 +88,7 @@ .TP .BI \-s \ subject Specify subject on command line (only the first argument after the -@@ -2104,6 +2108,9 @@ copying the message to +@@ -2131,6 +2135,9 @@ copying the message to `dead.letter' in the user's home directory if save is set. .TP @@ -100,8 +99,8 @@ Read the named file into the message. .TP --- main.c -+++ main.c 2006-07-20 13:37:02.000000000 +0200 -@@ -52,6 +52,11 @@ static char sccsid[] = "@(#)main.c 2.48 ++++ main.c 2011-05-13 09:18:29.747926305 +0000 +@@ -52,6 +52,11 @@ static char sccsid[] = "@(#)main.c 2.51 * Note: We set egid to realgid ... and only if we need the egid we will * switch back temporary. Nevertheless, I do not like seg faults. * Werner Fink, <[email protected]> @@ -113,68 +112,49 @@ */ -@@ -86,9 +91,9 @@ static void setscreensize(int dummy); +@@ -87,9 +92,9 @@ static void setscreensize(int dummy); int main(int argc, char *argv[]) { -- const char optstr[] = "A:BHFINVT:RS:a:b:c:dDefh:inqr:s:tu:v~"; -+ const char optstr[] = "A:BHFINVT:R\rS:a:b:c:dDefh:inqr:s:tu:v~"; +- const char optstr[] = "A:BHEFINVT:RS:a:b:c:dDefh:inqr:s:tu:v~"; ++ const char optstr[] = "A:BHEFINVT:R::S:a:b:c:dDefh:inqr:s:tu:v~"; int i, existonly = 0, headersonly = 0, sendflag = 0; - struct name *to, *cc, *bcc, *smopts; -+ struct name *to, *cc, *bcc, *smopts, *replyto; ++ struct name *to, *cc, *bcc, *replyto, *smopts; struct attachment *attach; char *subject, *cp, *ef, *qf = NULL, *fromaddr = NULL, *Aflag = NULL; char nosrc = 0; -@@ -175,6 +180,26 @@ main(int argc, char *argv[]) +@@ -179,6 +184,8 @@ main(int argc, char *argv[]) attach = NULL; smopts = NULL; subject = NULL; + replyto = NULL; + -+ if (*argv) { -+ /* -+ * Use -R option for send and folder mode. In folder mode -R is used -+ * for read only and in send mode for providing a reply-to address. -+ */ -+ char **opt = argv; -+ while (*(++opt) && (**opt)) { -+ char *cp = *opt; -+ if (*cp == '-' && *(cp+1) == 'R') { -+ if (*(cp+2) == 0) { -+ if (*(++opt) && (**opt) && (**opt != '-')) -+ *(cp+1) = '\r'; -+ } -+ break; -+ } -+ } -+ } -+ while ((i = getopt(argc, argv, optstr)) != EOF) { switch (i) { case 'V': -@@ -339,13 +364,20 @@ main(int argc, char *argv[]) - case 'A': +@@ -348,12 +355,18 @@ main(int argc, char *argv[]) Aflag = optarg; break; -+ case '\r': + case 'R': +- Rflag = 1; + /* + * Set the Reply-to Address (as who we send mail) + */ + if (optarg && *optarg) + replyto = checkaddrs(cat(replyto, extract(optarg, GREPLYTO|GFULL))); -+ break; - case 'R': - Rflag = 1; ++ else ++ Rflag = 1; break; case '?': usage: fprintf(stderr, catgets(catd, CATSET, 135, --"Usage: %s -eiIUdFntBDNHRV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users\n"), progname); -+"Usage: %s -eiIUdFntBDNHV~ [ -R | -R reply-address ] -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users\n"), progname); +-"Usage: %s -eiIUdEFntBDNHRV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users\n"), progname); ++"Usage: %s -eiIUdEFntBDNHV~ [-R [reply-address]] -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users\n"), progname); exit(2); } } -@@ -379,6 +411,10 @@ usage: +@@ -387,6 +400,10 @@ usage: fprintf(stderr, "The -R option is meaningless in send mode.\n"); goto usage; } @@ -185,28 +165,29 @@ if (Iflag && ef == NULL) { fprintf(stderr, catgets(catd, CATSET, 204, "Need -f with -I.\n")); -@@ -427,7 +463,7 @@ usage: +@@ -441,8 +458,8 @@ usage: if (fromaddr) assign("from", fromaddr); if (!rcvmode) { -- mail(to, cc, bcc, smopts, subject, attach, qf, Fflag, tflag); -+ mail(to, cc, bcc, smopts, subject, attach, qf, Fflag, tflag, replyto); +- mail(to, cc, bcc, smopts, subject, attach, qf, Fflag, tflag, +- Eflag); ++ mail(to, cc, bcc, replyto, smopts, subject, attach, qf, ++ Fflag, tflag, Eflag); /* * why wait? */ --- sendout.c -+++ sendout.c 2006-07-20 13:21:39.000000000 +0200 -@@ -638,7 +638,8 @@ savemail(char *name, FILE *fi) ++++ sendout.c 2011-05-13 09:19:01.288426393 +0000 +@@ -712,7 +712,7 @@ savemail(char *name, FILE *fi) + * which does all the dirty work. + */ int - mail(struct name *to, struct name *cc, struct name *bcc, +-mail(struct name *to, struct name *cc, struct name *bcc, ++mail(struct name *to, struct name *cc, struct name *bcc, struct name *replyto, struct name *smopts, char *subject, struct attachment *attach, -- char *quotefile, int recipient_record, int tflag) -+ char *quotefile, int recipient_record, int tflag, -+ struct name *replyto) + char *quotefile, int recipient_record, int tflag, int Eflag) { - struct header head; - struct str in, out; -@@ -655,6 +656,7 @@ mail(struct name *to, struct name *cc, s +@@ -731,6 +731,7 @@ mail(struct name *to, struct name *cc, s head.h_to = to; head.h_cc = cc; head.h_bcc = bcc; @@ -215,7 +196,7 @@ head.h_attach = attach; head.h_smopts = smopts; --- tty.c -+++ tty.c 2006-07-20 13:21:39.000000000 +0200 ++++ tty.c 2006-07-20 11:21:39.000000000 +0000 @@ -338,6 +338,12 @@ grabh(struct header *hp, enum gfield gfl hp->h_organization = rtty_internal("Organization: ", hp->h_organization); ++++++ mailx-12.2-mime.dif -> mailx-12.5.dif ++++++ ++++ 674 lines (skipped) ++++ between mailx/mailx-12.2-mime.dif ++++ and /mounts/work_src_done/STABLE/mailx/mailx-12.5.dif ++++++ mailx-12.2.tar.bz2 -> mailx-12.5.tar.bz2 ++++++ ++++ 8001 lines of diff (skipped) ++++++ mailx-fix-openssl.patch ++++++ --- /var/tmp/diff_new_pack.LCmmfh/_old 2011-05-16 09:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.LCmmfh/_new 2011-05-16 09:24:49.000000000 +0200 @@ -1,5 +1,5 @@ ---- openssl.c.orig -+++ openssl.c +--- openssl.c ++++ openssl.c 2011-05-13 00:00:00.000000000 +0000 @@ -63,6 +63,7 @@ static sigjmp_buf ssljmp; #include <openssl/x509.h> #include <openssl/pem.h> @@ -8,16 +8,7 @@ #include "rcv.h" #include <errno.h> -@@ -105,7 +106,7 @@ static SSL_METHOD *ssl_select_method(con - static void ssl_load_verifications(struct sock *sp); - static void ssl_certificate(struct sock *sp, const char *uhp); - static enum okay ssl_check_host(const char *server, struct sock *sp); --static int smime_verify(struct message *m, int n, STACK *chain, -+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain, - X509_STORE *store); - static EVP_CIPHER *smime_cipher(const char *name); - static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata); -@@ -166,6 +167,10 @@ ssl_init(void) +@@ -171,6 +172,10 @@ ssl_init(void) verbose = value("verbose") != NULL; if (initialized == 0) { SSL_library_init(); @@ -28,7 +19,7 @@ initialized = 1; } if (rand_init == 0) -@@ -211,9 +216,12 @@ ssl_select_method(const char *uhp) +@@ -216,9 +221,12 @@ ssl_select_method(const char *uhp) cp = ssl_method_string(uhp); if (cp != NULL) { @@ -42,61 +33,3 @@ method = SSLv3_client_method(); else if (equal(cp, "tls1")) method = TLSv1_client_method(); -@@ -308,7 +316,7 @@ ssl_check_host(const char *server, struc - X509 *cert; - X509_NAME *subj; - char data[256]; -- /*GENERAL_NAMES*/STACK *gens; -+ STACK_OF(GENERAL_NAME) *gens; - GENERAL_NAME *gen; - int i; - -@@ -494,7 +502,7 @@ smime_sign(FILE *ip, struct header *head - } - - static int --smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store) -+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store) - { - struct message *x; - char *cp, *sender, *to, *cc, *cnttype; -@@ -503,7 +511,8 @@ smime_verify(struct message *m, int n, S - off_t size; - BIO *fb, *pb; - PKCS7 *pkcs7; -- STACK *certs, *gens; -+ STACK_OF(X509) *certs; -+ STACK_OF(GENERAL_NAME) *gens; - X509 *cert; - X509_NAME *subj; - char data[LINESIZE]; -@@ -612,7 +621,7 @@ cverify(void *vp) - { - int *msgvec = vp, *ip; - int ec = 0; -- STACK *chain = NULL; -+ STACK_OF(X509) *chain = NULL; - X509_STORE *store; - char *ca_dir, *ca_file; - -@@ -685,7 +694,7 @@ smime_encrypt(FILE *ip, const char *cert - X509 *cert; - PKCS7 *pkcs7; - BIO *bb, *yb; -- STACK *certs; -+ STACK_OF(X509) *certs; - EVP_CIPHER *cipher; - - certfile = expand((char *)certfile); -@@ -948,9 +957,9 @@ smime_certsave(struct message *m, int n, - off_t size; - BIO *fb, *pb; - PKCS7 *pkcs7; -- STACK *certs; -+ STACK_OF(X509) *certs; - X509 *cert; -- STACK *chain = NULL; -+ STACK_OF(X509) *chain = NULL; - enum okay ok = OKAY; - - message_number = n; ++++++ nail-11.25-path.dif ++++++ --- /var/tmp/diff_new_pack.LCmmfh/_old 2011-05-16 09:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.LCmmfh/_new 2011-05-16 09:24:49.000000000 +0200 @@ -85,7 +85,7 @@ if ((obuf = Popen(cmd, "r", cp, 0)) == NULL) { perror(cmd); return; -@@ -1049,7 +1049,7 @@ mespipe(char *cmd) +@@ -1051,7 +1051,7 @@ mespipe(char *cmd) * stdout = new message. */ if ((shell = value("SHELL")) == NULL) @@ -198,7 +198,7 @@ tempEdit, NULL, NULL) < 0) { --- fio.c +++ fio.c 2005-10-14 13:44:09.000000000 +0000 -@@ -539,7 +539,7 @@ globname(char *name) +@@ -542,7 +542,7 @@ globname(char *name) } snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name); if ((shell = value("SHELL")) == NULL) @@ -209,7 +209,7 @@ close(pivec[0]); --- main.c +++ main.c 2005-10-14 13:44:09.000000000 +0000 -@@ -396,7 +396,7 @@ usage: +@@ -403,7 +403,7 @@ usage: rcvmode = !to && !tflag; spreserve(); if (!nosrc) @@ -231,7 +231,7 @@ sigaddset(&nset, SIGINT); --- send.c +++ send.c 2005-10-14 13:44:09.000000000 +0000 -@@ -1049,7 +1049,7 @@ getpipefile(char *pipecmd, FILE **qbuf, +@@ -1088,7 +1088,7 @@ getpipefile(char *pipecmd, FILE **qbuf, Ftfree(&tempPipe); } if ((shell = value("SHELL")) == NULL) @@ -242,7 +242,7 @@ perror(pipecmd); --- sendout.c +++ sendout.c 2005-10-14 13:44:09.000000000 +0000 -@@ -837,7 +837,7 @@ start_mta(struct name *to, struct name * +@@ -884,7 +884,7 @@ start_mta(struct name *to, struct name * if ((cp = value("sendmail")) != NULL) cp = expand(cp); else ++++++ nail-11.25-toaddr.dif ++++++ --- /var/tmp/diff_new_pack.LCmmfh/_old 2011-05-16 09:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.LCmmfh/_new 2011-05-16 09:24:49.000000000 +0200 @@ -1,9 +1,11 @@ --- main.c -+++ main.c 2005-10-17 14:36:24.000000000 +0200 -@@ -184,10 +184,27 @@ ++++ main.c 2011-05-13 09:28:48.052426589 +0000 +@@ -186,6 +186,25 @@ main(int argc, char *argv[]) + subject = NULL; + replyto = NULL; - if (*argv) { - /* ++ if (*argv) { ++ /* + * Be compatible with broken mail behaviour, which use direct + * sendmail options for sending mails if getopt is skiped + * by first argument which is non option like a mail address. @@ -19,17 +21,12 @@ + to = checkaddrs(cat(to, nalloc(*opt, GTO))); + argc--, argv++; + } ++ } + -+ /* - * Use -R option for send and folder mode. In folder mode -R is used - * for read only and in send mode for providing a reply-to address. - */ -- char **opt = argv; -+ opt = argv; - while (*(++opt) && (**opt)) { - char *cp = *opt; - if (*cp == '-' && *(cp+1) == 'R') { -@@ -386,8 +403,19 @@ + while ((i = getopt(argc, argv, optstr)) != EOF) { + switch (i) { + case 'V': +@@ -380,8 +399,19 @@ usage: ef = argv[optind]; } } else { ++++++ nail-11.25-ttychar.dif ++++++ --- /var/tmp/diff_new_pack.LCmmfh/_old 2011-05-16 09:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.LCmmfh/_new 2011-05-16 09:24:49.000000000 +0200 @@ -1,8 +1,8 @@ --- mime.c -+++ mime.c 2005-10-14 16:28:39.000000000 +0200 -@@ -260,7 +260,19 @@ - else if (isclean & MIME_HIGHBIT) { - charset = wantcharset ? wantcharset : value("charset"); ++++ mime.c 2005-10-14 14:28:39.000000000 +0000 +@@ -261,7 +261,19 @@ getcharset(int isclean) + charset = (wantcharset && wantcharset != (char *)-1) ? + wantcharset : value("charset"); if (charset == NULL) { - charset = defcharset; + char *t = value("ttycharset"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
