aboutsummaryrefslogtreecommitdiff
path: root/mail/sendmail811/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/sendmail811/files')
-rw-r--r--mail/sendmail811/files/patch-aa263
-rw-r--r--mail/sendmail811/files/patch-daemon.c39
-rw-r--r--mail/sendmail811/files/patch-parseaddr.c15
-rw-r--r--mail/sendmail811/files/patch-vacation.141
-rw-r--r--mail/sendmail811/files/pkg-milter5
-rw-r--r--mail/sendmail811/files/site.config.m48
-rw-r--r--mail/sendmail811/files/site.config.m4.ipv62
-rw-r--r--mail/sendmail811/files/site.config.m4.ldap5
-rw-r--r--mail/sendmail811/files/site.config.m4.milter2
-rw-r--r--mail/sendmail811/files/site.config.m4.pre43
-rw-r--r--mail/sendmail811/files/site.config.m4.sasl5
-rw-r--r--mail/sendmail811/files/site.config.m4.sfio6
-rw-r--r--mail/sendmail811/files/site.config.m4.ssl3
-rw-r--r--mail/sendmail811/files/site.config.m4.tls5
14 files changed, 0 insertions, 402 deletions
diff --git a/mail/sendmail811/files/patch-aa b/mail/sendmail811/files/patch-aa
deleted file mode 100644
index 1bbc4bb837e1..000000000000
--- a/mail/sendmail811/files/patch-aa
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
---- cf/m4/cfhead.m4 Thu Aug 24 19:09:50 2000
-+++ src/contrib/sendmail/cf/m4/cfhead.m4 Mon Nov 6 11:23:40 2000
-@@ -214,7 +215,8 @@
- define(`_REC_FULL_AUTH_', `$.$?{auth_type}(authenticated as ${auth_authen} $?{auth_author}for ${auth_author} $.with ${auth_type}')
- define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
- define(`_REC_END_', `for $u; $|;
-- $.$b')
-+ $.$b$?g
-+ (envelope-from $g)$.')
- define(`_REC_TLS_', `(using ${tls_version} with cipher ${cipher} (${cipher_bits} bits) verified ${verify})$.$?u')
- define(`_REC_BY_', `$.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version}')
- define(`confRECEIVED_HEADER', `_REC_HDR_
-diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
---- cf/ostype/bsd4.4.m4 Sun Apr 25 22:00:56 1999
-+++ src/contrib/sendmail/cf/ostype/bsd4.4.m4 Wed Oct 4 23:19:29 2000
-@@ -16,5 +16,6 @@
- divert(0)
- VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $')
- ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
- ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
-+ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
- ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
-diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
---- cf/sh/makeinfo.sh Sun Feb 7 08:26:25 1999
-+++ src/contrib/sendmail/cf/sh/makeinfo.sh Wed Oct 4 23:19:29 2000
-@@ -52,7 +54,7 @@
- else
- host=`uname -n`
- fi
--echo '#####' built by $user@$host on `date`
-+echo '#####' built by $user@$host on `LC_ALL=C LC_TIME=C date`
- echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
- echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
- echo "define(\`__HOST__', $host)dnl"
-diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
---- mail.local/mail.local.8.orig Fri Dec 29 19:12:16 2000
-+++ mail.local/mail.local.8 Sun Dec 31 10:27:40 2000
-@@ -16,7 +16,7 @@
- \- store mail in a mailbox
- .SH SYNOPSIS
- .B mail.local
--.RB [ \-7 "] [" \-b "] [" \-d "] [" \-l "] [" \-f
-+.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f
- .IR from "] "
- .RB [ \-r
- .IR from "] " "user ..."
-@@ -34,6 +36,11 @@
- .B \-7
- Do not advertise 8BITMIME support in LMTP mode.
- .TP
-+.B \-B
-+Turn off the attempts to notify the
-+.Dq biff
-+service.
-+.TP
- .B \-b
- Return a permanent error instead of a temporary error
- if a mailbox exceeds quota.
-@@ -46,6 +53,13 @@
- .TP
- .B \-l
- Turn on LMTP mode.
-+.TP
-+.B \-s
-+Turn off the
-+.Xr fsync 2
-+call that forces the mailbox to be committed to disk before returning a
-+.Dq success
-+status.
- .TP
- .BI \-r " from"
- Specify the sender's name (for backward compatibility).
-@@ -93,7 +107,6 @@
- .PD
- .SH SEE ALSO
- mail(1),
--xsend(1),
- flock(2),
- getservbyname(3),
- comsat(8),
-diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
---- mail.local/mail.local.c Sun Feb 11 21:08:20 2001
-+++ src/contrib/sendmail/mail.local/mail.local.c Mon Mar 5 21:48:22 2001
-@@ -154,7 +156,7 @@
-
- # if defined(BSD4_4) || defined(__GLIBC__)
- # include <paths.h>
--# define _PATH_LOCTMP "/tmp/local.XXXXXX"
-+# define _PATH_LOCTMP "/var/tmp/local.XXXXXX"
- # endif /* defined(BSD4_4) || defined(__GLIBC__) */
-
- # ifdef BSD4_4
-@@ -215,7 +217,7 @@
- # endif /* USE_SETRESUID */
-
- # ifndef _PATH_LOCTMP
--# define _PATH_LOCTMP "/tmp/local.XXXXXX"
-+# define _PATH_LOCTMP "/var/tmp/local.XXXXXX"
- # endif /* ! _PATH_LOCTMP */
- # ifndef _PATH_MAILDIR
- # define _PATH_MAILDIR "/var/spool/mail"
-@@ -252,6 +254,8 @@
- bool HoldErrs = FALSE; /* Hold errors in ErrBuf */
- bool LMTPMode = FALSE;
- bool BounceQuota = FALSE; /* permanent error when over quota */
-+bool nobiff = FALSE;
-+bool nofsync = FALSE;
-
- void deliver __P((int, char *));
- int e_to_sys __P((int));
-@@ -291,7 +295,7 @@
- # endif /* LOG_MAIL */
-
- from = NULL;
-- while ((ch = getopt(argc, argv, "7bdf:r:l")) != -1)
-+ while ((ch = getopt(argc, argv, "7Bbdf:r:ls")) != -1)
- {
- switch(ch)
- {
-@@ -299,6 +303,10 @@
- EightBitMime = FALSE;
- break;
-
-+ case 'B':
-+ nobiff = TRUE;
-+ break;
-+
- case 'b': /* bounce mail when over quota. */
- BounceQuota = TRUE;
- break;
-@@ -320,6 +328,10 @@
- LMTPMode = TRUE;
- break;
-
-+ case 's':
-+ nofsync++;
-+ break;
-+
- case '?':
- default:
- usage();
-@@ -329,7 +341,8 @@
- argv += optind;
-
- /* initialize biff structures */
-- notifybiff(NULL);
-+ if (!nobiff)
-+ notifybiff(NULL);
-
- if (LMTPMode)
- {
-@@ -1135,14 +1148,17 @@
- goto err1;
- }
-
-- /* Get the starting offset of the new message for biff. */
-- curoff = lseek(mbfd, (off_t) 0, SEEK_END);
-- if (sizeof curoff > sizeof(long))
-- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
-- name, quad_to_string(curoff));
-- else
-- (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%ld\n",
-- name, (long) curoff);
-+ if (!nobiff)
-+ {
-+ /* Get the starting offset of the new message for biff. */
-+ curoff = lseek(mbfd, (off_t) 0, SEEK_END);
-+ if (sizeof curoff > sizeof(long))
-+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
-+ name, quad_to_string(curoff));
-+ else
-+ (void) snprintf(biffmsg, sizeof(biffmsg), "%s@%ld\n",
-+ name, (long) curoff);
-+ }
-
- /* Copy the message into the file. */
- if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1)
-@@ -1203,7 +1219,7 @@
- }
-
- /* Flush to disk, don't wait for update. */
-- if (fsync(mbfd) < 0)
-+ if (!nofsync && fsync(mbfd) < 0)
- {
- mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
- err3:
-@@ -1229,7 +1245,7 @@
- mailerr(errcode, "%s: %s", path, errstring(errno));
- (void) truncate(path, curoff);
- }
-- else
-+ else if (!nobiff)
- notifybiff(biffmsg);
-
- if (setreuid(0, 0) < 0)
-@@ -1408,7 +1424,7 @@
- usage()
- {
- ExitVal = EX_USAGE;
-- mailerr(NULL, "usage: mail.local [-7] [-b] [-l] [-f from] user ...");
-+ mailerr(NULL, "usage: mail.local [-7] [-B] [-b] [-l] [-f from] [-s] user ...");
- exit(ExitVal);
- }
-
-diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
---- rmail/rmail.c Sun Sep 17 00:20:25 2000
-+++ src/contrib/sendmail/rmail/rmail.c Mon Nov 6 11:23:42 2000
-@@ -318,7 +320,11 @@
- args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */
- args[i++] = "-G"; /* relay submission */
- args[i++] = "-oee"; /* No errors, just status. */
-+#ifdef QUEUE_ONLY
- args[i++] = "-odq"; /* Queue it, don't try to deliver. */
-+#else
-+ args[i++] = "-odi"; /* Deliver in foreground. */
-+#endif
- args[i++] = "-oi"; /* Ignore '.' on a line by itself. */
-
- /* set from system and protocol used */
-diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
---- smrsh/smrsh.8.orig Sat Dec 16 00:18:40 2000
-+++ smrsh/smrsh.8 Sun Dec 31 10:37:02 2000
-@@ -39,7 +41,7 @@
- .I smrsh
- limits programs to be in a single directory,
- by default
--/usr/adm/sm.bin,
-+/usr/libexec/sm.bin,
- allowing the system administrator to choose the set of acceptable commands,
- and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
- It also rejects any commands with the characters
-@@ -50,13 +52,12 @@
- ``"|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user || exit 75"''
- .PP
- Initial pathnames on programs are stripped,
--so forwarding to ``/usr/ucb/vacation'',
--``/usr/bin/vacation'',
-+so forwarding to ``/usr/bin/vacation'',
- ``/home/server/mydir/bin/vacation'',
- and
- ``vacation''
- all actually forward to
--``/usr/adm/sm.bin/vacation''.
-+``/usr/libexec/sm.bin/vacation''.
- .PP
- System administrators should be conservative about populating
- the sm.bin directory.
-@@ -78,11 +79,11 @@
- Compilation should be trivial on most systems.
- You may need to use \-DPATH=\e"\fIpath\fP\e"
- to adjust the default search path
--(defaults to ``/bin:/usr/bin:/usr/ucb'')
-+(defaults to ``/bin:/usr/bin'')
- and/or \-DCMDBIN=\e"\fIdir\fP\e"
- to change the default program directory
--(defaults to ``/usr/adm/sm.bin'').
-+(defaults to ``/usr/libexec/sm.bin'').
- .SH FILES
--/usr/adm/sm.bin \- directory for restricted programs
-+/usr/libexec/sm.bin \- directory for restricted programs
- .SH SEE ALSO
- sendmail(8)
diff --git a/mail/sendmail811/files/patch-daemon.c b/mail/sendmail811/files/patch-daemon.c
deleted file mode 100644
index 5ed34a14e2c8..000000000000
--- a/mail/sendmail811/files/patch-daemon.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- sendmail/daemon.c 2001/08/01 03:19:45 1.1.1.3.2.6
-+++ sendmail/daemon.c 2001/09/09 19:31:37
-@@ -1877,17 +1877,6 @@
- gothostent:
- if (hp == NULL)
- {
--# if NAMED_BIND
-- /* check for name server timeouts */
-- if (errno == ETIMEDOUT || h_errno == TRY_AGAIN ||
-- (errno == ECONNREFUSED && UseNameServer))
-- {
-- save_errno = errno;
-- mci_setstat(mci, EX_TEMPFAIL, "4.4.3", NULL);
-- errno = save_errno;
-- return EX_TEMPFAIL;
-- }
--# endif /* NAMED_BIND */
- # if NETINET6
- /*
- ** Try v6 first, then fall back to v4.
-@@ -1903,6 +1892,17 @@
- if (v6found)
- goto v6tempfail;
- # endif /* NETINET6 */
-+# if NAMED_BIND
-+ /* check for name server timeouts */
-+ if (errno == ETIMEDOUT || h_errno == TRY_AGAIN ||
-+ (errno == ECONNREFUSED && UseNameServer))
-+ {
-+ save_errno = errno;
-+ mci_setstat(mci, EX_TEMPFAIL, "4.4.3", NULL);
-+ errno = save_errno;
-+ return EX_TEMPFAIL;
-+ }
-+# endif /* NAMED_BIND */
- save_errno = errno;
- mci_setstat(mci, EX_NOHOST, "5.1.2", NULL);
- errno = save_errno;
-
diff --git a/mail/sendmail811/files/patch-parseaddr.c b/mail/sendmail811/files/patch-parseaddr.c
deleted file mode 100644
index b6fd6fffff0a..000000000000
--- a/mail/sendmail811/files/patch-parseaddr.c
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u -r8.359.2.8 parseaddr.c
---- sendmail/parseaddr.c 3 Apr 2003 16:20:54 -0000 8.359.2.8
-+++ sendmail/parseaddr.c 16 Sep 2003 18:06:22 -0000
-@@ -700,7 +700,11 @@
- addr[MAXNAME] = '\0';
- returnnull:
- if (delimptr != NULL)
-+ {
-+ if (p > addr)
-+ --p;
- *delimptr = p;
-+ }
- CurEnv->e_to = saveto;
- return NULL;
- }
diff --git a/mail/sendmail811/files/patch-vacation.1 b/mail/sendmail811/files/patch-vacation.1
deleted file mode 100644
index c120a23fb873..000000000000
--- a/mail/sendmail811/files/patch-vacation.1
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur vacation/vacation.1 src/contrib/sendmail/vacation/vacation.1
---- vacation/vacation.1 Fri Dec 29 19:12:23 2000
-+++ vacation/vacation.1 Sat Mar 3 11:27:12 2001
-@@ -24,8 +26,10 @@
- .RB [ \-x ]
- .RB [ \-a
- .IR alias ]
-+.RB [ \-d ]
- .RB [ \-f
- .IR database ]
-+.RB [ \-l ]
- .RB [ \-m
- .IR message ]
- .RB [ \-s
-@@ -59,6 +63,15 @@
- in the same manner as those received for the user's
- login name.
- .TP
-+.B \-d
-+Send error/debug messages to stdout instead of syslog.
-+Otherwise, fatal errors, such as calling
-+.B vacation
-+with incorrect arguments, or with non-existent
-+.IR login s,
-+are logged in the system log file, using
-+syslog(8).
-+.TP
- .BI \-f " filename"
- Use
- .I filename
-@@ -78,6 +91,10 @@
- Same as
- .B \-i
- (for backwards compatibility).
-+.TP
-+.B \-l
-+List the content of the vacation database file including the address
-+and the associated time of the last auto-response to that address.
- .TP
- .BI \-m " filename"
- Use
diff --git a/mail/sendmail811/files/pkg-milter b/mail/sendmail811/files/pkg-milter
deleted file mode 100644
index 78d9d64c0a6f..000000000000
--- a/mail/sendmail811/files/pkg-milter
+++ /dev/null
@@ -1,5 +0,0 @@
-include/libmilter/mfapi.h
-lib/libmilter.a
-lib/libsmutil.a
-@dirrm include/libmilter
-%%PORTDOCS%%share/doc/sendmail/MILTER
diff --git a/mail/sendmail811/files/site.config.m4 b/mail/sendmail811/files/site.config.m4
deleted file mode 100644
index adc2b11bf108..000000000000
--- a/mail/sendmail811/files/site.config.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-define(`confEBINDIR',`%%PREFIX%%/libexec')
-define(`confMANROOT',`%%PREFIX%%/man/cat')
-define(`confMANROOTMAN',`%%PREFIX%%/man/man')
-define(`confMBINDIR',`%%PREFIX%%/sbin')
-define(`confSBINDIR',`%%PREFIX%%/sbin')
-define(`confUBINDIR',`%%PREFIX%%/bin')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail811/files/site.config.m4.ipv6 b/mail/sendmail811/files/site.config.m4.ipv6
deleted file mode 100644
index 41f0cccf3a1d..000000000000
--- a/mail/sendmail811/files/site.config.m4.ipv6
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
-APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
diff --git a/mail/sendmail811/files/site.config.m4.ldap b/mail/sendmail811/files/site.config.m4.ldap
deleted file mode 100644
index c03a8749c808..000000000000
--- a/mail/sendmail811/files/site.config.m4.ldap
+++ /dev/null
@@ -1,5 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DLDAPMAP')
-APPENDDEF(`conf_sendmail_LIBS', `-lldap')
-APPENDDEF(`conf_sendmail_LIBS', `-llber')
diff --git a/mail/sendmail811/files/site.config.m4.milter b/mail/sendmail811/files/site.config.m4.milter
deleted file mode 100644
index 6fa49ec50d17..000000000000
--- a/mail/sendmail811/files/site.config.m4.milter
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_libmilter_ENVDEF', `-D_FFR_MILTER=1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MILTER=1')
diff --git a/mail/sendmail811/files/site.config.m4.pre4 b/mail/sendmail811/files/site.config.m4.pre4
deleted file mode 100644
index 384a8ec2334e..000000000000
--- a/mail/sendmail811/files/site.config.m4.pre4
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
diff --git a/mail/sendmail811/files/site.config.m4.sasl b/mail/sendmail811/files/site.config.m4.sasl
deleted file mode 100644
index c1140b4d19f3..000000000000
--- a/mail/sendmail811/files/site.config.m4.sasl
+++ /dev/null
@@ -1,5 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail811/files/site.config.m4.sfio b/mail/sendmail811/files/site.config.m4.sfio
deleted file mode 100644
index 9abe6d48d7b3..000000000000
--- a/mail/sendmail811/files/site.config.m4.sfio
+++ /dev/null
@@ -1,6 +0,0 @@
-define(`confSTDIO_TYPE', `portable')
-APPENDDEF(`confENVDEF', `-U_FFR_TLS_TOREK -DSFIO')
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include/sfio')
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`confLIBS', `-lsfio')
diff --git a/mail/sendmail811/files/site.config.m4.ssl b/mail/sendmail811/files/site.config.m4.ssl
deleted file mode 100644
index 801030866543..000000000000
--- a/mail/sendmail811/files/site.config.m4.ssl
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib' -rpath=%%LOCALBASE%%/lib )
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV')
diff --git a/mail/sendmail811/files/site.config.m4.tls b/mail/sendmail811/files/site.config.m4.tls
deleted file mode 100644
index 40cfc2e0f1c5..000000000000
--- a/mail/sendmail811/files/site.config.m4.tls
+++ /dev/null
@@ -1,5 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_O_T')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_TOREK')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')