gshapiro
b1e5c9c5e5
Merge sendmail 8.14.3 into HEAD.
...
Note: As the first merge since the conversion to svn, it includes many
propset changes to get the proper svn:eol-style and svn:mime-type on the
files (as merged from the fixed up vendor/dist area).
MFC after: 3 days
2008-08-28 06:08:29 +00:00
gshapiro
e1f5440b9e
Resolve conflicts from sendmail 8.13.3 import
...
MFC after: 4 days
2005-02-14 02:39:14 +00:00
gshapiro
ca912893b4
Resolve conflicts from sendmail 8.13.1 import
2004-08-01 01:16:16 +00:00
gshapiro
e5769b57f4
Fix sendmail 8.12.11 import conflicts
2004-02-14 21:58:08 +00:00
gshapiro
a29eaca969
Cast the NULL to a pointer type for 64 bit architectures
...
Submitted by: harti
MFC after: 4 days
2003-10-31 22:12:09 +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
55f617e6f0
Resolve conflicts from sendmail 8.12.7 import
2003-02-08 20:35:51 +00:00
gshapiro
010f2e9171
MFS: Fix smrsh bypass bug.
2002-10-13 00:56:58 +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
3c674fdc70
Resolve conflicts from sendmail 8.12.4 import
2002-06-11 21:16:51 +00:00
gshapiro
69b6924bee
Resolve conflicts from import of post-8.12.3 bug fixes.
2002-04-20 20:34:16 +00:00
gshapiro
abfa0083ec
Resolve conflicts from sendmail 8.12.2 import
2002-02-17 21:58:34 +00:00
gshapiro
fe77e70108
Resolve conflicts from 8.11.4 import
2001-05-28 17:10:35 +00:00
gshapiro
d670e0b9fb
Repair 8.11.3 merge conflicts
2001-02-28 00:22:47 +00:00
gshapiro
e804c25caf
Repair 8.11.2 merge conflicts
2001-01-21 22:21:43 +00:00
gshapiro
1bbf49b55a
Fix conflicts from merge of sendmail 8.11.1
2000-10-01 02:03:50 +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
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
06f44fb6da
Copy original rev 1.2 - path updates for 4.4BSD so smrsh is more useable.
1998-08-04 13:08:41 +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
