diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile index 0651e8678f2..8941f3c5992 100644 --- a/mail/postfix/snapshot/Makefile +++ b/mail/postfix/snapshot/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.9 2000/12/18 10:52:32 jakob Exp $ +# $OpenBSD: Makefile,v 1.10 2001/02/01 07:28:12 jakob Exp $ -DISTNAME= snapshot-20001217 +DISTNAME= snapshot-20010130 PKGNAME= postfix-${DISTNAME} MASTER_SITE_SUBDIR= experimental diff --git a/mail/postfix/snapshot/files/md5 b/mail/postfix/snapshot/files/md5 index 921f8b75ca9..ee89e8b4853 100644 --- a/mail/postfix/snapshot/files/md5 +++ b/mail/postfix/snapshot/files/md5 @@ -1,3 +1,3 @@ -MD5 (postfix/snapshot-20001217.tar.gz) = b6ef69548b58b23001dd9d3c56896aba -RMD160 (postfix/snapshot-20001217.tar.gz) = bba8f4262671a738dfdde15562c74f92792f9ab4 -SHA1 (postfix/snapshot-20001217.tar.gz) = 6dc5fb915c0286b0fe6e7d1c8a66666fb1c11774 +MD5 (postfix/snapshot-20010130.tar.gz) = eaf9436cc2b020f094ef1ac0323a1c36 +RMD160 (postfix/snapshot-20010130.tar.gz) = f4e6fb35d641f078c7bfa67a1cbe48cefe72a63b +SHA1 (postfix/snapshot-20010130.tar.gz) = 441b3b7e89eab5895d91c86b97080c22788a19d6 diff --git a/mail/postfix/snapshot/patches/patch-fallback_relay b/mail/postfix/snapshot/patches/patch-fallback_relay deleted file mode 100644 index 50881566e86..00000000000 --- a/mail/postfix/snapshot/patches/patch-fallback_relay +++ /dev/null @@ -1,180 +0,0 @@ -*** src/smtp/smtp.h Sat Jul 15 14:06:34 2000 ---- ./smtp.h Sat Jan 20 18:30:34 2001 -*************** -*** 85,91 **** - */ - extern SMTP_SESSION *smtp_connect(char *, VSTRING *); - extern SMTP_SESSION *smtp_connect_host(char *, unsigned, VSTRING *); -! extern SMTP_SESSION *smtp_connect_domain(char *, unsigned, VSTRING *); - - /* - * smtp_proto.c ---- 85,91 ---- - */ - extern SMTP_SESSION *smtp_connect(char *, VSTRING *); - extern SMTP_SESSION *smtp_connect_host(char *, unsigned, VSTRING *); -! extern SMTP_SESSION *smtp_connect_domain(char *, unsigned, VSTRING *, int *); - - /* - * smtp_proto.c -*** src/smtp/smtp_addr.c Mon Nov 20 13:06:02 2000 ---- ./smtp_addr.c Sat Jan 20 18:34:23 2001 -*************** -*** 6,14 **** - /* SYNOPSIS - /* #include "smtp_addr.h" - /* -! /* DNS_RR *smtp_domain_addr(name, why) - /* char *name; - /* VSTRING *why; - /* - /* DNS_RR *smtp_host_addr(name, why) - /* char *name; ---- 6,15 ---- - /* SYNOPSIS - /* #include "smtp_addr.h" - /* -! /* DNS_RR *smtp_domain_addr(name, why, found_myself) - /* char *name; - /* VSTRING *why; -+ /* int *found_myself; - /* - /* DNS_RR *smtp_host_addr(name, why) - /* char *name; -*************** -*** 279,289 **** - - /* smtp_domain_addr - mail exchanger address lookup */ - -! DNS_RR *smtp_domain_addr(char *name, VSTRING *why) - { - DNS_RR *mx_names; - DNS_RR *addr_list = 0; -! DNS_RR *self; - unsigned best_pref; - unsigned best_found; - ---- 280,290 ---- - - /* smtp_domain_addr - mail exchanger address lookup */ - -! DNS_RR *smtp_domain_addr(char *name, VSTRING *why, int *found_myself) - { - DNS_RR *mx_names; - DNS_RR *addr_list = 0; -! DNS_RR *self = 0; - unsigned best_pref; - unsigned best_found; - -*************** -*** 363,368 **** ---- 364,370 ---- - /* - * Clean up. - */ -+ *found_myself = (self != 0); - return (addr_list); - } - -*** src/smtp/smtp_addr.h Mon Jan 18 15:11:48 1999 ---- ./smtp_addr.h Sat Jan 20 18:34:53 2001 -*************** -*** 17,23 **** - * Internal interfaces. - */ - extern DNS_RR *smtp_host_addr(char *, VSTRING *); -! extern DNS_RR *smtp_domain_addr(char *, VSTRING *); - - /* LICENSE - /* .ad ---- 17,23 ---- - * Internal interfaces. - */ - extern DNS_RR *smtp_host_addr(char *, VSTRING *); -! extern DNS_RR *smtp_domain_addr(char *, VSTRING *, int *); - - /* LICENSE - /* .ad -*** src/smtp/smtp_connect.c Mon Nov 20 13:06:03 2000 ---- ./smtp_connect.c Sat Jan 20 18:36:00 2001 -*************** -*** 292,298 **** - - /* smtp_connect_domain - connect to smtp server for domain */ - -! SMTP_SESSION *smtp_connect_domain(char *name, unsigned port, VSTRING *why) - { - SMTP_SESSION *session = 0; - DNS_RR *addr_list; ---- 292,299 ---- - - /* smtp_connect_domain - connect to smtp server for domain */ - -! SMTP_SESSION *smtp_connect_domain(char *name, unsigned port, VSTRING *why, -! int *found_myself) - { - SMTP_SESSION *session = 0; - DNS_RR *addr_list; -*************** -*** 306,312 **** - * the primary MX host is reachable but does not want to receive our - * mail, there is no point in trying the backup hosts. - */ -! addr_list = smtp_domain_addr(name, why); - for (addr = addr_list; addr; addr = addr->next) { - if ((session = smtp_connect_addr(addr, port, why)) != 0) { - session->best = (addr->pref == addr_list->pref); ---- 307,313 ---- - * the primary MX host is reachable but does not want to receive our - * mail, there is no point in trying the backup hosts. - */ -! addr_list = smtp_domain_addr(name, why, found_myself); - for (addr = addr_list; addr; addr = addr->next) { - if ((session = smtp_connect_addr(addr, port, why)) != 0) { - session->best = (addr->pref == addr_list->pref); -*************** -*** 393,398 **** ---- 394,400 ---- - char *save; - char *dest; - char *cp; -+ int found_myself; - - /* - * First try to deliver to the indicated destination, then try to deliver -*************** -*** 417,423 **** - if (var_disable_dns || *dest == '[') { - session = smtp_connect_host(host, port, why); - } else { -! session = smtp_connect_domain(host, port, why); - } - myfree(dest_buf); - ---- 419,425 ---- - if (var_disable_dns || *dest == '[') { - session = smtp_connect_host(host, port, why); - } else { -! session = smtp_connect_domain(host, port, why, &found_myself); - } - myfree(dest_buf); - -*************** -*** 426,432 **** - * is the best MX relay for the destination. Agreed, an errno of OK - * after failure is a weird way to reporting progress. - */ -! if (session != 0 || smtp_errno == SMTP_OK) - break; - } - ---- 428,434 ---- - * is the best MX relay for the destination. Agreed, an errno of OK - * after failure is a weird way to reporting progress. - */ -! if (session != 0 || smtp_errno == SMTP_OK || found_myself) - break; - } - - - diff --git a/mail/postfix/snapshot/patches/patch-master.cf b/mail/postfix/snapshot/patches/patch-master.cf index 568d90f349f..670c36fbdaf 100644 --- a/mail/postfix/snapshot/patches/patch-master.cf +++ b/mail/postfix/snapshot/patches/patch-master.cf @@ -1,6 +1,6 @@ ---- conf/master.cf.orig Wed Oct 4 02:13:32 2000 -+++ conf/master.cf Thu Oct 5 21:39:05 2000 -@@ -67,20 +67,20 @@ +--- conf/master.cf.orig Sun Jan 28 21:54:01 2001 ++++ conf/master.cf Thu Feb 1 08:22:24 2001 +@@ -67,21 +67,21 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (50) # ========================================================================== @@ -29,6 +29,7 @@ +showq unix n - - - - showq +error unix - - - - - error local unix - n n - - local + virtual unix - n n - - virtual -lmtp unix - - n - - lmtp +lmtp unix - - - - - lmtp cyrus unix - n n - - pipe