File mailx-12.2.dif of Package mailx
--- .pkgextract
+++ .pkgextract 2006-07-20 13:42:19.000000000 +0200
@@ -0,0 +1,5 @@
+patch -p 0 -s --suffix=".path" < ../nail-11.25-path.dif
+patch -p 0 -s --suffix=".rplyto" < ../mailx-12.1-replyto.patch
+patch -p 0 -s --suffix=".ttychr" < ../nail-11.25-ttychar.dif
+patch -p 0 -s --suffix=".toaddr" < ../nail-11.25-toaddr.dif
+patch -p 0 -s --suffix=".mime" < ../mailx-12.2-mime.dif
--- Makefile
+++ Makefile 2007-04-17 12:12:48.536367085 +0200
@@ -10,6 +10,7 @@ PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man
SYSCONFDIR = /etc
+MAILRC = /etc/mail.rc
DESTDIR =
@@ -51,7 +52,7 @@ SHELL = /bin/sh
#
# Binaries are stripped with this command after installation.
#
-STRIP = strip
+STRIP = true
###########################################################################
###########################################################################
--- aux.c
+++ aux.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)aux.c 2.83 (
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <sys/stat.h>
--- base64.c
+++ base64.c 2006-07-20 13:42:19.000000000 +0200
@@ -33,6 +33,7 @@ static char sccsid[] = "@(#)base64.c 2.1
* base64 functions
*/
+#include "config.h"
#include "rcv.h"
#include "extern.h"
--- cmd1.c
+++ cmd1.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)cmd1.c 2.96
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#ifdef HAVE_WCWIDTH
--- cmd2.c
+++ cmd2.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)cmd2.c 2.46
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <sys/wait.h>
--- cmd3.c
+++ cmd3.c 2006-07-20 13:42:19.000000000 +0200
@@ -44,6 +44,7 @@ static char sccsid[] = "@(#)cmd3.c 2.84
#include <math.h>
#include <float.h>
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <unistd.h>
--- cmdtab.c
+++ cmdtab.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)cmdtab.c 2.5
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
--- collect.c
+++ collect.c 2006-07-20 13:42:19.000000000 +0200
@@ -49,6 +49,7 @@ static char sccsid[] = "@(#)collect.c 2.
* ~ escapes.
*/
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <unistd.h>
--- dotlock.c
+++ dotlock.c 2006-07-20 13:42:19.000000000 +0200
@@ -38,6 +38,7 @@ static char sccsid[] = "@(#)dotlock.c 2.
#endif
#endif
+#include "config.h"
#include "rcv.h"
#include <sys/stat.h>
#include <unistd.h>
--- edit.c
+++ edit.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)edit.c 2.24
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <sys/stat.h>
--- fio.c
+++ fio.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)fio.c 2.71 (
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include <sys/stat.h>
#include <sys/file.h>
--- getname.c
+++ getname.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)getname.c 2.
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include <pwd.h>
#include "extern.h"
--- head.c
+++ head.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)head.c 2.17
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <time.h>
--- hmac.c
+++ hmac.c 2006-07-20 13:42:19.000000000 +0200
@@ -32,6 +32,7 @@ Appendix -- Sample Code
/* Sccsid @(#)hmac.c 1.8 (gritter) 3/4/06 */
+#include "config.h"
#include "rcv.h"
#include "md5.h"
--- imap_gssapi.c
+++ imap_gssapi.c 2006-07-20 13:42:19.000000000 +0200
@@ -73,6 +73,8 @@ static char sccsid[] = "@(#)imap_gssapi.
#endif
#endif /* not lint */
+#include "config.h"
+
/*
* Implementation of IMAP GSSAPI authentication according to RFC 1731.
*/
--- lex.c
+++ lex.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)lex.c 2.86 (
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <errno.h>
--- list.c
+++ list.c 2006-07-20 13:42:19.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)list.c 2.61
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include <ctype.h>
#include "extern.h"
--- mail.rc
+++ mail.rc 2006-07-20 13:42:19.000000000 +0200
@@ -0,0 +1,2 @@
+set asksub append dot save crt=20
+ignore Received Message-Id Resent-Message-Id Status Mail-From Return-Path Via
--- mailx.1
+++ mailx.1 2006-07-20 13:42:22.000000000 +0200
@@ -164,7 +164,7 @@ Only applicable in combination with
.IR \-f .
.TP
.B \-n
-Inhibits reading /etc/nail.rc upon startup.
+Inhibits reading /etc/mail.rc upon startup.
This option should be activated for
.I mailx
scripts that are invoked on more than one machine,
@@ -3062,7 +3062,7 @@ in the user's home directory.
The name of an optional startup file
to be read after ~/.mailrc.
This variable is ignored if it is imported from the environment;
-it has an effect only if it is set in /etc/nail.rc or ~/.mailrc
+it has an effect only if it is set in /etc/mail.rc or ~/.mailrc
to allow bypassing the configuration with e. g. `MAILRC=/dev/null'.
Use this file for commands
that are not understood by other mailx implementations.
@@ -3637,7 +3637,7 @@ Used as directory for temporary files in
~/.mailrc
File giving initial commands.
.TP
-/etc/nail.rc
+/etc/mail.rc
System wide initialization file.
.TP
~/.mime.types
--- main.c
+++ main.c 2006-07-20 14:13:32.000000000 +0200
@@ -92,7 +92,7 @@ int
main(int argc, char *argv[])
{
const char optstr[] = "A:BHFINVT:R\rS:a:b:c:dDefh:inqr:s:tu:v~";
- int i, existonly = 0, headersonly = 0, sendflag = 0;
+ int i, existonly = 0, headersonly = 0, sendflag = 0, err = 1;
struct name *to, *cc, *bcc, *smopts, *replyto;
struct attachment *attach;
char *subject, *cp, *ef, *qf = NULL, *fromaddr = NULL, *Aflag = NULL;
@@ -395,8 +395,11 @@ main(int argc, char *argv[])
case '?':
usage:
fprintf(stderr, catgets(catd, CATSET, 135,
-"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);
- exit(2);
+"Usage: %s [-BDFintv~] [-s subject] [-a attachment ] [-c cc-addr] [-b bcc-addr]\n\
+ [-r from-addr] [-h hops] [-A account] [-R reply-addr] [-S option] to-addr ...\n\
+ %s [-BDeHiInNRv~] [-T name] [-A account] -f [name] [-S option]\n\
+ %s [-BDeinNRv~] [-A account] [-u user] [-S option]\n"), progname, progname, progname);
+ exit(err);
}
}
if (ef != NULL) {
@@ -437,11 +440,13 @@ usage:
goto usage;
}
if (Rflag && to != NULL) {
- fprintf(stderr, "The -R option is meaningless in send mode.\n");
+ fprintf(stderr, catgets(catd, CATSET, 269,
+ "The -R option is meaningless in send mode.\n"));
goto usage;
}
if (replyto && to == NULL) {
- fprintf(stderr, "The reply-to is meaningless not in send mode.\n");
+ fprintf(stderr, catgets(catd, CATSET, 270,
+ "The reply-to is meaningless not in send mode.\n"));
goto usage;
}
if (Iflag && ef == NULL) {
--- makeconfig
+++ makeconfig 2006-07-20 13:42:19.000000000 +0200
@@ -298,23 +298,49 @@ int main(void)
'for socket functionality in libsocket and libnsl' \
'#define HAVE_SOCKETS' '-lsocket -lnsl'
-#link_check 'for IPv6 functionality' '#define HAVE_IPv6_FUNCS' <<\!
-##include "config.h"
-##include <sys/types.h>
-##include <sys/socket.h>
-##include <netdb.h>
-##include <netinet/in.h>
-##ifdef HAVE_ARPA_INET_H
-##include <arpa/inet.h>
-##endif /* HAVE_ARPA_INET_H */
-#
-#int main(void)
-#{
-# struct addrinfo a, *ap;
-# getaddrinfo("foo", "0", &a, &ap);
-# return 0;
-#}
-#!
+
+cat >$tmp1.c <<\!
+#include "config.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif /* HAVE_ARPA_INET_H */
+
+int main()
+{
+ struct addrinfo a, *ap;
+ getaddrinfo("foo", "0", &a, &ap);
+ return 0;
+}
+!
+
+cat >$tmp2.c <<\!
+#include "config.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif /* HAVE_ARPA_INET_H */
+
+int main()
+{
+ struct sockaddr a;
+ getnameinfo(&a, 0, "foo", 3, "bar", 3, NI_NUMERICHOST);
+ return 0;
+}
+!
+
+<$tmp1.c link_check 'for IPv6 functionality getaddrinfo' '#define HAVE_GETADDRINFO' &&
+ <$tmp2.c link_check 'for IPv6 functionality getnameinfo' '#define HAVE_GETNAMEINFO'
+echo \
+'#if defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO)
+# define HAVE_IPv6_FUNCS
+#endif' >>$out
link_check 'for Network Security Services (NSS)' '#define USE_SSL
#define USE_NSS' '-lsmime3 -lnss3 -lssl3 -lnspr4 -lplc4' <<\! || \
--- md5.c
+++ md5.c 2006-07-20 13:42:19.000000000 +0200
@@ -33,6 +33,7 @@ documentation and/or software.
/* Sccsid @(#)md5.c 1.8 (gritter) 3/4/06 */
+#include "config.h"
#include "rcv.h"
#include "md5.h"
--- mime.c
+++ mime.c 2006-07-20 13:42:19.000000000 +0200
@@ -44,6 +44,7 @@ static char sccsid[] = "@(#)mime.c 2.67
#endif /* DOSCCS */
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <ctype.h>
--- names.c
+++ names.c 2006-07-20 13:42:22.000000000 +0200
@@ -48,6 +48,7 @@ static char sccsid[] = "@(#)names.c 2.22
* Handle name lists.
*/
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <sys/stat.h>
--- nsserr.c
+++ nsserr.c 2006-07-20 13:42:22.000000000 +0200
@@ -29,6 +29,7 @@
/* "@(#)nsserr.c 1.3 (gritter) 3/4/06" */
+#include "config.h"
#include <sslerr.h>
#include <secerr.h>
--- popen.c
+++ popen.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)popen.c 2.20
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <sys/stat.h>
--- quit.c
+++ quit.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)quit.c 2.28
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <stdio.h>
--- send.c
+++ send.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)send.c 2.83
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <time.h>
--- sendout.c
+++ sendout.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)sendout.c 2.
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <errno.h>
--- smtp.c
+++ smtp.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)smtp.c 2.38
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include <sys/utsname.h>
--- strings.c
+++ strings.c 2006-07-20 13:42:22.000000000 +0200
@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)strings.c 2.
* loop each time, so they need not be freed.
*/
+#include "config.h"
#include "rcv.h"
#include "extern.h"
--- temp.c
+++ temp.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)temp.c 2.8 (
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <errno.h>
--- tty.c
+++ tty.c 2006-07-20 13:42:22.000000000 +0200
@@ -48,6 +48,7 @@ static char sccsid[] = "@(#)tty.c 2.28 (
* Generally useful tty stuff.
*/
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <errno.h>
--- v7.local.c
+++ v7.local.c 2006-07-20 13:42:22.000000000 +0200
@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)v7.local.c 2
* Local routines that are installation dependent.
*/
+#include "config.h"
#include "rcv.h"
#include "extern.h"
#include <sys/stat.h>
--- vars.c
+++ vars.c 2006-07-20 13:42:22.000000000 +0200
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)vars.c 2.11
#endif
#endif /* not lint */
+#include "config.h"
#include "rcv.h"
#include "extern.h"
--- catd/en_US
+++ catd/en_US 2006-07-20 14:48:28.000000000 +0200
@@ -180,7 +180,10 @@ The following ~ escapes are defined:\n\
132 No applicable messages\n
133 %d: Inappropriate message\n
134 Unknown metachar (%c)\n
-135 Usage: %s -eiIUdFntBNHV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -b USERS -c USERS users\n
+135 $Usage: %s [-BDFintv~] [-s subject] [-a attachment ] [-c cc-addr] [-b bcc-addr]\n\
+ [-r from-addr] [-h hops] [-A account] [-R reply-addr] [-S option] to-addr ...\n\
+ %s [-BDeHiInNRv~] [-T name] [-A account] -f [name] [-S option]\n\
+ %s [-BDeinNRv~] [-A account] [-u user] [-S option]\n
136 --- DELETED ---
137 Cannot give -f and people to send to.\n
138 Send options without primary recipient specified.\n
@@ -314,3 +317,5 @@ The following ~ escapes are defined:\n\
266 Ignoring header field "%s"\n
267 Restoring deleted header lines\n
268 Pipe to: "%s"\n
+269 The -R option is meaningless in send mode.\n
+270 The reply-to is meaningless not in send mode.\n
