Commit Graph

26 Commits

Author SHA1 Message Date
gshapiro
48cecd8a58 Merge sendmail 8.14.9 to HEAD
MFC after:	3 days
2014-05-22 04:39:17 +00:00
gshapiro
932f20d9d2 Merge sendmail 8.14.8 to HEAD
MFC after:	5 days
2014-01-26 23:39:11 +00:00
peter
ea50d71feb Stage 1 of sendmail dist tree flattening. contrib/sendmail/contrib
prevents doing this in one pass.
2008-08-28 02:25:51 +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
9883351c45 Import sendmail 8.13.3 2005-02-14 02:30:00 +00:00
gshapiro
ca912893b4 Resolve conflicts from sendmail 8.13.1 import 2004-08-01 01:16:16 +00:00
gshapiro
1fc446a819 Import sendmail 8.13.1 2004-08-01 01:04:57 +00:00
gshapiro
e5769b57f4 Fix sendmail 8.12.11 import conflicts 2004-02-14 21:58:08 +00:00
gshapiro
238623a020 Import sendmail 8.12.11 2004-02-14 21:53:31 +00:00
gshapiro
ff300598d7 Fix sendmail 8.12.10 import conflicts 2003-09-19 23:14:57 +00:00
gshapiro
96b960fca6 Import sendmail 8.12.10 2003-09-19 23:11:30 +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
faacdfb2c2 Import sendmail 8.12.4 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
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
e804c25caf Repair 8.11.2 merge conflicts 2001-01-21 22:21:43 +00:00
gshapiro
167a83e7b8 Import sendmail 8.11.2 2001-01-21 22:17:06 +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
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
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