Module Name: src
Committed By: riz
Date: Mon Jan 7 15:41:57 UTC 2013
Modified Files:
src/doc [netbsd-6]: 3RDPARTY
src/external/ibm-public/postfix/dist [netbsd-6]: HISTORY makedefs
src/external/ibm-public/postfix/dist/src/global [netbsd-6]: dict_ldap.c
mail_version.h
src/external/ibm-public/postfix/dist/src/oqmgr [netbsd-6]:
qmgr_message.c
src/external/ibm-public/postfix/dist/src/postscreen [netbsd-6]:
postscreen_access.c
src/external/ibm-public/postfix/dist/src/util [netbsd-6]: myaddrinfo.c
sys_defs.h
Log Message:
doc/3RDPARTY 1.989, 1.991 via patch
external/ibm-public/postfix/dist/HISTORY patch
external/ibm-public/postfix/dist/makedefs patch
external/ibm-public/postfix/dist/src/global/dict_ldap.c patch
external/ibm-public/postfix/dist/src/global/mail_version.h patch
external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c patch
external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c patch
external/ibm-public/postfix/dist/src/util/myaddrinfo.c patch
external/ibm-public/postfix/dist/src/util/sys_defs.h patch
Update Postfix to version 2.8.13. Changes since version 2.8.12:
- The postscreen_access_list feature failed to ignore case in the first
character of a command (e.g., permit, reject, etc.). Reported by
Francis Picabia. (This fix is incorrectly listed in the HISTORY
files of earlier releases, and will be removed with a future patch.)
- Strip the datalink suffix (e.g., %eth0) from IPv6 addresses returned
by the system getaddrinfo() routine. Such suffixes break the default
mynetworks value, the Postfix SMTP server's reverse/forward DNS
name/address mapping check, and possibly more.
- To eliminate the possibility of collisions with connection cache
lookup keys, the Postfix LDAP client now computes those lookup keys
by joining the number-valued connection properties with ASCII null,
just like it already did with the string-valued connection
properties.
- There was a memory leak during one-time TLS library initialization
(introduced with Postfix 2.5). Reported by Coverity.
- There was a memory leak in the unused oqmgr(8) program (introduced
with Postfix 2.3). Reported by Coverity.
[tron, ticket #771]
To generate a diff of this commit:
cvs rdiff -u -r1.909.2.17 -r1.909.2.18 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.12.2.3 -r1.1.1.12.2.4 \
src/external/ibm-public/postfix/dist/HISTORY
cvs rdiff -u -r1.5 -r1.5.2.1 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.1.1.3.6.1 -r1.1.1.3.6.2 \
src/external/ibm-public/postfix/dist/src/global/dict_ldap.c
cvs rdiff -u -r1.1.1.12.2.3 -r1.1.1.12.2.4 \
src/external/ibm-public/postfix/dist/src/global/mail_version.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \
src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
src/external/ibm-public/postfix/dist/src/util/myaddrinfo.c
cvs rdiff -u -r1.3 -r1.3.2.1 \
src/external/ibm-public/postfix/dist/src/util/sys_defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.909.2.17 src/doc/3RDPARTY:1.909.2.18
--- src/doc/3RDPARTY:1.909.2.17 Tue Nov 20 23:16:36 2012
+++ src/doc/3RDPARTY Mon Jan 7 15:41:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.909.2.17 2012/11/20 23:16:36 riz Exp $
+# $NetBSD: 3RDPARTY,v 1.909.2.18 2013/01/07 15:41:55 riz Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -944,8 +944,8 @@ formatting in man pages, disallowing flo
and more.
Package: Postfix
-Version: 2.8.12
-Current Vers: 2.8.12/2.9.4
+Version: 2.8.13
+Current Vers: 2.8.13/2.9.5
Maintainer: Wietse Venema <wie...@porcupine.org>
Archive Site: ftp://postfix.cloud9.net/official/
Home Page: http://www.postfix.org/
Index: src/external/ibm-public/postfix/dist/HISTORY
diff -u src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.3 src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.4
--- src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.3 Sun Aug 12 19:25:22 2012
+++ src/external/ibm-public/postfix/dist/HISTORY Mon Jan 7 15:41:55 2013
@@ -16846,3 +16846,33 @@ Apologies for any names omitted.
Bugfix (introduced: 20000314): AUTH is not allowed after
MAIL. Timo Sirainen. File: smtpd/smtpd_sasl_proto.c.
+
+20121003
+
+ Bugfix: the postscreen_access_list feature was case-sensitive
+ in the first character of permit, reject, etc. Reported by
+ Francis Picabia. File: global/server_acl.c.
+
+20121010
+
+ Bugfix (introduced: Postfix 2.5): memory leak in program
+ initialization. Reported by Coverity. File: tls/tls_misc.c.
+
+ Bugfix (introduced: Postfix 2.3): memory leak in the unused
+ oqmgr program. Reported by Coverity. File: oqmgr/qmgr_message.c.
+
+20121013
+
+ Cleanup: to compute the LDAP connection cache lookup key,
+ join the numeric fields with null, just like string fields.
+ Viktor Dukhovni. File: global/dict_ldap.c.
+
+20121029
+
+ Workaround: strip datalink suffix from IPv6 addresses
+ returned by the system getaddrinfo() routine. Such suffixes
+ mess up the default mynetworks value, host name/address
+ verification and possibly more. This change obsoletes the
+ 20101108 change that removes datalink suffixes in the SMTP
+ and QMQP servers, but we leave that code alone. File:
+ util/myaddrinfo.c.
Index: src/external/ibm-public/postfix/dist/makedefs
diff -u src/external/ibm-public/postfix/dist/makedefs:1.5 src/external/ibm-public/postfix/dist/makedefs:1.5.2.1
--- src/external/ibm-public/postfix/dist/makedefs:1.5 Wed Nov 9 19:06:34 2011
+++ src/external/ibm-public/postfix/dist/makedefs Mon Jan 7 15:41:56 2013
@@ -146,6 +146,8 @@ case "$SYSTEM.$RELEASE" in
;;
FreeBSD.8*) SYSTYPE=FREEBSD8
;;
+ FreeBSD.9*) SYSTYPE=FREEBSD9
+ ;;
OpenBSD.2*) SYSTYPE=OPENBSD2
;;
OpenBSD.3*) SYSTYPE=OPENBSD3
Index: src/external/ibm-public/postfix/dist/src/global/dict_ldap.c
diff -u src/external/ibm-public/postfix/dist/src/global/dict_ldap.c:1.1.1.3.6.1 src/external/ibm-public/postfix/dist/src/global/dict_ldap.c:1.1.1.3.6.2
--- src/external/ibm-public/postfix/dist/src/global/dict_ldap.c:1.1.1.3.6.1 Sun Feb 19 18:28:54 2012
+++ src/external/ibm-public/postfix/dist/src/global/dict_ldap.c Mon Jan 7 15:41:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dict_ldap.c,v 1.1.1.3.6.1 2012/02/19 18:28:54 riz Exp $ */
+/* $NetBSD: dict_ldap.c,v 1.1.1.3.6.2 2013/01/07 15:41:56 riz Exp $ */
/*++
/* NAME
@@ -932,8 +932,11 @@ static void dict_ldap_conn_find(DICT_LDA
#endif
LDAP_CONN *conn;
+ /*
+ * Join key fields with null characters.
+ */
#define ADDSTR(vp, s) vstring_memcat((vp), (s), strlen((s))+1)
-#define ADDINT(vp, i) vstring_sprintf_append((vp), "%lu", (unsigned long)(i))
+#define ADDINT(vp, i) vstring_sprintf_append((vp), "%lu%c", (unsigned long)(i), 0)
ADDSTR(keybuf, dict_ldap->server_host);
ADDINT(keybuf, dict_ldap->server_port);
Index: src/external/ibm-public/postfix/dist/src/global/mail_version.h
diff -u src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.12.2.3 src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.12.2.4
--- src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.12.2.3 Sun Aug 12 19:25:23 2012
+++ src/external/ibm-public/postfix/dist/src/global/mail_version.h Mon Jan 7 15:41:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.1.1.12.2.3 2012/08/12 19:25:23 martin Exp $ */
+/* $NetBSD: mail_version.h,v 1.1.1.12.2.4 2013/01/07 15:41:56 riz Exp $ */
#ifndef _MAIL_VERSION_H_INCLUDED_
#define _MAIL_VERSION_H_INCLUDED_
@@ -22,8 +22,8 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20120801"
-#define MAIL_VERSION_NUMBER "2.8.12"
+#define MAIL_RELEASE_DATE "20121213"
+#define MAIL_VERSION_NUMBER "2.8.13"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
Index: src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c
diff -u src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c:1.1.1.3 src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c:1.1.1.3.6.1
--- src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c:1.1.1.3 Wed Mar 2 19:32:23 2011
+++ src/external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c Mon Jan 7 15:41:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: qmgr_message.c,v 1.1.1.3 2011/03/02 19:32:23 tron Exp $ */
+/* $NetBSD: qmgr_message.c,v 1.1.1.3.6.1 2013/01/07 15:41:57 riz Exp $ */
/*++
/* NAME
@@ -751,7 +751,7 @@ static int qmgr_message_read(QMGR_MESSAG
if (rec_type > 0)
msg_warn("%s: ignoring out-of-order DSN original recipient <%.200s>",
message->queue_id, dsn_orcpt);
- myfree(orig_rcpt);
+ myfree(dsn_orcpt);
}
if (orig_rcpt != 0) {
if (rec_type > 0)
Index: src/external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c
diff -u src/external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c:1.1.1.1 src/external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c:1.1.1.1.8.1
--- src/external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c:1.1.1.1 Wed Mar 2 19:32:26 2011
+++ src/external/ibm-public/postfix/dist/src/postscreen/postscreen_access.c Mon Jan 7 15:41:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: postscreen_access.c,v 1.1.1.1 2011/03/02 19:32:26 tron Exp $ */
+/* $NetBSD: postscreen_access.c,v 1.1.1.1.8.1 2013/01/07 15:41:57 riz Exp $ */
/*++
/* NAME
@@ -101,8 +101,8 @@ ARGV *psc_acl_parse(const char *acl, c
char *bp = saved_checks;
char *name;
-#define STREQ(x,y) ((*x) == (*y) && strcasecmp((x), (y)) == 0)
-#define STRNE(x,y) ((*x) != (*y) || strcasecmp((x), (y)) != 0)
+#define STREQ(x,y) (strcasecmp((x), (y)) == 0)
+#define STRNE(x,y) (strcasecmp((x), (y)) != 0)
/*
* Nested tables are not allowed. Tables are opened before entering the
Index: src/external/ibm-public/postfix/dist/src/util/myaddrinfo.c
diff -u src/external/ibm-public/postfix/dist/src/util/myaddrinfo.c:1.1.1.2 src/external/ibm-public/postfix/dist/src/util/myaddrinfo.c:1.1.1.2.6.1
--- src/external/ibm-public/postfix/dist/src/util/myaddrinfo.c:1.1.1.2 Wed Mar 2 19:32:44 2011
+++ src/external/ibm-public/postfix/dist/src/util/myaddrinfo.c Mon Jan 7 15:41:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: myaddrinfo.c,v 1.1.1.2 2011/03/02 19:32:44 tron Exp $ */
+/* $NetBSD: myaddrinfo.c,v 1.1.1.2.6.1 2013/01/07 15:41:57 riz Exp $ */
/*++
/* NAME
@@ -80,6 +80,7 @@
/* into printable form. The result buffers should be large
/* enough to hold the printable address or port including the
/* null terminator.
+/* This function strips off the IPv6 datalink suffix.
/*
/* sockaddr_to_hostname() converts a binary network address
/* into a hostname or service. The result buffer should be
@@ -204,6 +205,7 @@
#include <msg.h>
#include <inet_proto.h>
#include <myaddrinfo.h>
+#include <split_at.h>
/* Application-specific. */
@@ -609,16 +611,20 @@ int sockaddr_to_hostaddr(const struc
}
return (0);
#else
+ int ret;
/*
* Native getnameinfo(3) version.
*/
- return (getnameinfo(sa, salen,
- hostaddr ? hostaddr->buf : (char *) 0,
- hostaddr ? sizeof(hostaddr->buf) : 0,
- portnum ? portnum->buf : (char *) 0,
- portnum ? sizeof(portnum->buf) : 0,
- NI_NUMERICHOST | NI_NUMERICSERV));
+ ret = getnameinfo(sa, salen,
+ hostaddr ? hostaddr->buf : (char *) 0,
+ hostaddr ? sizeof(hostaddr->buf) : 0,
+ portnum ? portnum->buf : (char *) 0,
+ portnum ? sizeof(portnum->buf) : 0,
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ if (hostaddr != 0 && ret == 0 && sa->sa_family == AF_INET6)
+ (void) split_at(hostaddr->buf, '%');
+ return (ret);
#endif
}
Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h
diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3.2.1
--- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.3 Wed Nov 9 19:06:34 2011
+++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Mon Jan 7 15:41:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_defs.h,v 1.3 2011/11/09 19:06:34 tron Exp $ */
+/* $NetBSD: sys_defs.h,v 1.3.2.1 2013/01/07 15:41:57 riz Exp $ */
#ifndef _SYS_DEFS_H_INCLUDED_
#define _SYS_DEFS_H_INCLUDED_
@@ -27,7 +27,7 @@
*/
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
- || defined(FREEBSD8) \
+ || defined(FREEBSD8) || defined(FREEBSD9) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|| defined(OPENBSD5) \
