Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/gnu/dist/sendmail Pull up revision 1.4 (requested by it...
details: https://anonhg.NetBSD.org/src/rev/c9169835a1e0
branches: netbsd-1-5
changeset: 490778:c9169835a1e0
user: he <he%NetBSD.org@localhost>
date: Fri Mar 09 17:49:01 2001 +0000
description:
Pull up revision 1.4 (requested by itojun):
Upgrade to sendmail 8.11.3.
diffstat:
gnu/dist/sendmail/INSTALL | 7 +-
gnu/dist/sendmail/cf/feature/nullclient.m4 | 5 +-
gnu/dist/sendmail/cf/mailer/local.m4 | 4 +-
gnu/dist/sendmail/cf/mailer/smtp.m4 | 10 +-
gnu/dist/sendmail/cf/ostype/linux.m4 | 4 +-
gnu/dist/sendmail/devtools/M4/UNIX/manpage.m4 | 4 +-
gnu/dist/sendmail/devtools/OS/HP-UX.11.x | 5 +-
gnu/dist/sendmail/devtools/OS/Linux | 6 +-
gnu/dist/sendmail/devtools/OS/SunOS.5.6 | 23 +++-
gnu/dist/sendmail/devtools/OS/SunOS.5.7 | 24 +++-
gnu/dist/sendmail/include/libmilter/mfapi.h | 3 +-
gnu/dist/sendmail/include/libmilter/milter.h | 8 +-
gnu/dist/sendmail/libmilter/handler.c | 8 +-
gnu/dist/sendmail/libmilter/main.c | 34 +++++-
gnu/dist/sendmail/libsmdb/smdb.c | 156 +++++++++++++++++++++++++-
gnu/dist/sendmail/libsmutil/safefile.c | 2 +-
gnu/dist/sendmail/libsmutil/snprintf.c | 4 +-
gnu/dist/sendmail/libsmutil/strl.c | 4 +-
gnu/dist/sendmail/sendmail/aliases.0 | 6 +-
gnu/dist/sendmail/sendmail/aliases.5 | 6 +-
gnu/dist/sendmail/sendmail/bf_portable.c | 45 +++++++-
gnu/dist/sendmail/sendmail/clock.c | 4 +-
gnu/dist/sendmail/sendmail/mci.c | 16 +-
gnu/dist/sendmail/sendmail/trace.c | 4 +-
24 files changed, 337 insertions(+), 55 deletions(-)
diffs (truncated from 851 to 300 lines):
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/INSTALL
--- a/gnu/dist/sendmail/INSTALL Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/INSTALL Fri Mar 09 17:49:01 2001 +0000
@@ -30,4 +30,9 @@
read the README in the utility's directory. When you are ready to install
it, back up your installed version and type "sh Build install".
-Revision: 8.3.16.1, Last updated Date: 2000/05/09 20:20:44
+8. If you are upgrading from an older version of sendmail and are using any
+ database maps, be sure to rebuild them with the new version of makemap,
+ in case you are now using a different (and thereby incompatible) version
+ of Berkeley DB.
+
+Revision: 8.3.16.2, Last updated Date: 2000/12/30 06:24:03
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/cf/feature/nullclient.m4
--- a/gnu/dist/sendmail/cf/feature/nullclient.m4 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/cf/feature/nullclient.m4 Fri Mar 09 17:49:01 2001 +0000
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -22,13 +22,14 @@
#
divert(0)
-VERSIONID(`Id: nullclient.m4,v 8.21.16.1 2000/05/26 18:08:41 gshapiro Exp')
+VERSIONID(`Id: nullclient.m4,v 8.21.16.3 2000/09/17 17:04:22 gshapiro Exp')
divert(-1)
undefine(`ALIAS_FILE')
define(`MAIL_HUB', _NULL_CLIENT_)
define(`SMART_HOST', _NULL_CLIENT_)
define(`confFORWARD_PATH', `')
+ifdef(`confFROM_HEADER',, `define(`confFROM_HEADER', `<$g>')')
define(`_DEF_LOCAL_MAILER_FLAGS', `lsDFM5q')
MASQUERADE_AS(_NULL_CLIENT_)
FEATURE(`allmasquerade')
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/cf/mailer/local.m4
--- a/gnu/dist/sendmail/cf/mailer/local.m4 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/cf/mailer/local.m4 Fri Mar 09 17:49:01 2001 +0000
@@ -1,6 +1,6 @@
PUSHDIVERT(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -27,7 +27,7 @@
### Local and Program Mailer specification ###
##################################################
-VERSIONID(`Id: local.m4,v 8.50.16.1 2000/06/12 18:25:40 gshapiro Exp')
+VERSIONID(`Id: local.m4,v 8.50.16.2 2000/09/17 17:04:22 gshapiro Exp')
#
# Envelope sender rewriting
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/cf/mailer/smtp.m4
--- a/gnu/dist/sendmail/cf/mailer/smtp.m4 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/cf/mailer/smtp.m4 Fri Mar 09 17:49:01 2001 +0000
@@ -24,7 +24,7 @@
### SMTP Mailer specification ###
#####################################
-VERSIONID(`Id: smtp.m4,v 8.56.2.1.2.2 2000/07/18 15:31:24 gshapiro Exp')
+VERSIONID(`Id: smtp.m4,v 8.56.2.1.2.3 2000/09/25 13:53:27 ca Exp')
#
# common sender and masquerading recipient rewriting
@@ -103,15 +103,15 @@
Msmtp, P=[IPC], F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, SMTP_MAILER_FLAGS), `SMTP'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n,
L=990,
_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
A=SMTP_MAILER_ARGS
-Mesmtp, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `a', SMTP_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990,
+Mesmtp, P=[IPC], F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, `a', SMTP_MAILER_FLAGS), `SMTP'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP',
`EnvToSMTP'), E=\r\n, L=990,
_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
A=ESMTP_MAILER_ARGS
-Msmtp8, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `8', SMTP_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990,
+Msmtp8, P=[IPC], F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, `8', SMTP_MAILER_FLAGS), `SMTP'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP',
`EnvToSMTP'), E=\r\n, L=990,
_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
A=SMTP8_MAILER_ARGS
-Mdsmtp, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `a%', SMTP_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990,
+Mdsmtp, P=[IPC], F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, `a%', SMTP_MAILER_FLAGS), `SMTP'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP',
`EnvToSMTP'), E=\r\n, L=990,
_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
A=DSMTP_MAILER_ARGS
-Mrelay, P=[IPC], F=CONCAT(_DEF_SMTP_MAILER_FLAGS, `a8', RELAY_MAILER_FLAGS), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `MasqSMTP/MasqRelay', `MasqSMTP'), E=\r\n, L=2040,
+Mrelay, P=[IPC], F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, `a8', RELAY_MAILER_FLAGS), `RELAY'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `MasqSMTP/MasqRelay',
`MasqSMTP'), E=\r\n, L=2040,
_OPTINS(`RELAY_MAILER_CHARSET', `C=', `, ')_OPTINS(`RELAY_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')T=DNS/RFC822/SMTP,
A=RELAY_MAILER_ARGS
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/cf/ostype/linux.m4
--- a/gnu/dist/sendmail/cf/ostype/linux.m4 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/cf/ostype/linux.m4 Fri Mar 09 17:49:01 2001 +0000
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`Id: linux.m4,v 8.11.16.1 2000/05/09 18:48:58 gshapiro Exp')
+VERSIONID(`Id: linux.m4,v 8.11.16.2 2000/09/17 17:04:22 gshapiro Exp')
define(`confEBINDIR', `/usr/sbin')
ifdef(`PROCMAIL_MAILER_PATH',,
define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail'))
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/devtools/M4/UNIX/manpage.m4
--- a/gnu/dist/sendmail/devtools/M4/UNIX/manpage.m4 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/devtools/M4/UNIX/manpage.m4 Fri Mar 09 17:49:01 2001 +0000
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#
# Definitions for Makefile construction for sendmail
#
-# Id: manpage.m4,v 8.10.16.1 2000/06/05 22:57:47 gshapiro Exp
+# Id: manpage.m4,v 8.10.16.2 2000/09/17 17:04:23 gshapiro Exp
#
divert(0)dnl
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/devtools/OS/HP-UX.11.x
--- a/gnu/dist/sendmail/devtools/OS/HP-UX.11.x Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/devtools/OS/HP-UX.11.x Fri Mar 09 17:49:01 2001 +0000
@@ -1,14 +1,15 @@
-# Id: HP-UX.11.x,v 8.11.18.1 2000/06/05 17:29:47 gshapiro Exp
+# Id: HP-UX.11.x,v 8.11.18.3 2000/09/19 07:04:52 gshapiro Exp
# +z is to generate position independant code
define(`confCC', `cc -Ae +z')
define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
-define(`confENVDEF', `-DV4FS -DHPUX11')
+define(`confENVDEF', `-DV4FS -DHPUX11 -D_PATH_SENDMAIL=\"/usr/sbin/sendmail\"')
define(`confOPTIMIZE', `+O3')
define(`confLIBS', `-ldbm -lnsl')
define(`confSHELL', `/usr/bin/sh')
define(`confINSTALL', `${BUILDBIN}/install.sh')
define(`confSBINGRP', `mail')
+define(`confEBINDIR', `/usr/sbin')
define(`confMTCCOPTS', `-D_POSIX_C_SOURCE=199506L')
define(`confMTLDOPTS', `-lpthread')
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/devtools/OS/Linux
--- a/gnu/dist/sendmail/devtools/OS/Linux Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/devtools/OS/Linux Fri Mar 09 17:49:01 2001 +0000
@@ -1,4 +1,4 @@
-# Id: Linux,v 8.18.4.2 2000/07/17 22:04:11 gshapiro Exp
+# Id: Linux,v 8.18.4.3 2000/12/14 01:04:46 rand Exp
define(`confDEPEND_TYPE', `CC-M')
define(`confMANROOT', `/usr/man/man')
define(`confLIBS', `-ldl')
@@ -14,7 +14,7 @@
ifelse(confBLDVARIANT, `DEBUG',
dnl Debug build
`
- define(`confOPTIMIZE',`-g')
+ define(`confOPTIMIZE',`-g -Wall')
',
dnl Optimized build
confBLDVARIANT, `OPTIMIZED',
@@ -24,7 +24,7 @@
dnl Purify build
confBLDVARIANT, `PURIFY',
`
- define(`confOPTIMIZE',`-g')
+ define(`confOPTIMIZE',`-g -Wall')
',
dnl default
`
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/devtools/OS/SunOS.5.6
--- a/gnu/dist/sendmail/devtools/OS/SunOS.5.6 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/devtools/OS/SunOS.5.6 Fri Mar 09 17:49:01 2001 +0000
@@ -1,4 +1,4 @@
-# Id: SunOS.5.6,v 8.14.18.2 2000/06/05 17:29:47 gshapiro Exp
+# Id: SunOS.5.6,v 8.14.18.3 2000/12/14 01:04:46 rand Exp
define(`confCC', `gcc')
define(`confLDOPTS_SO',`-G')
define(`confSONAME',`-h')
@@ -19,3 +19,24 @@
ln -s /usr/include/sysexits.h; \
fi
POPDIVERT
+
+
+ifelse(confBLDVARIANT, `DEBUG',
+dnl Debug build
+`
+ define(`confOPTIMIZE',`-g')
+',
+dnl Optimized build
+confBLDVARIANT, `OPTIMIZED',
+`
+ define(`confOPTIMIZE',`-O')
+',
+dnl Purify build
+confBLDVARIANT, `PURIFY',
+`
+ define(`confOPTIMIZE',`-g')
+',
+dnl default
+`
+ define(`confOPTIMIZE',`-O')
+')
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/devtools/OS/SunOS.5.7
--- a/gnu/dist/sendmail/devtools/OS/SunOS.5.7 Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/devtools/OS/SunOS.5.7 Fri Mar 09 17:49:01 2001 +0000
@@ -1,4 +1,4 @@
-# Id: SunOS.5.7,v 8.15.18.2 2000/06/05 17:29:47 gshapiro Exp
+# Id: SunOS.5.7,v 8.15.18.3 2000/12/14 01:04:46 rand Exp
define(`confCC', `gcc')
define(`confLDOPTS_SO', `-G')
define(`confSONAME',`-h')
@@ -19,3 +19,25 @@
ln -s /usr/include/sysexits.h; \
fi
POPDIVERT
+
+
+
+ifelse(confBLDVARIANT, `DEBUG',
+dnl Debug build
+`
+ define(`confOPTIMIZE',`-g')
+',
+dnl Optimized build
+confBLDVARIANT, `OPTIMIZED',
+`
+ define(`confOPTIMIZE',`-O')
+',
+dnl Purify build
+confBLDVARIANT, `PURIFY',
+`
+ define(`confOPTIMIZE',`-g')
+',
+dnl default
+`
+ define(`confOPTIMIZE',`-O')
+')
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/include/libmilter/mfapi.h
--- a/gnu/dist/sendmail/include/libmilter/mfapi.h Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/include/libmilter/mfapi.h Fri Mar 09 17:49:01 2001 +0000
@@ -7,7 +7,7 @@
* the sendmail distribution.
*
*
- * Id: mfapi.h,v 8.13.4.11 2000/07/11 21:45:56 geir Exp
+ * Id: mfapi.h,v 8.13.4.12 2000/09/09 02:11:48 ca Exp
*/
/*
@@ -128,6 +128,7 @@
LIBMILTER_API int smfi_setdbg __P((int));
LIBMILTER_API int smfi_settimeout __P((int));
LIBMILTER_API int smfi_setconn __P((char *));
+LIBMILTER_API int smfi_stop __P((void));
/*
** Continue processing message/connection.
diff -r ff2aaf86b185 -r c9169835a1e0 gnu/dist/sendmail/include/libmilter/milter.h
--- a/gnu/dist/sendmail/include/libmilter/milter.h Tue Feb 27 16:20:21 2001 +0000
+++ b/gnu/dist/sendmail/include/libmilter/milter.h Fri Mar 09 17:49:01 2001 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
* the sendmail distribution.
*
*
- * Id: milter.h,v 8.24.16.6 2000/06/08 22:13:39 gshapiro Exp
+ * Id: milter.h,v 8.24.16.8 2000/09/17 17:04:24 gshapiro Exp
*/
/*
@@ -74,8 +74,8 @@
/* socket and thread portability */
# include <pthread.h>
-typedef pthread_t sthread_t;
-typedef int socket_t;
+typedef pthread_t sthread_t;
+typedef int socket_t;
# define MAX_MACROS_ENTRIES 4 /* max size of macro pointer array */
Home |
Main Index |
Thread Index |
Old Index