This release folds in code changes from recent snapshot releases.
These changes track changes in RedHat Linux, fix two minor bugs in
the Postfix queue manager scheduling behavior that were spotted by
Patrik Rak, and turn off one misfeature.

- On RedHat Linux 7.0, you must install the db3-devel RPM before
  you can compile the Postfix source code.

- The queue manager could schedule too many connections to the same
  destination (domain name spelled in upper and lower case).

- The queue manager could schedule too few connections to the same
  destination (back off even in case of successful delivery).

- The confusing site_hog_factor feature is disabled by default. It
  caused unnecessary mail delivery delays on inbound mail gateways.

This patch changes very little code, yet it is too large for email
distribution. The reason is that the patch makes lots of changes
to the Postfix build procedure.

The patch, and a patched version of the source code, will be made
available from the sites listed in www.postfix.org/downloads.html,
primary distribution site:

    ftp://ftp.porcupine.org/mirrors/postfix-release/

	postfix-19991231-patch11.gz         Source patch
	postfix-19991231-pl11.tar.sig       Source code
	postfix-19991231-pl11.tar.gz.sig    PGP signature

Or point your browser to 

    ftp://ftp.porcupine.org/mirrors/postfix-release/index.html

Happy Postfixing!

	Wietse

Prereq: "Postfix-19991231-pl10"
diff -cr ../postfix-19991231-pl10/global/mail_version.h ./global/mail_version.h
*** ../postfix-19991231-pl10/global/mail_version.h	Sun Oct 29 19:06:58 2000
--- ./global/mail_version.h	Tue Nov 21 19:46:24 2000
***************
*** 15,21 ****
    * Version of this program.
    */
  #define VAR_MAIL_VERSION	"mail_version"
! #define DEF_MAIL_VERSION	"Postfix-19991231-pl10"
  extern char *var_mail_version;
  
  /* LICENSE
--- 15,21 ----
    * Version of this program.
    */
  #define VAR_MAIL_VERSION	"mail_version"
! #define DEF_MAIL_VERSION	"Postfix-19991231-pl11"
  extern char *var_mail_version;
  
  /* LICENSE
diff -cr ../postfix-19991231-pl10/HISTORY ./HISTORY
*** ../postfix-19991231-pl10/HISTORY	Mon Oct 30 09:35:25 2000
--- ./HISTORY	Tue Nov 21 20:29:09 2000
***************
*** 3827,3832 ****
--- 3827,3845 ----
  	for the Sendmail-compatible @ entry and for the NIS-compatible
  	YP_LAST_MODIFIED and YP_MASTER_NAME entries.
  
+ 20000918
+ 
+ 	Gross hack: prevent looping on a bad recipient by always
+ 	forwarding recipients in :include: files to a new mail
+ 	delivery request, even when owner-listname is not set.
+ 	File: local/recipient.c.
+ 
+ 20001003
+ 
+ 	Unfeature: qmgr_hog_factor is now disabled by default. It
+ 	was just too confusing. If you don't know what this means,
+ 	do not worry.
+ 
  20001025
  
  	Bugfix: virtual map expansion stopped too early with
***************
*** 3854,3856 ****
--- 3867,3887 ----
  	Bugfix: further testing in preparation for 19991231-pl10
  	revealed that the DB map code was now broken for every
  	platform.
+ 
+ 20001104
+ 
+ 	Portability: RedHat Linux has changed incompatibly, again.
+ 	Fixed with the help of Matthias Andree.  File: makedefs.
+ 
+ 20001119
+ 
+ 	Bugfix: per-destination queue names were case sensitive so
+ 	that the same site could have multiple queues.  Reported
+ 	by Patrik Rak. File: qmgr/qmgr_message.c.
+ 
+ 20001121
+ 
+ 	Performance: the slow start (gradually increase number of
+ 	parallel connections to the same site) was too gentle and
+ 	Postfix would back off too quickly.  Final solution by
+ 	Patrik Rak. File: qmgr/qmgr_message.c.
diff -cr ../postfix-19991231-pl10/Makefile ./Makefile
*** ../postfix-19991231-pl10/Makefile	Mon Oct 30 10:44:51 2000
--- ./Makefile	Tue Nov 21 20:28:13 2000
***************
*** 12,18 ****
  default: update
  
  update depend printfck clean tidy depend_update: Makefiles
! 	$(MAKE) $@
  
  makefiles Makefiles:
! 	$(MAKE) -f Makefile.in Makefiles
--- 12,18 ----
  default: update
  
  update depend printfck clean tidy depend_update: Makefiles
! 	$(MAKE) $@ MAKELEVEL=
  
  makefiles Makefiles:
! 	$(MAKE) -f Makefile.in Makefiles MAKELEVEL=
diff -cr ../postfix-19991231-pl10/Makefile.in ./Makefile.in
*** ../postfix-19991231-pl10/Makefile.in	Fri Dec 31 10:49:41 1999
--- ./Makefile.in	Sun Nov  5 19:26:23 2000
***************
*** 11,19 ****
  makefiles Makefiles:
  	set -e; for i in $(DIRS); do \
  	 (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \
! 	 $(MAKE) -f Makefile.in Makefile MAKELEVEL=); \
  	done;
! 	rm -f Makefile; (set -e; $(SHELL) makedefs; cat Makefile.in) >Makefile
  
  update printfck:
  	set -e; for i in $(DIRS); do \
--- 11,19 ----
  makefiles Makefiles:
  	set -e; for i in $(DIRS); do \
  	 (set -e; echo "[$$i]"; cd $$i; rm -f Makefile; \
! 	 $(MAKE) -f Makefile.in Makefile MAKELEVEL=) || exit 1; \
  	done;
! 	rm -f Makefile; (set -e; $(SHELL) makedefs && cat Makefile.in) >Makefile
  
  update printfck:
  	set -e; for i in $(DIRS); do \
diff -cr ../postfix-19991231-pl10/Makefile.init ./Makefile.init
*** ../postfix-19991231-pl10/Makefile.init	Fri Sep  3 14:46:14 1999
--- ./Makefile.init	Sun Nov  5 19:33:26 2000
***************
*** 12,18 ****
  default: update
  
  update depend printfck clean tidy depend_update: Makefiles
! 	$(MAKE) $@
  
  makefiles Makefiles:
! 	$(MAKE) -f Makefile.in Makefiles
--- 12,18 ----
  default: update
  
  update depend printfck clean tidy depend_update: Makefiles
! 	$(MAKE) $@ MAKELEVEL=
  
  makefiles Makefiles:
! 	$(MAKE) -f Makefile.in Makefiles MAKELEVEL=
diff -cr ../postfix-19991231-pl10/RELEASE_NOTES ./RELEASE_NOTES
*** ../postfix-19991231-pl10/RELEASE_NOTES	Sun Oct 29 18:58:01 2000
--- ./RELEASE_NOTES	Wed Nov 22 10:43:57 2000
***************
*** 1,3 ****
--- 1,21 ----
+ Major changes with postfix-19991231-pl11:
+ =========================================
+ 
+ On RedHat Linux 7.0, you must install the db3-devel RPM before you
+ can compile the Postfix source code.
+ 
+ This release folds in some code changes from the snapshot releases
+ that address some anomalies in queue manager scheduling behavior:
+ 
+ - The queue manager could schedule too many connections to the same
+   destination (same domain name spelled in upper and lower case).
+ 
+ - The queue manager could schedule too few connections to the same
+   destination (back off even in case of successful delivery).
+ 
+ - The confusing site_hog_factor is disabled by default. It caused
+   unnecessary mail delivery delays on inbound mail gateways.
+ 
  Incompatible changes with postfix-19991231-pl10:
  ================================================
  
diff -cr ../postfix-19991231-pl10/bounce/Makefile.in ./bounce/Makefile.in
*** ../postfix-19991231-pl10/bounce/Makefile.in	Thu Dec 23 13:43:00 1999
--- ./bounce/Makefile.in	Tue Nov 21 20:02:00 2000
***************
*** 21,27 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 21,27 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/cleanup/Makefile.in ./cleanup/Makefile.in
*** ../postfix-19991231-pl10/cleanup/Makefile.in	Thu Dec 23 13:42:54 1999
--- ./cleanup/Makefile.in	Tue Nov 21 20:01:32 2000
***************
*** 25,31 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 25,31 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
***************
*** 100,105 ****
--- 100,107 ----
  cleanup_envelope.o: ../include/resolve_clnt.h
  cleanup_envelope.o: ../include/mail_params.h
  cleanup_envelope.o: ../include/ext_prop.h
+ cleanup_envelope.o: ../include/mail_addr.h
+ cleanup_envelope.o: ../include/canon_addr.h
  cleanup_envelope.o: cleanup.h
  cleanup_envelope.o: ../include/argv.h
  cleanup_envelope.o: ../include/maps.h
***************
*** 157,166 ****
  cleanup_map1n.o: ../include/maps.h
  cleanup_map1n.o: ../include/cleanup_user.h
  cleanup_map1n.o: ../include/quote_822_local.h
  cleanup_map1n.o: cleanup.h
  cleanup_map1n.o: ../include/tok822.h
  cleanup_map1n.o: ../include/resolve_clnt.h
- cleanup_map1n.o: ../include/been_here.h
  cleanup_map1n.o: ../include/mail_stream.h
  cleanup_masquerade.o: cleanup_masquerade.c
  cleanup_masquerade.o: ../include/sys_defs.h
--- 159,168 ----
  cleanup_map1n.o: ../include/maps.h
  cleanup_map1n.o: ../include/cleanup_user.h
  cleanup_map1n.o: ../include/quote_822_local.h
+ cleanup_map1n.o: ../include/been_here.h
  cleanup_map1n.o: cleanup.h
  cleanup_map1n.o: ../include/tok822.h
  cleanup_map1n.o: ../include/resolve_clnt.h
  cleanup_map1n.o: ../include/mail_stream.h
  cleanup_masquerade.o: cleanup_masquerade.c
  cleanup_masquerade.o: ../include/sys_defs.h
diff -cr ../postfix-19991231-pl10/dns/Makefile.in ./dns/Makefile.in
*** ../postfix-19991231-pl10/dns/Makefile.in	Thu Dec 23 13:42:50 1999
--- ./dns/Makefile.in	Tue Nov 21 20:01:17 2000
***************
*** 20,26 ****
  all: $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 20,26 ----
  all: $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/error/Makefile.in ./error/Makefile.in
*** ../postfix-19991231-pl10/error/Makefile.in	Thu Dec 23 13:42:52 1999
--- ./error/Makefile.in	Tue Nov 21 20:01:28 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/fsstone/Makefile.in ./fsstone/Makefile.in
*** ../postfix-19991231-pl10/fsstone/Makefile.in	Sun Sep  5 22:36:25 1999
--- ./fsstone/Makefile.in	Sun Nov  5 19:27:19 2000
***************
*** 18,24 ****
  all:	$(PROG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  fsstone: fsstone.o $(LIBS)
  	$(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS)
--- 18,24 ----
  all:	$(PROG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  fsstone: fsstone.o $(LIBS)
  	$(CC) $(CFLAGS) -o $@ fsstone.o $(LIBS) $(SYSLIBS)
diff -cr ../postfix-19991231-pl10/global/Makefile.in ./global/Makefile.in
*** ../postfix-19991231-pl10/global/Makefile.in	Thu Dec 23 13:42:49 1999
--- ./global/Makefile.in	Tue Nov 21 20:01:00 2000
***************
*** 76,82 ****
  all: $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 76,82 ----
  all: $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/global/mail_params.h ./global/mail_params.h
*** ../postfix-19991231-pl10/global/mail_params.h	Sun May 28 18:52:09 2000
--- ./global/mail_params.h	Tue Nov 21 19:27:27 2000
***************
*** 438,444 ****
  extern int var_qmgr_fudge;
  
  #define VAR_QMGR_HOG		"qmgr_site_hog_factor"
! #define DEF_QMGR_HOG		90
  extern int var_qmgr_hog;
  
   /*
--- 438,444 ----
  extern int var_qmgr_fudge;
  
  #define VAR_QMGR_HOG		"qmgr_site_hog_factor"
! #define DEF_QMGR_HOG		100
  extern int var_qmgr_hog;
  
   /*
diff -cr ../postfix-19991231-pl10/html/Makefile.in ./html/Makefile.in
*** ../postfix-19991231-pl10/html/Makefile.in	Thu Jun 24 19:39:22 1999
--- ./html/Makefile.in	Sun Nov  5 19:27:20 2000
***************
*** 13,19 ****
  update:	$(DAEMONS) $(COMMANDS) $(CONFIG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  clean:
  	echo clean
--- 13,19 ----
  update:	$(DAEMONS) $(COMMANDS) $(CONFIG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  clean:
  	echo clean
diff -cr ../postfix-19991231-pl10/local/Makefile.in ./local/Makefile.in
*** ../postfix-19991231-pl10/local/Makefile.in	Thu Dec 23 13:42:57 1999
--- ./local/Makefile.in	Tue Nov 21 20:01:42 2000
***************
*** 25,31 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 25,31 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
***************
*** 331,336 ****
--- 331,337 ----
  maildir.o: ../include/make_dirs.h
  maildir.o: ../include/set_eugid.h
  maildir.o: ../include/get_hostname.h
+ maildir.o: ../include/sane_fsops.h
  maildir.o: ../include/mail_copy.h
  maildir.o: ../include/bounce.h
  maildir.o: ../include/sent.h
diff -cr ../postfix-19991231-pl10/local/recipient.c ./local/recipient.c
*** ../postfix-19991231-pl10/local/recipient.c	Sat Nov 13 19:14:31 1999
--- ./local/recipient.c	Tue Nov 21 20:03:10 2000
***************
*** 155,160 ****
--- 155,166 ----
  	return (deliver_indirect(state));
  
      /*
+      * Always forward recipients in :include: files.
+      */
+     if (state.msg_attr.exp_type == EXPAND_TYPE_INCL)
+ 	return (deliver_indirect(state));
+ 
+     /*
       * Delivery to local user. First try expansion of the recipient's
       * $HOME/.forward file, then mailbox delivery.
       */
diff -cr ../postfix-19991231-pl10/makedefs ./makedefs
*** ../postfix-19991231-pl10/makedefs	Sat Sep 16 19:37:00 2000
--- ./makedefs	Sun Nov  5 19:25:39 2000
***************
*** 157,170 ****
  		*)	echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;;
  		esac;;
      Linux.2*)	SYSTYPE=LINUX2
! 		for name in db nsl resolv
  		do
  		    test -f /usr/lib/lib$name.a && SYSLIBS="$SYSLIBS -l$name"
  		done
! 		if [ -f /usr/include/db_185.h ]; then
! 		    CCARGS="$CCARGS -DPATH_DB_H='<db_185.h>'"
  		elif [ -f /usr/include/db/db.h ]; then
! 		    CCARGS="$CCARGS -DPATH_DB_H='<db/db.h>'"
  		fi
  		;;
       IRIX*.5.*)	SYSTYPE=IRIX5
--- 157,179 ----
  		*)	echo "Unknown AIX version: `uname -v`." 1>&2; exit 1;;
  		esac;;
      Linux.2*)	SYSTYPE=LINUX2
! 		SYSLIBS="-ldb"
! 		for name in nsl resolv
  		do
  		    test -f /usr/lib/lib$name.a && SYSLIBS="$SYSLIBS -l$name"
  		done
! 		if [ -f /usr/include/db.h ]; then
! 		    : all set
  		elif [ -f /usr/include/db/db.h ]; then
! 		    CCARGS="$CCARGS -I/usr/include/db"
! 		else
! 		    # No, we're not going to try db1 db2 db3 etc.
! 		    # On a properly installed system, Postfix builds
! 		    # by including <db.h> and by linking with -ldb
! 		    echo "No <db.h> include file." 1>&2
! 		    echo "Install appropriate db development package first" 1>&2
! 		    echo "See the RELEASE_NOTES file for more information." 1>&2
! 		    exit 1
  		fi
  		;;
       IRIX*.5.*)	SYSTYPE=IRIX5
diff -cr ../postfix-19991231-pl10/man/Makefile.in ./man/Makefile.in
*** ../postfix-19991231-pl10/man/Makefile.in	Thu Jun 24 19:39:22 1999
--- ./man/Makefile.in	Sun Nov  5 19:27:20 2000
***************
*** 13,19 ****
  update:	$(DAEMONS) $(COMMANDS) $(CONFIG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  clean:
  	rm -f cat?/*
--- 13,19 ----
  update:	$(DAEMONS) $(COMMANDS) $(CONFIG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  clean:
  	rm -f cat?/*
diff -cr ../postfix-19991231-pl10/master/Makefile.in ./master/Makefile.in
*** ../postfix-19991231-pl10/master/Makefile.in	Thu Dec 23 13:42:51 1999
--- ./master/Makefile.in	Tue Nov 21 20:01:20 2000
***************
*** 27,33 ****
  all:	$(PROG) $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  $(PROG): $(OBJS) $(LIBS)
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
--- 27,33 ----
  all:	$(PROG) $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  $(PROG): $(OBJS) $(LIBS)
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
diff -cr ../postfix-19991231-pl10/pickup/Makefile.in ./pickup/Makefile.in
*** ../postfix-19991231-pl10/pickup/Makefile.in	Thu Dec 23 13:42:53 1999
--- ./pickup/Makefile.in	Tue Nov 21 20:01:30 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/pipe/Makefile.in ./pipe/Makefile.in
*** ../postfix-19991231-pl10/pipe/Makefile.in	Thu Dec 23 13:43:00 1999
--- ./pipe/Makefile.in	Tue Nov 21 20:02:01 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postalias/Makefile.in ./postalias/Makefile.in
*** ../postfix-19991231-pl10/postalias/Makefile.in	Thu Dec 23 13:43:01 1999
--- ./postalias/Makefile.in	Tue Nov 21 20:02:04 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postcat/Makefile.in ./postcat/Makefile.in
*** ../postfix-19991231-pl10/postcat/Makefile.in	Thu Dec 23 13:43:01 1999
--- ./postcat/Makefile.in	Tue Nov 21 20:02:05 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postconf/Makefile.in ./postconf/Makefile.in
*** ../postfix-19991231-pl10/postconf/Makefile.in	Thu Dec 23 13:43:01 1999
--- ./postconf/Makefile.in	Tue Nov 21 20:02:08 2000
***************
*** 26,32 ****
  	./$(PROG) -d |egrep -v '^(myhostname|mydomain|mynetworks) ' >$@
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 26,32 ----
  	./$(PROG) -d |egrep -v '^(myhostname|mydomain|mynetworks) ' >$@
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postdrop/Makefile.in ./postdrop/Makefile.in
*** ../postfix-19991231-pl10/postdrop/Makefile.in	Thu Dec 23 13:43:01 1999
--- ./postdrop/Makefile.in	Tue Nov 21 20:02:09 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postfix/Makefile.in ./postfix/Makefile.in
*** ../postfix-19991231-pl10/postfix/Makefile.in	Thu Dec 23 13:42:52 1999
--- ./postfix/Makefile.in	Tue Nov 21 20:01:25 2000
***************
*** 20,26 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 20,26 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postkick/Makefile.in ./postkick/Makefile.in
*** ../postfix-19991231-pl10/postkick/Makefile.in	Thu Dec 23 13:43:01 1999
--- ./postkick/Makefile.in	Tue Nov 21 20:02:11 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postlock/Makefile.in ./postlock/Makefile.in
*** ../postfix-19991231-pl10/postlock/Makefile.in	Thu Dec 23 13:43:02 1999
--- ./postlock/Makefile.in	Tue Nov 21 20:02:12 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postlog/Makefile.in ./postlog/Makefile.in
*** ../postfix-19991231-pl10/postlog/Makefile.in	Thu Dec 23 13:43:02 1999
--- ./postlog/Makefile.in	Tue Nov 21 20:02:13 2000
***************
*** 20,26 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 20,26 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postmap/Makefile.in ./postmap/Makefile.in
*** ../postfix-19991231-pl10/postmap/Makefile.in	Thu Dec 23 13:43:02 1999
--- ./postmap/Makefile.in	Tue Nov 21 20:02:13 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/postsuper/Makefile.in ./postsuper/Makefile.in
*** ../postfix-19991231-pl10/postsuper/Makefile.in	Thu Dec 23 13:43:02 1999
--- ./postsuper/Makefile.in	Tue Nov 21 20:02:15 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/qmgr/Makefile.in ./qmgr/Makefile.in
*** ../postfix-19991231-pl10/qmgr/Makefile.in	Thu Dec 23 20:04:47 1999
--- ./qmgr/Makefile.in	Tue Nov 21 20:01:50 2000
***************
*** 23,29 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 23,29 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/qmgr/qmgr_message.c ./qmgr/qmgr_message.c
*** ../postfix-19991231-pl10/qmgr/qmgr_message.c	Thu Jan 27 19:14:29 2000
--- ./qmgr/qmgr_message.c	Tue Nov 21 19:26:48 2000
***************
*** 97,102 ****
--- 97,103 ----
  #include <argv.h>
  #include <stringops.h>
  #include <myflock.h>
+ #include <stringops.h>
  
  /* Global library. */
  
***************
*** 459,464 ****
--- 460,471 ----
  	if (!STREQ(recipient->address, STR(reply.recipient)))
  	    UPDATE(recipient->address, STR(reply.recipient));
  
+ 	/*
+ 	 * XXX The nexthop destination is also used as lookup key for the
+ 	 * per-destination queue. Fold the nexthop to lower case so that we
+ 	 * don't have multiple queues for the same site.
+ 	 */
+ 	lowercase(STR(reply.nexthop));
  
  	/*
  	 * Bounce recipients that have moved. We do it here instead of in the
diff -cr ../postfix-19991231-pl10/qmgr/qmgr_queue.c ./qmgr/qmgr_queue.c
*** ../postfix-19991231-pl10/qmgr/qmgr_queue.c	Sun Mar 14 12:03:27 1999
--- ./qmgr/qmgr_queue.c	Tue Nov 21 19:43:35 2000
***************
*** 143,155 ****
  
      /*
       * Increase the destination's concurrency limit until we reach the
!      * transport's concurrency limit. Set the destination's concurrency limit
!      * to the actual concurrency + 1, so that qmgr_queue_throttle() takes
!      * effect quickly.
       */
      if (transport->dest_concurrency_limit == 0
! 	|| transport->dest_concurrency_limit > queue->busy_refcount)
! 	queue->window = queue->busy_refcount + 1;
  }
  
  /* qmgr_queue_throttle - handle destination delivery failure */
--- 143,155 ----
  
      /*
       * Increase the destination's concurrency limit until we reach the
!      * transport's concurrency limit. Allow for a margin the size of the
!      * initial destination concurrency, so that we're not too gentle.
       */
      if (transport->dest_concurrency_limit == 0
! 	|| transport->dest_concurrency_limit > queue->window)
! 	if (queue->window <= queue->busy_refcount + transport->init_dest_concurrency)
! 	    queue->window++;
  }
  
  /* qmgr_queue_throttle - handle destination delivery failure */
diff -cr ../postfix-19991231-pl10/sendmail/Makefile.in ./sendmail/Makefile.in
*** ../postfix-19991231-pl10/sendmail/Makefile.in	Thu Dec 23 13:42:52 1999
--- ./sendmail/Makefile.in	Tue Nov 21 20:01:27 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/showq/Makefile.in ./showq/Makefile.in
*** ../postfix-19991231-pl10/showq/Makefile.in	Thu Dec 23 13:43:00 1999
--- ./showq/Makefile.in	Tue Nov 21 20:02:03 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/smtp/Makefile.in ./smtp/Makefile.in
*** ../postfix-19991231-pl10/smtp/Makefile.in	Thu Dec 23 13:42:59 1999
--- ./smtp/Makefile.in	Tue Nov 21 20:01:55 2000
***************
*** 21,27 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 21,27 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/smtpd/Makefile.in ./smtpd/Makefile.in
*** ../postfix-19991231-pl10/smtpd/Makefile.in	Thu Dec 23 13:42:55 1999
--- ./smtpd/Makefile.in	Tue Nov 21 20:01:36 2000
***************
*** 21,27 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 21,27 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
***************
*** 106,111 ****
--- 106,112 ----
  smtpd.o: ../include/valid_hostname.h
  smtpd.o: ../include/dict.h
  smtpd.o: ../include/argv.h
+ smtpd.o: ../include/watchdog.h
  smtpd.o: ../include/mail_params.h
  smtpd.o: ../include/record.h
  smtpd.o: ../include/rec_type.h
diff -cr ../postfix-19991231-pl10/smtpstone/Makefile.in ./smtpstone/Makefile.in
*** ../postfix-19991231-pl10/smtpstone/Makefile.in	Thu Dec 23 13:42:52 1999
--- ./smtpstone/Makefile.in	Tue Nov 21 20:01:26 2000
***************
*** 18,24 ****
  all:	$(PROG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  smtp-sink: smtp-sink.o $(LIBS)
  	$(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS)
--- 18,24 ----
  all:	$(PROG)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  smtp-sink: smtp-sink.o $(LIBS)
  	$(CC) $(CFLAGS) -o $@ smtp-sink.o $(LIBS) $(SYSLIBS)
diff -cr ../postfix-19991231-pl10/spawn/Makefile.in ./spawn/Makefile.in
*** ../postfix-19991231-pl10/spawn/Makefile.in	Thu Dec 30 17:11:59 1999
--- ./spawn/Makefile.in	Sun Nov  5 19:27:21 2000
***************
*** 19,25 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 19,25 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/trivial-rewrite/Makefile.in ./trivial-rewrite/Makefile.in
*** ../postfix-19991231-pl10/trivial-rewrite/Makefile.in	Thu Dec 23 13:42:57 1999
--- ./trivial-rewrite/Makefile.in	Tue Nov 21 20:01:48 2000
***************
*** 24,30 ****
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 24,30 ----
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
diff -cr ../postfix-19991231-pl10/util/Makefile.in ./util/Makefile.in
*** ../postfix-19991231-pl10/util/Makefile.in	Mon Jan 24 12:32:49 2000
--- ./util/Makefile.in	Tue Nov 21 20:00:32 2000
***************
*** 83,89 ****
  all: $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs; cat $?) >$@
  
  test:	$(TESTPROG)
  
--- 83,89 ----
  all: $(LIB)
  
  Makefile: Makefile.in
! 	(set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../makedefs && cat $?) >$@
  
  test:	$(TESTPROG)
  
***************
*** 887,892 ****
--- 887,893 ----
  vstring_vstream.o: vstring_vstream.h
  watchdog.o: watchdog.c
  watchdog.o: sys_defs.h
+ watchdog.o: posix_signals.h
  watchdog.o: msg.h
  watchdog.o: mymalloc.h
  watchdog.o: watchdog.h