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 - werner@suse.de
+
+- 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,