gshapiro
ca912893b4
Resolve conflicts from sendmail 8.13.1 import
2004-08-01 01:16:16 +00:00
gshapiro
54475e3825
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
gshapiro
1fc446a819
Import sendmail 8.13.1
2004-08-01 01:04:57 +00:00
gshapiro
99b99437f7
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
gshapiro
842b56b9ca
Import sendmail 8.12.7
2003-02-08 20:31:29 +00:00
gshapiro
7bd0c4fe89
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
gshapiro
fd175e74b3
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
gshapiro
fc4e7b69e3
Import sendmail 8.12.5
2002-06-26 02:48:44 +00:00
gshapiro
ccc8f9377a
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
gshapiro
3c674fdc70
Resolve conflicts from sendmail 8.12.4 import
2002-06-11 21:16:51 +00:00
gshapiro
faacdfb2c2
Import sendmail 8.12.4
2002-06-11 21:12:04 +00:00
gshapiro
4c57fa1987
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
gshapiro
69b6924bee
Resolve conflicts from import of post-8.12.3 bug fixes.
2002-04-20 20:34:16 +00:00
gshapiro
e226f8e879
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
gshapiro
f75ef4430b
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
gshapiro
ce3eb17302
Remove files no longer in vendor release from vendor branch.
2002-04-20 19:51:37 +00:00
gshapiro
9e3bd35cd7
Import sendmail 8.12.3
2002-04-10 03:05:00 +00:00
gshapiro
58b10b6d32
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
gshapiro
abfa0083ec
Resolve conflicts from sendmail 8.12.2 import
2002-02-17 21:58:34 +00:00
gshapiro
8449595fe9
Import sendmail 8.12.2
2002-02-17 21:56:45 +00:00
gshapiro
514d1553cc
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
gshapiro
fe77e70108
Resolve conflicts from 8.11.4 import
2001-05-28 17:10:35 +00:00
gshapiro
5338b6ff5f
Import sendmail 8.11.4
2001-05-28 17:08:52 +00:00
gshapiro
175e3eb50e
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
gshapiro
d670e0b9fb
Repair 8.11.3 merge conflicts
2001-02-28 00:22:47 +00:00
gshapiro
8d82727087
Import sendmail 8.11.3
2001-02-28 00:19:57 +00:00
gshapiro
167a83e7b8
Import sendmail 8.11.2
2001-01-21 22:17:06 +00:00
gshapiro
c5e098efbe
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
gshapiro
1bbf49b55a
Fix conflicts from merge of sendmail 8.11.1
2000-10-01 02:03:50 +00:00
gshapiro
f84ac9120c
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
gshapiro
74c280481f
Fix conflicts from merge of sendmail 8.11.0.
...
PR: bin/11552 misc/18512 bin/15088
2000-08-12 22:19:16 +00:00
gshapiro
4332139a9a
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
gshapiro
c3cd75415d
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
486a3d0d3f
Merge 8.9.2+patches -> 8.9.3 changes into mainline.
1999-02-07 09:43:30 +00:00
peter
19c8fca2df
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
acf90526f4
These files were replaced by symlinks in 8.9.2...
1999-01-12 13:24:46 +00:00
peter
5b758ef6d8
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
2a7bd60222
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
f1740d7340
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
7b0b9a733e
Copy original rev 1.2 - fix usage line to match reality.
1998-08-04 13:09:38 +00:00
peter
d9ec7e26a2
Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.
1998-08-04 12:53:30 +00:00
peter
3299490505
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