Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/sendmail sendmail 8.11.3
details: https://anonhg.NetBSD.org/src/rev/be0e1ca1b950
branches: trunk
changeset: 504358:be0e1ca1b950
user: itojun <itojun%NetBSD.org@localhost>
date: Wed Feb 28 03:57:37 2001 +0000
description:
sendmail 8.11.3
diffstat:
gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf | 12 +++++-----
gnu/dist/sendmail/contrib/buildvirtuser | 29 ++++++++++++++++++-------
gnu/dist/sendmail/devtools/OS/OSF1.V5.x | 12 ++++++++++
gnu/dist/sendmail/libmilter/Makefile.m4 | 4 +-
4 files changed, 41 insertions(+), 16 deletions(-)
diffs (178 lines):
diff -r 7657e9fc466e -r be0e1ca1b950 gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf
--- a/gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf Wed Feb 28 03:02:29 2001 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf Wed Feb 28 03:57:37 2001 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -16,14 +16,14 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Fri Dec 29 22:31:00 PST 2000
-##### in /usr/local/src/sendmail/devel/8.11/OpenSource/sendmail-8.11.2/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Tue Feb 27 14:54:24 PST 2001
+##### in /usr/local/src/sendmail/devel/8.11/OpenSource/sendmail-8.11.3/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
######################################################################
-##### Id: cfhead.m4,v 8.76.4.13 2000/08/24 17:09:50 gshapiro Exp #####
+##### Id: cfhead.m4,v 8.76.4.15 2001/02/14 04:07:20 gshapiro Exp #####
##### Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp #####
##### Id: generic-nextstep3.3.mc,v 8.10 1999/02/07 07:26:02 gshapiro Exp #####
@@ -105,7 +105,7 @@
# class M: domains that should be converted to $M
# class N: domains that should not be converted to $M
#CL root
-CEroot
+C{E}root
# who I masquerade as (null for no masquerading) (see also $=M)
DM
@@ -117,7 +117,7 @@
CPREDIRECT
# Configuration version number
-DZ8.11.2
+DZ8.11.3
###############
diff -r 7657e9fc466e -r be0e1ca1b950 gnu/dist/sendmail/contrib/buildvirtuser
--- a/gnu/dist/sendmail/contrib/buildvirtuser Wed Feb 28 03:02:29 2001 +0000
+++ b/gnu/dist/sendmail/contrib/buildvirtuser Wed Feb 28 03:57:37 2001 +0000
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
-# Copyright (c) 1999-2000 Gregory Neil Shapiro. All Rights Reserved.
+# Copyright (c) 1999-2001 Gregory Neil Shapiro. All Rights Reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# Id: buildvirtuser,v 1.1.2.1 2000/10/26 22:51:03 gshapiro Exp
+# Id: buildvirtuser,v 1.1.2.3 2001/02/12 02:57:13 gshapiro Exp
=head1 NAME
@@ -45,7 +45,10 @@
matching the virtual domain name and the contents containing a list of
usernames on the left and the actual address for that username on the
right. An empty left column translates to the default for that domain.
-Blank lines and lines beginning with '#' are ignored.
+Blank lines and lines beginning with '#' are ignored. Occurrences of
+$DOMAIN in the file are replaced by the current domain being processed.
+Occurrences of $LHS in the right hand side are replaced by the address on
+the left hand side.
=head1 CONFIGURATION
@@ -66,21 +69,21 @@
=head2 /etc/mail/virtusers/bsdunix.org:
# Services
- MAILER-DAEMON gshapiro+MAILER-DAEMON.bsdunix.org%gshapiro.net@localhost
- postmaster gshapiro+postmaster.bsdunix.org%gshapiro.net@localhost
- webmaster gshapiro+webmaster.bsdunix.org%gshapiro.net@localhost
+ MAILER-DAEMON gshapiro+bounce.$DOMAIN%gshapiro.net@localhost
+ postmaster gshapiro+$LHS.$DOMAIN%gshapiro.net@localhost
+ webmaster gshapiro+$LHS.$DOMAIN%gshapiro.net@localhost
# Defaults
error:nouser No such user
# Users
- gshapiro gshapiro+bsdunix.org%gshapiro.net@localhost
+ gshapiro gshapiro+$DOMAIN%gshapiro.net@localhost
bob robert%smtp.org@localhost
=head2 /etc/mail/virtusers/smtp.org:
# Defaults
- gshapiro+smtp.org%gshapiro.net@localhost
+ gshapiro+$DOMAIN%gshapiro.net@localhost
# Users
john john%wookie.org@localhost
@@ -92,6 +95,8 @@
=cut
+use strict;
+
my $makemap = "/usr/sbin/makemap";
my $dbtype = "hash";
my $maildir = "/etc/mail";
@@ -102,6 +107,7 @@
my $virt = "$maildir/virtusertable.db";
my %virt = ();
my $newest = 0;
+my ($lhs, $domain, $key, $value);
opendir(VIRTS, $virts) || die "Could not open directory $virts: $!\n";
my @virts = grep { -f "$virts/$_" } readdir(VIRTS);
@@ -126,10 +132,12 @@
{
if (defined($1))
{
+ $lhs = "$1";
$key = "$1\@$domain";
}
else
{
+ $lhs = "";
$key = "\@$domain";
}
$value = $2;
@@ -138,6 +146,11 @@
{
die "Bogus line $line in $virts/$domain\n";
}
+
+ # Variable subsitution
+ $key =~ s/\$DOMAIN/$domain/g;
+ $value =~ s/\$DOMAIN/$domain/g;
+ $value =~ s/\$LHS/$lhs/g;
$virt{$key} = $value;
}
close(DOMAIN) || die "Could not close $virts/$domain: $!\n";
diff -r 7657e9fc466e -r be0e1ca1b950 gnu/dist/sendmail/devtools/OS/OSF1.V5.x
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/dist/sendmail/devtools/OS/OSF1.V5.x Wed Feb 28 03:57:37 2001 +0000
@@ -0,0 +1,12 @@
+# Id: OSF1.V5.x,v 8.1.2.1 2001/02/26 21:09:00 gshapiro Exp
+define(`confCC', `cc -std1 -Olimit 1000')
+define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
+define(`confENVDEF', `-DHASSNPRINTF=1')
+define(`confLIBS', `-ldbm')
+define(`confSTDIR', `/var/adm/sendmail')
+define(`confINSTALL', `installbsd')
+define(`confEBINDIR', `/usr/lbin')
+define(`confUBINDIR', `${BINDIR}')
+define(`confDEPEND_TYPE', `CC-M')
+
+define(`confMTLDOPTS', `-lpthread')
diff -r 7657e9fc466e -r be0e1ca1b950 gnu/dist/sendmail/libmilter/Makefile.m4
--- a/gnu/dist/sendmail/libmilter/Makefile.m4 Wed Feb 28 03:02:29 2001 +0000
+++ b/gnu/dist/sendmail/libmilter/Makefile.m4 Wed Feb 28 03:57:37 2001 +0000
@@ -16,9 +16,9 @@
divert(bldTARGETS_SECTION)
# Install the API header file
-MFAPI= ${SRCDIR}/include/libmilter/mfapi.h
+MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h
install-mfapi: ${MFAPI}
- ${INSTALL} ${MFAPI} ${DESTDIR}${INCLUDEDIR}
+ ${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}
divert(0)
bldFINISH
Home |
Main Index |
Thread Index |
Old Index