Commit Graph

48 Commits

Author SHA1 Message Date
Gregory Neil Shapiro
7660b554bc Fix sendmail 8.12.10 import conflicts 2003-09-19 23:14:57 +00:00
Gregory Neil Shapiro
729362425c Fix conflicts from sendmail 8.12.9 import 2003-03-29 19:18:07 +00:00
Gregory Neil Shapiro
f9218d3d4f Fix conflicts from sendmail 8.12.8 import 2003-03-03 17:18:01 +00:00
Gregory Neil Shapiro
2ef40764f0 Resolve conflicts from sendmail 8.12.7 import 2003-02-08 20:35:51 +00:00
Gregory Neil Shapiro
518536da5d Even if biff is turned off, we still need to set curoff as the code
uses that if there is an error writing to the mailbox.  Note this bug
is only in the FreeBSD code, not the vendor code (which doesn't offer
nobiff).

PR:		misc/43392
MFC after:	3 days
2003-02-08 19:25:21 +00:00
Gregory Neil Shapiro
3edfa581ab Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
I don't have to manually resolve conflicts on every import.  Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.
2002-08-28 18:12:33 +00:00
Gregory Neil Shapiro
e1acb3f10e This commit was generated by cvs2svn to compensate for changes in r98841,
which included commits to RCS files with non-trunk default branches.
2002-06-26 02:48:44 +00:00
Gregory Neil Shapiro
739ac4d4d3 Import sendmail 8.12.5 2002-06-26 02:48:44 +00:00
Gregory Neil Shapiro
88ad41d4f0 Resolve conflicts from sendmail 8.12.4 import 2002-06-11 21:16:51 +00:00
Gregory Neil Shapiro
94c0120574 Import sendmail 8.12.4 2002-06-11 21:12:04 +00:00
Gregory Neil Shapiro
2c55319df3 This commit was generated by cvs2svn to compensate for changes in r98121,
which included commits to RCS files with non-trunk default branches.
2002-06-11 21:12:04 +00:00
Gregory Neil Shapiro
7320a0ab16 Resolve conflicts from import of post-8.12.3 bug fixes. 2002-04-20 20:34:16 +00:00
Gregory Neil Shapiro
6a2f2ff3e9 Import of post-8.12.3 bug fixes from vendor repository.
These are being imported for the upcoming FreeBSD 4.6 release.
2002-04-20 20:31:51 +00:00
Gregory Neil Shapiro
1e66b2bb25 This commit was generated by cvs2svn to compensate for changes in r95154,
which included commits to RCS files with non-trunk default branches.
2002-04-20 20:31:51 +00:00
Gregory Neil Shapiro
6b7c9af44b Remove files no longer in vendor release from vendor branch. 2002-04-20 19:51:37 +00:00
Gregory Neil Shapiro
320f00e768 Fix conflicts from sendmail 8.12.3 import 2002-04-10 03:06:22 +00:00
Gregory Neil Shapiro
605302a5c9 Import sendmail 8.12.3 2002-04-10 03:05:00 +00:00
Gregory Neil Shapiro
982281085c This commit was generated by cvs2svn to compensate for changes in r94334,
which included commits to RCS files with non-trunk default branches.
2002-04-10 03:05:00 +00:00
Gregory Neil Shapiro
39e37e7212 Fix mail.local build for non-sendmail.org code 2002-02-18 02:18:42 +00:00
Gregory Neil Shapiro
12ed1c7c81 Resolve conflicts from sendmail 8.12.2 import 2002-02-17 21:58:34 +00:00
Gregory Neil Shapiro
4026605903 Import sendmail 8.12.2 2002-02-17 21:56:45 +00:00
Gregory Neil Shapiro
5b587aff2d This commit was generated by cvs2svn to compensate for changes in r90792,
which included commits to RCS files with non-trunk default branches.
2002-02-17 21:56:45 +00:00
Gregory Neil Shapiro
6dbce3c381 Resolve conflicts from import of sendmail 8.11.5 2001-08-01 01:34:52 +00:00
Gregory Neil Shapiro
13058a9161 Import sendmail 8.11.5 2001-08-01 01:33:27 +00:00
Gregory Neil Shapiro
b466200952 Repair 8.11.3 merge conflicts 2001-02-28 00:22:47 +00:00
Gregory Neil Shapiro
602a2b1b1d Import sendmail 8.11.3 2001-02-28 00:19:57 +00:00
Gregory Neil Shapiro
c46d91b759 Repair 8.11.2 merge conflicts 2001-01-21 22:21:43 +00:00
Gregory Neil Shapiro
193538b7da Import sendmail 8.11.2 2001-01-21 22:17:06 +00:00
Gregory Neil Shapiro
3d1a10799a Add FreeBSD-only options to the getopt string
PR:		21544
Submitted by:	Peter Jeremy <peter.jeremy@alcatel.com.au>
2000-10-10 22:27:08 +00:00
Gregory Neil Shapiro
31305937b3 Add missing FreeBSD-only flag to the usage statement. 2000-10-01 16:32:16 +00:00
Gregory Neil Shapiro
d995d2ba6b Fix conflicts from merge of sendmail 8.11.1 2000-10-01 02:03:50 +00:00
Gregory Neil Shapiro
42e5d16589 Import of sendmail version 8.11.1 into vendor branch SENDMAIL with
release tag v8_11_1.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/
2000-10-01 01:49:02 +00:00
Gregory Neil Shapiro
a9ff8c001c This commit was generated by cvs2svn to compensate for changes in r66494,
which included commits to RCS files with non-trunk default branches.
2000-10-01 01:49:02 +00:00
Gregory Neil Shapiro
cd904b75f9 Add a FREEBSD-upgrade file describing what was done for the import
Remove obsolete files after the 8.11.0 import
2000-08-12 22:25:19 +00:00
Gregory Neil Shapiro
3299c2f123 Fix conflicts from merge of sendmail 8.11.0.
PR:		bin/11552 misc/18512 bin/15088
2000-08-12 22:19:16 +00:00
Gregory Neil Shapiro
06f25ae9f1 Import of sendmail version 8.11.0 into vendor branch SENDMAIL with
release tag v8_11_0.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/
2000-08-12 21:55:49 +00:00
Gregory Neil Shapiro
e8c96e01af This commit was generated by cvs2svn to compensate for changes in r64562,
which included commits to RCS files with non-trunk default branches.
2000-08-12 21:55:49 +00:00
Greg Lehey
c09813a5da Change location of temporary file from /tmp to /var/tmp. This is a
repeat of an earlier commit which apparently got lost with the last
import.  It helps solve the frequently reported problem

   pid 4032 (mail.local), uid 0 on /: file system full

(though there appears to be a lot of space) caused by idiots sending
30 MB mail messages.

Most-recently-reported-by:  jahanur <jahanur@jjsoft.com>

Add $FreeBSD$ so that I can check the file back in.

Rejected-by:	CVS
1999-12-17 01:18:44 +00:00
Peter Wemm
656ba99342 These files were replaced by symlinks in 8.9.2... 1999-01-12 13:24:46 +00:00
Peter Wemm
76b7bf7135 Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.
1999-01-12 12:38:06 +00:00
Peter Wemm
065a643db3 Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)
Obtained from: ftp.sendamil.org
1999-01-12 12:26:57 +00:00
Peter Wemm
c3debd01c8 This commit was generated by cvs2svn to compensate for changes in r42575,
which included commits to RCS files with non-trunk default branches.
1999-01-12 12:26:57 +00:00
Peter Wemm
05b73c60a4 I obviously cannot read. I misread the ifdef in the Makefile - DONT_FSYNC
was not on by default.. Back previous change out.
1998-08-04 13:56:32 +00:00
Peter Wemm
aa0c66bc41 Invert the sense of the -s flag (local addition). Instead of compiling
in the behavior via the previously default #define DONT_FSYNC, use the
-s flag to turn the fsync() behavior on.  This can be configured in
sendmail.cf without recompiling mail.local.
1998-08-04 13:46:46 +00:00
Peter Wemm
d615a19295 Copy original revs 1.2,1.3 - nofsync/nobiff support, usage update. 1998-08-04 13:14:21 +00:00
Peter Wemm
e3de8dc3d1 Copy original revs 1.2,1.3 - sort xrefs, document new -b and -s flags. 1998-08-04 13:11:42 +00:00
Peter Wemm
b2ee1660ba Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt. 1998-08-04 12:53:30 +00:00
Peter Wemm
c2aa98e247 Import sendmail-8.9.1 (slightly trimmed) onto a fresh branch under
src/contrib as per various discussions.  I will copy across our changes
and then point the Makefiles across once the dust has settled..
1998-08-03 05:56:20 +00:00