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 revisions 1.3-1.4 (requested ...
details: https://anonhg.NetBSD.org/src/rev/1622f23b96a9
branches: netbsd-1-5
changeset: 490782:1622f23b96a9
user: he <he%NetBSD.org@localhost>
date: Fri Mar 09 17:49:41 2001 +0000
description:
Pull up revisions 1.3-1.4 (requested by itojun):
Upgrade to sendmail 8.11.3.
diffstat:
gnu/dist/sendmail/cf/cf/Makefile | 7 +-
gnu/dist/sendmail/devtools/M4/UNIX/library.m4 | 5 +-
gnu/dist/sendmail/devtools/OS/SunOS.5.8 | 27 ++-
gnu/dist/sendmail/libsmdb/smdb1.c | 61 ++++-
gnu/dist/sendmail/libsmdb/smndbm.c | 62 ++++-
gnu/dist/sendmail/mail.local/mail.local.0 | 52 ++--
gnu/dist/sendmail/mail.local/mail.local.8 | 18 +-
gnu/dist/sendmail/sendmail/sendmail.0 | 286 +++++++++++++-------------
gnu/dist/sendmail/sendmail/sendmail.8 | 15 +-
gnu/dist/sendmail/sendmail2netbsd | 9 +-
10 files changed, 338 insertions(+), 204 deletions(-)
diffs (truncated from 1181 to 300 lines):
diff -r b49894e0bcff -r 1622f23b96a9 gnu/dist/sendmail/cf/cf/Makefile
--- a/gnu/dist/sendmail/cf/cf/Makefile Fri Mar 09 17:49:32 2001 +0000
+++ b/gnu/dist/sendmail/cf/cf/Makefile Fri Mar 09 17:49:41 2001 +0000
@@ -1,7 +1,7 @@
#
# Makefile for configuration files.
#
-# Id: Makefile,v 8.40 2000/02/01 22:07:15 gshapiro Exp
+# Id: Makefile,v 8.40.8.4 2000/10/26 18:27:44 gshapiro Exp
#
#
@@ -25,10 +25,10 @@
$(CHMOD) $(ROMODE) $@
GENERIC=generic-bsd4.4.cf generic-hpux9.cf generic-hpux10.cf \
- generic-linux.cf \
+ generic-linux.cf generic-nextstep3.3.cf \
generic-osf1.cf generic-solaris2.cf \
generic-sunos4.1.cf generic-ultrix4.cf
-BERKELEY=cs-hpux9.cf cs-osf1.cf cs-solaris2.cf \
+BERKELEY=cs-hpux9.cf cs-hpux10.cf cs-osf1.cf cs-solaris2.cf \
cs-sunos4.1.cf cs-ultrix4.cf \
s2k-osf1.cf s2k-ultrix4.cf \
chez.cs.cf huginn.cs.cf mail.cs.cf mail.eecs.cf mailspool.cs.cf \
@@ -150,6 +150,7 @@
${CFDIR}/ostype/solaris2.m4 \
${CFDIR}/ostype/solaris2.ml.m4 \
${CFDIR}/ostype/solaris2.pre5.m4 \
+ ${CFDIR}/ostype/solaris8.m4 \
${CFDIR}/ostype/sunos3.5.m4 \
${CFDIR}/ostype/sunos4.1.m4 \
${CFDIR}/ostype/svr4.m4 \
diff -r b49894e0bcff -r 1622f23b96a9 gnu/dist/sendmail/devtools/M4/UNIX/library.m4
--- a/gnu/dist/sendmail/devtools/M4/UNIX/library.m4 Fri Mar 09 17:49:32 2001 +0000
+++ b/gnu/dist/sendmail/devtools/M4/UNIX/library.m4 Fri Mar 09 17:49:41 2001 +0000
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2001 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: library.m4,v 8.6 1999/08/13 21:31:08 gshapiro Exp
+# Id: library.m4,v 8.6.18.4 2001/02/14 04:07:22 gshapiro Exp
#
divert(0)dnl
include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
@@ -27,6 +27,7 @@
ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
+ifdef(`bldINSTALLABLE', ` ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
bldCURRENT_PRODUCT-clean:
rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
diff -r b49894e0bcff -r 1622f23b96a9 gnu/dist/sendmail/devtools/OS/SunOS.5.8
--- a/gnu/dist/sendmail/devtools/OS/SunOS.5.8 Fri Mar 09 17:49:32 2001 +0000
+++ b/gnu/dist/sendmail/devtools/OS/SunOS.5.8 Fri Mar 09 17:49:41 2001 +0000
@@ -1,8 +1,9 @@
-# Id: SunOS.5.8,v 8.6 1999/10/27 03:02:03 gshapiro Exp
+# Id: SunOS.5.8,v 8.6.16.3 2000/12/14 01:04:46 rand Exp
define(`confCC', `gcc')
+define(`confLDOPTS_SO', `-G')
define(`confBEFORE', `sysexits.h')
define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
-define(`confENVDEF', `-DSOLARIS=20800')
+define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
define(`confLIBS', `-lsocket -lnsl -lldap')
define(`confMTLDOPTS', `-lpthread')
define(`confMBINDIR', `/usr/lib')
@@ -17,3 +18,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 b49894e0bcff -r 1622f23b96a9 gnu/dist/sendmail/libsmdb/smdb1.c
--- a/gnu/dist/sendmail/libsmdb/smdb1.c Fri Mar 09 17:49:32 2001 +0000
+++ b/gnu/dist/sendmail/libsmdb/smdb1.c Fri Mar 09 17:49:41 2001 +0000
@@ -8,7 +8,7 @@
*/
#ifndef lint
-static char id[] = "@(#)Id: smdb1.c,v 8.43 2000/03/17 07:32:43 gshapiro Exp";
+static char id[] = "@(#)Id: smdb1.c,v 8.43.4.3 2000/10/05 23:06:30 gshapiro Exp";
#endif /* ! lint */
#include <unistd.h>
@@ -175,8 +175,12 @@
u_int flags;
{
DB *db = ((SMDB_DB1_DATABASE *) database->smdb_impl)->smdb1_db;
+ DBT dbkey;
- return db->del(db, &key->db, flags);
+ memset(&dbkey, '\0', sizeof dbkey);
+ dbkey.data = key->data;
+ dbkey.size = key->size;
+ return db->del(db, &dbkey, flags);
}
int
@@ -194,6 +198,16 @@
}
int
+smdb1_lockfd(database)
+ SMDB_DATABASE *database;
+{
+ SMDB_DB1_DATABASE *db1 = (SMDB_DB1_DATABASE *) database->smdb_impl;
+
+ return db1->smdb1_lock_fd;
+}
+
+
+int
smdb1_get(database, key, data, flags)
SMDB_DATABASE *database;
SMDB_DBENT *key;
@@ -202,14 +216,22 @@
{
int result;
DB *db = ((SMDB_DB1_DATABASE *) database->smdb_impl)->smdb1_db;
+ DBT dbkey, dbdata;
- result = db->get(db, &key->db, &data->db, flags);
+ memset(&dbdata, '\0', sizeof dbdata);
+ memset(&dbkey, '\0', sizeof dbkey);
+ dbkey.data = key->data;
+ dbkey.size = key->size;
+
+ result = db->get(db, &dbkey, &dbdata, flags);
if (result != 0)
{
if (result == 1)
return SMDBE_NOT_FOUND;
return errno;
}
+ data->data = dbdata.data;
+ data->size = dbdata.size;
return SMDBE_OK;
}
@@ -221,9 +243,17 @@
u_int flags;
{
DB *db = ((SMDB_DB1_DATABASE *) database->smdb_impl)->smdb1_db;
+ DBT dbkey, dbdata;
- return db->put(db, &key->db, &data->db,
- smdb_put_flags_to_db1_flags(flags));
+ memset(&dbdata, '\0', sizeof dbdata);
+ memset(&dbkey, '\0', sizeof dbkey);
+ dbkey.data = key->data;
+ dbkey.size = key->size;
+ dbdata.data = data->data;
+ dbdata.size = data->size;
+
+ return db->put(db, &dbkey, &dbdata,
+ smdb_put_flags_to_db1_flags(flags));
}
int
@@ -299,13 +329,21 @@
SMDB_DB1_CURSOR *db1_cursor = (SMDB_DB1_CURSOR *) cursor->smdbc_impl;
SMDB_DB1_DATABASE *db1 = db1_cursor->db;
DB *db = db1->smdb1_db;
+ DBT dbkey, dbdata;
+
+ memset(&dbdata, '\0', sizeof dbdata);
+ memset(&dbkey, '\0', sizeof dbkey);
db1_flags = smdb_cursor_get_flags_to_smdb1(flags);
- result = db->seq(db, &key->db, &value->db, db1_flags);
+ result = db->seq(db, &dbkey, &dbdata, db1_flags);
if (result == -1)
return errno;
if (result == 1)
return SMDBE_LAST_ENTRY;
+ value->data = dbdata.data;
+ value->size = dbdata.size;
+ key->data = dbkey.data;
+ key->size = dbkey.size;
return SMDBE_OK;
}
@@ -319,8 +357,16 @@
SMDB_DB1_CURSOR *db1_cursor = (SMDB_DB1_CURSOR *) cursor->smdbc_impl;
SMDB_DB1_DATABASE *db1 = db1_cursor->db;
DB *db = db1->smdb1_db;
+ DBT dbkey, dbdata;
- return db->put(db, &key->db, &value->db, R_CURSOR);
+ memset(&dbdata, '\0', sizeof dbdata);
+ memset(&dbkey, '\0', sizeof dbkey);
+ dbkey.data = key->data;
+ dbkey.size = key->size;
+ dbdata.data = value->data;
+ dbdata.size = value->size;
+
+ return db->put(db, &dbkey, &dbdata, R_CURSOR);
}
int
@@ -482,6 +528,7 @@
smdb_db->smdb_close = smdb1_close;
smdb_db->smdb_del = smdb1_del;
smdb_db->smdb_fd = smdb1_fd;
+ smdb_db->smdb_lockfd = smdb1_lockfd;
smdb_db->smdb_get = smdb1_get;
smdb_db->smdb_put = smdb1_put;
smdb_db->smdb_set_owner = smdb1_set_owner;
diff -r b49894e0bcff -r 1622f23b96a9 gnu/dist/sendmail/libsmdb/smndbm.c
--- a/gnu/dist/sendmail/libsmdb/smndbm.c Fri Mar 09 17:49:32 2001 +0000
+++ b/gnu/dist/sendmail/libsmdb/smndbm.c Fri Mar 09 17:49:41 2001 +0000
@@ -8,7 +8,7 @@
*/
#ifndef lint
-static char id[] = "@(#)Id: smndbm.c,v 8.40 2000/03/19 05:03:30 ca Exp";
+static char id[] = "@(#)Id: smndbm.c,v 8.40.4.3 2000/10/05 22:27:50 gshapiro Exp";
#endif /* ! lint */
#include <fcntl.h>
@@ -124,9 +124,14 @@
{
int result;
DBM *dbm = ((SMDB_DBM_DATABASE *) database->smdb_impl)->smndbm_dbm;
+ datum dbkey;
+
+ memset(&dbkey, '\0', sizeof dbkey);
+ dbkey.dptr = key->data;
+ dbkey.dsize = key->size;
errno = 0;
- result = dbm_delete(dbm, key->dbm);
+ result = dbm_delete(dbm, dbkey);
if (result != 0)
{
int save_errno = errno;
@@ -157,6 +162,15 @@
}
int
+smdbm_lockfd(database)
+ SMDB_DATABASE *database;
+{
+ SMDB_DBM_DATABASE *db = (SMDB_DBM_DATABASE *) database->smdb_impl;
+
+ return db->smndbm_lock_fd;
+}
+
+int
smdbm_get(database, key, data, flags)
SMDB_DATABASE *database;
SMDB_DBENT *key;
@@ -164,10 +178,16 @@
u_int flags;
{
DBM *dbm = ((SMDB_DBM_DATABASE *) database->smdb_impl)->smndbm_dbm;
+ datum dbkey, dbdata;
+
+ memset(&dbkey, '\0', sizeof dbkey);
+ memset(&dbdata, '\0', sizeof dbdata);
+ dbkey.dptr = key->data;
+ dbkey.dsize = key->size;
errno = 0;
- data->dbm = dbm_fetch(dbm, key->dbm);
- if (data->dbm.dptr == NULL)
+ dbdata = dbm_fetch(dbm, dbkey);
+ if (dbdata.dptr == NULL)
{
int save_errno = errno;
Home |
Main Index |
Thread Index |
Old Index