Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/postfix resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/a42628bbee85
branches: trunk
changeset: 521661:a42628bbee85
user: perry <perry%NetBSD.org@localhost>
date: Sat Feb 02 23:54:35 2002 +0000
description:
resolve conflicts
diffstat:
gnu/dist/postfix/makedefs | 32 +-
gnu/dist/postfix/src/global/Makefile.in | 129 +++--
gnu/dist/postfix/src/global/resolve_local.c | 13 +-
gnu/dist/postfix/src/global/tok822_parse.c | 67 +-
gnu/dist/postfix/src/master/master.h | 6 +
gnu/dist/postfix/src/master/master_ent.c | 4 +-
gnu/dist/postfix/src/master/master_listen.c | 5 +-
gnu/dist/postfix/src/qmgr/qmgr_message.c | 14 +
gnu/dist/postfix/src/smtp/smtp_addr.c | 57 ++-
gnu/dist/postfix/src/smtpd/smtpd.c | 349 +++++++++------
gnu/dist/postfix/src/smtpd/smtpd_check.c | 602 +++++++++++++++++++++++----
gnu/dist/postfix/src/smtpd/smtpd_peer.c | 1 -
gnu/dist/postfix/src/util/Makefile.in | 322 ++++++++++----
gnu/dist/postfix/src/util/match_list.c | 29 +-
gnu/dist/postfix/src/util/match_ops.c | 47 +-
gnu/dist/postfix/src/util/sys_defs.h | 103 ++++-
16 files changed, 1323 insertions(+), 457 deletions(-)
diffs (truncated from 3752 to 300 lines):
diff -r d3d03132f9c1 -r a42628bbee85 gnu/dist/postfix/makedefs
--- a/gnu/dist/postfix/makedefs Sat Feb 02 23:27:32 2002 +0000
+++ b/gnu/dist/postfix/makedefs Sat Feb 02 23:54:35 2002 +0000
@@ -93,6 +93,8 @@
;;
OpenBSD.2*) SYSTYPE=OPENBSD2
;;
+ OpenBSD.3*) SYSTYPE=OPENBSD3
+ ;;
NetBSD.1*) SYSTYPE=NETBSD1
;;
BSD/OS.2*) SYSTYPE=BSDI2
@@ -142,6 +144,12 @@
done
;;
AIX.*) case "`uname -v`" in
+ 5) SYSTYPE=AIX4
+ case "$CC" in
+ cc|*/cc|xlc|*/xlc) CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
+ esac
+ CCARGS="$CCARGS -D_ALL_SOURCE -DHAS_POSIX_REGEXP"
+ ;;
4) SYSTYPE=AIX4
# How embarrassing...
case "$CC" in
@@ -175,10 +183,22 @@
echo "See the RELEASE_NOTES file for more information." 1>&2
exit 1
fi
+ # See where GDBM's ndbm.h include file sits.
+ if [ -f /usr/include/gdbm-ndbm.h ]
+ then
+ CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm-ndbm.h>'"
+ GDBM_LIBS=gdbm
+ elif [ -f /usr/include/gdbm/ndbm.h ]
+ then
+ CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
+ GDBM_LIBS=gdbm
+ fi
SYSLIBS="-ldb"
- for name in nsl resolv
+ for name in nsl resolv $GDBM_LIBS
do
- test -f /usr/lib/lib$name.a && SYSLIBS="$SYSLIBS -l$name"
+ test -e /usr/lib/lib$name.a -o -e /usr/lib/lib$name.so \
+ -o -e /lib/lib$name.a -o -e /lib/lib$name.so \
+ && SYSLIBS="$SYSLIBS -l$name"
done
;;
IRIX*.5.*) SYSTYPE=IRIX5
@@ -218,11 +238,17 @@
RANLIB=echo
SYSLIBS="-lresolv -lsocket -lnsl"
;;
-Rhapsody.5*|Darwin.1.*)
+Rhapsody.5*|Darwin.*)
SYSTYPE=RHAPSODY5
# Use the native compiler by default
: ${CC=cc}
AWK=gawk
+ case $RELEASE in
+ 1.[0-3]) ;;
+ *) AWK=awk
+ SYSLIBS=-flat_namespace
+ ;;
+ esac
;;
"Mac OS".10*) SYSTYPE=MACOSX
# Use the native compiler by default
diff -r d3d03132f9c1 -r a42628bbee85 gnu/dist/postfix/src/global/Makefile.in
--- a/gnu/dist/postfix/src/global/Makefile.in Sat Feb 02 23:27:32 2002 +0000
+++ b/gnu/dist/postfix/src/global/Makefile.in Sat Feb 02 23:54:35 2002 +0000
@@ -4,41 +4,43 @@
deliver_flock.c deliver_pass.c deliver_request.c domain_list.c \
dot_lockfile.c dot_lockfile_as.c ext_prop.c file_id.c \
header_opts.c is_header.c mail_addr.c mail_addr_crunch.c \
- mail_addr_find.c mail_addr_map.c mail_command_read.c \
- mail_command_write.c mail_conf.c mail_conf_bool.c mail_conf_int.c \
+ mail_addr_find.c mail_addr_map.c mail_command_server.c \
+ mail_command_client.c mail_conf.c mail_conf_bool.c mail_conf_int.c \
mail_conf_raw.c mail_conf_str.c mail_connect.c mail_copy.c \
mail_date.c mail_error.c mail_flush.c mail_open_ok.c mail_params.c \
- mail_pathname.c mail_print.c mail_queue.c mail_run.c mail_scan.c \
+ mail_pathname.c mail_queue.c mail_run.c \
mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \
mark_corrupt.c mkmap_db.c mkmap_dbm.c mkmap_open.c mynetworks.c \
mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \
- peer_name.c pipe_command.c post_mail.c quote_821_local.c \
+ pipe_command.c post_mail.c quote_821_local.c \
quote_822_local.c rec_streamlf.c rec_type.c recipient_list.c \
record.c remove.c resolve_clnt.c resolve_local.c rewrite_clnt.c \
sent.c smtp_stream.c split_addr.c string_list.c sys_exits.c \
timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
tok822_resolve.c tok822_rewrite.c tok822_tree.c xtext.c bounce_log.c \
- flush_clnt.c mail_conf_time.c mbox_conf.c mbox_open.c abounce.c
+ flush_clnt.c mail_conf_time.c mbox_conf.c mbox_open.c abounce.c \
+ verp_sender.c match_parent_style.c
OBJS = been_here.o bounce.o canon_addr.o cleanup_strerror.o clnt_stream.o \
debug_peer.o debug_process.o defer.o deliver_completed.o \
deliver_flock.o deliver_pass.o deliver_request.o domain_list.o \
dot_lockfile.o dot_lockfile_as.o ext_prop.o file_id.o \
header_opts.o is_header.o mail_addr.o mail_addr_crunch.o \
- mail_addr_find.o mail_addr_map.o mail_command_read.o \
- mail_command_write.o mail_conf.o mail_conf_bool.o mail_conf_int.o \
+ mail_addr_find.o mail_addr_map.o mail_command_server.o \
+ mail_command_client.o mail_conf.o mail_conf_bool.o mail_conf_int.o \
mail_conf_raw.o mail_conf_str.o mail_connect.o mail_copy.o \
mail_date.o mail_error.o mail_flush.o mail_open_ok.o mail_params.o \
- mail_pathname.o mail_print.o mail_queue.o mail_run.o mail_scan.o \
+ mail_pathname.o mail_queue.o mail_run.o \
mail_scan_dir.o mail_stream.o mail_task.o mail_trigger.o maps.o \
mark_corrupt.o mkmap_db.o mkmap_dbm.o mkmap_open.o mynetworks.o \
mypwd.o namadr_list.o off_cvt.o opened.o own_inet_addr.o \
- peer_name.o pipe_command.o post_mail.o quote_821_local.o \
+ pipe_command.o post_mail.o quote_821_local.o \
quote_822_local.o rec_streamlf.o rec_type.o recipient_list.o \
record.o remove.o resolve_clnt.o resolve_local.o rewrite_clnt.o \
sent.o smtp_stream.o split_addr.o string_list.o sys_exits.o \
timed_ipc.o tok822_find.o tok822_node.o tok822_parse.o \
tok822_resolve.o tok822_rewrite.o tok822_tree.o xtext.o bounce_log.o \
- flush_clnt.o mail_conf_time.o mbox_conf.o mbox_open.o abounce.o
+ flush_clnt.o mail_conf_time.o mbox_conf.o mbox_open.o abounce.o \
+ verp_sender.o match_parent_style.o
HDRS = been_here.h bounce.h canon_addr.h cleanup_user.h clnt_stream.h \
config.h debug_peer.h debug_process.h defer.h deliver_completed.h \
deliver_flock.h deliver_pass.h deliver_request.h domain_list.h \
@@ -49,12 +51,13 @@
mail_proto.h mail_queue.h mail_run.h mail_scan_dir.h mail_stream.h \
mail_task.h mail_version.h maps.h mark_corrupt.h mkmap.h \
mynetworks.h mypwd.h namadr_list.h off_cvt.h opened.h \
- own_inet_addr.h peer_name.h pipe_command.h post_mail.h \
+ own_inet_addr.h pipe_command.h post_mail.h \
quote_821_local.h quote_822_local.h rec_streamlf.h rec_type.h \
recipient_list.h record.h resolve_clnt.h resolve_local.h \
rewrite_clnt.h sent.h smtp_stream.h split_addr.h string_list.h \
sys_exits.h timed_ipc.h tok822.h xtext.h bounce_log.h flush_clnt.h \
- mbox_conf.h mbox_open.h abounce.h
+ mbox_conf.h mbox_open.h abounce.h qmqp_proto.h verp_sender.h \
+ match_parent_style.h
TESTSRC = rec2stream.c stream2rec.c recdump.c
WARN = -W -Wformat -Wimplicit -Wmissing-prototypes \
-Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \
@@ -65,7 +68,7 @@
LIB = libglobal.a
TESTPROG= domain_list dot_lockfile mail_addr_crunch mail_addr_find \
mail_addr_map mail_date maps mynetworks mypwd namadr_list \
- off_cvt peer_name quote_822_local rec2stream recdump resolve_clnt \
+ off_cvt quote_822_local rec2stream recdump resolve_clnt \
resolve_local rewrite_clnt stream2rec string_list tok822_parse \
quote_821_local mail_conf_time
@@ -252,6 +255,7 @@
abounce.o: ../../include/vbuf.h
abounce.o: mail_proto.h
abounce.o: ../../include/iostuff.h
+abounce.o: ../../include/attr.h
abounce.o: abounce.h
abounce.o: bounce.h
been_here.o: been_here.c
@@ -272,6 +276,7 @@
bounce.o: mail_proto.h
bounce.o: ../../include/vstream.h
bounce.o: ../../include/iostuff.h
+bounce.o: ../../include/attr.h
bounce.o: defer.h
bounce.o: bounce.h
bounce_log.o: bounce_log.c
@@ -306,6 +311,7 @@
clnt_stream.o: ../../include/events.h
clnt_stream.o: ../../include/iostuff.h
clnt_stream.o: mail_proto.h
+clnt_stream.o: ../../include/attr.h
clnt_stream.o: mail_params.h
clnt_stream.o: clnt_stream.h
debug_peer.o: debug_peer.c
@@ -313,7 +319,10 @@
debug_peer.o: ../../include/msg.h
debug_peer.o: mail_params.h
debug_peer.o: namadr_list.h
+debug_peer.o: ../../include/match_list.h
+debug_peer.o: ../../include/match_ops.h
debug_peer.o: debug_peer.h
+debug_peer.o: match_parent_style.h
debug_process.o: debug_process.c
debug_process.o: ../../include/sys_defs.h
debug_process.o: ../../include/msg.h
@@ -329,6 +338,7 @@
defer.o: ../../include/vstream.h
defer.o: mail_proto.h
defer.o: ../../include/iostuff.h
+defer.o: ../../include/attr.h
defer.o: flush_clnt.h
defer.o: bounce.h
defer.o: defer.h
@@ -363,6 +373,7 @@
deliver_pass.o: recipient_list.h
deliver_pass.o: mail_proto.h
deliver_pass.o: ../../include/iostuff.h
+deliver_pass.o: ../../include/attr.h
deliver_request.o: deliver_request.c
deliver_request.o: ../../include/sys_defs.h
deliver_request.o: ../../include/msg.h
@@ -374,14 +385,15 @@
deliver_request.o: ../../include/myflock.h
deliver_request.o: mail_queue.h
deliver_request.o: mail_proto.h
+deliver_request.o: ../../include/attr.h
deliver_request.o: mail_open_ok.h
deliver_request.o: recipient_list.h
deliver_request.o: deliver_request.h
domain_list.o: domain_list.c
domain_list.o: ../../include/sys_defs.h
domain_list.o: ../../include/match_list.h
+domain_list.o: domain_list.h
domain_list.o: ../../include/match_ops.h
-domain_list.o: domain_list.h
dot_lockfile.o: dot_lockfile.c
dot_lockfile.o: ../../include/sys_defs.h
dot_lockfile.o: ../../include/vstring.h
@@ -417,6 +429,7 @@
flush_clnt.o: ../../include/vbuf.h
flush_clnt.o: mail_proto.h
flush_clnt.o: ../../include/iostuff.h
+flush_clnt.o: ../../include/attr.h
flush_clnt.o: mail_flush.h
flush_clnt.o: flush_clnt.h
flush_clnt.o: mail_params.h
@@ -475,19 +488,20 @@
mail_addr_map.o: maps.h
mail_addr_map.o: mail_addr_crunch.h
mail_addr_map.o: mail_addr_map.h
-mail_command_read.o: mail_command_read.c
-mail_command_read.o: ../../include/sys_defs.h
-mail_command_read.o: ../../include/vstring.h
-mail_command_read.o: ../../include/vbuf.h
-mail_command_read.o: ../../include/vstream.h
-mail_command_read.o: mail_proto.h
-mail_command_read.o: ../../include/iostuff.h
-mail_command_write.o: mail_command_write.c
-mail_command_write.o: ../../include/sys_defs.h
-mail_command_write.o: ../../include/vstream.h
-mail_command_write.o: ../../include/vbuf.h
-mail_command_write.o: mail_proto.h
-mail_command_write.o: ../../include/iostuff.h
+mail_command_client.o: mail_command_client.c
+mail_command_client.o: ../../include/sys_defs.h
+mail_command_client.o: ../../include/vstream.h
+mail_command_client.o: ../../include/vbuf.h
+mail_command_client.o: mail_proto.h
+mail_command_client.o: ../../include/iostuff.h
+mail_command_client.o: ../../include/attr.h
+mail_command_server.o: mail_command_server.c
+mail_command_server.o: ../../include/sys_defs.h
+mail_command_server.o: ../../include/vstream.h
+mail_command_server.o: ../../include/vbuf.h
+mail_command_server.o: mail_proto.h
+mail_command_server.o: ../../include/iostuff.h
+mail_command_server.o: ../../include/attr.h
mail_conf.o: mail_conf.c
mail_conf.o: ../../include/sys_defs.h
mail_conf.o: ../../include/msg.h
@@ -499,6 +513,7 @@
mail_conf.o: ../../include/argv.h
mail_conf.o: ../../include/safe.h
mail_conf.o: ../../include/stringops.h
+mail_conf.o: ../../include/readlline.h
mail_conf.o: mail_params.h
mail_conf.o: mail_conf.h
mail_conf_bool.o: mail_conf_bool.c
@@ -549,8 +564,11 @@
mail_connect.o: ../../include/connect.h
mail_connect.o: ../../include/iostuff.h
mail_connect.o: ../../include/mymalloc.h
+mail_connect.o: ../../include/stringops.h
+mail_connect.o: ../../include/vstring.h
mail_connect.o: timed_ipc.h
mail_connect.o: mail_proto.h
+mail_connect.o: ../../include/attr.h
mail_copy.o: mail_copy.c
mail_copy.o: ../../include/sys_defs.h
mail_copy.o: ../../include/msg.h
@@ -565,8 +583,9 @@
mail_copy.o: rec_type.h
mail_copy.o: mail_queue.h
mail_copy.o: mail_addr.h
+mail_copy.o: mark_corrupt.h
+mail_copy.o: mail_params.h
mail_copy.o: mail_copy.h
-mail_copy.o: mark_corrupt.h
mail_date.o: mail_date.c
mail_date.o: ../../include/sys_defs.h
mail_date.o: ../../include/msg.h
@@ -583,6 +602,7 @@
mail_flush.o: ../../include/vstream.h
mail_flush.o: ../../include/vbuf.h
mail_flush.o: ../../include/iostuff.h
+mail_flush.o: ../../include/attr.h
mail_flush.o: mail_flush.h
mail_open_ok.o: mail_open_ok.c
mail_open_ok.o: ../../include/sys_defs.h
Home |
Main Index |
Thread Index |
Old Index