Gregory Neil Shapiro
bfb62e91d7
Resolve conflicts from sendmail 8.13.1 import
2004-08-01 01:16:16 +00:00
Gregory Neil Shapiro
6b3455a766
This commit was generated by cvs2svn to compensate for changes in r132943,
...
which included commits to RCS files with non-trunk default branches.
2004-08-01 01:04:57 +00:00
Gregory Neil Shapiro
e92d3f3ffe
Import sendmail 8.13.1
2004-08-01 01:04:57 +00:00
Gregory Neil Shapiro
e0e1e2d0a3
Follow the (good) trend of returning import files to vendor versions
...
where possible for easier future imports.
2003-02-23 21:58:16 +00:00
Gregory Neil Shapiro
13bd19636b
Import sendmail 8.12.7
2003-02-08 20:31:29 +00:00
Gregory Neil Shapiro
9e80f49658
This commit was generated by cvs2svn to compensate for changes in r110560,
...
which included commits to RCS files with non-trunk default branches.
2003-02-08 20:31:29 +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
739ac4d4d3
Import sendmail 8.12.5
2002-06-26 02:48:44 +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
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
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
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
c0c4794d84
Resolve conflicts from 8.11.4 import
2001-05-28 17:10:35 +00:00
Gregory Neil Shapiro
8774250cea
Import sendmail 8.11.4
2001-05-28 17:08:52 +00:00
Gregory Neil Shapiro
e66921d832
This commit was generated by cvs2svn to compensate for changes in r77349,
...
which included commits to RCS files with non-trunk default branches.
2001-05-28 17:08:52 +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
193538b7da
Import sendmail 8.11.2
2001-01-21 22:17:06 +00:00
Gregory Neil Shapiro
c0e6e8f8f8
This commit was generated by cvs2svn to compensate for changes in r71345,
...
which included commits to RCS files with non-trunk default branches.
2001-01-21 22:17:06 +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
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
Peter Wemm
e01d6f6164
Merge 8.9.2+patches -> 8.9.3 changes into mainline.
1999-02-07 09:43:30 +00:00
Peter Wemm
2e43090e08
Import sendmail 8.9.3 onto vendor branch, replacing previous interim
...
8.9.2 + patches version.
Obtained from: ftp.sendmail.org
1999-02-07 09:40:41 +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
c97fb50e13
Copy original rev 1.2 - fix usage line to match reality.
1998-08-04 13:09:38 +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
