pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/postfix-current Updated mail/postfix-current to 2...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/709845e5551f
branches:  trunk
changeset: 392897:709845e5551f
user:      martti <martti%pkgsrc.org@localhost>
date:      Wed May 13 10:34:06 2009 +0000

description:
Updated mail/postfix-current to 2.7.20090511

This same as 2.6.0...

diffstat:

 mail/postfix-current/Makefile         |   6 +-
 mail/postfix-current/PLIST            |   9 ++++-
 mail/postfix-current/distinfo         |  18 +++++-----
 mail/postfix-current/patches/patch-ag |  10 ++--
 mail/postfix-current/patches/patch-ai |  18 +++++-----
 mail/postfix-current/patches/patch-as |  14 +++---
 mail/postfix-current/patches/patch-at |  62 ++++++++++------------------------
 mail/postfix-current/patches/patch-au |   2 +-
 mail/postfix-current/patches/patch-av |  10 ++--
 9 files changed, 66 insertions(+), 83 deletions(-)

diffs (truncated from 419 to 300 lines):

diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/Makefile     Wed May 13 10:34:06 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2009/05/12 12:27:19 martti Exp $
+# $NetBSD: Makefile,v 1.105 2009/05/13 10:34:06 martti Exp $
 
-DISTNAME=      postfix-2.6-20081205
-PKGNAME=       postfix-2.6.20081205
+DISTNAME=      postfix-2.7-20090511
+PKGNAME=       postfix-2.7.20090511
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
 MASTER_SITES+= http://postfix.it-austria.net/releases/experimental/
diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/PLIST
--- a/mail/postfix-current/PLIST        Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/PLIST        Wed May 13 10:34:06 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/05/13 10:34:06 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -9,7 +9,9 @@
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
+libexec/postfix/main.cf
 libexec/postfix/master
+libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
@@ -17,6 +19,8 @@
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
+libexec/postfix/postfix-wrapper
+libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
@@ -40,6 +44,7 @@
 man/man1/postlock.1
 man/man1/postlog.1
 man/man1/postmap.1
+man/man1/postmulti.1
 man/man1/postqueue.1
 man/man1/postsuper.1
 man/man1/qshape.1
@@ -59,6 +64,7 @@
 man/man5/pcre_table.5
 man/man5/pgsql_table.5
 man/man5/postconf.5
+man/man5/postfix-wrapper.5
 man/man5/regexp_table.5
 man/man5/relocated.5
 man/man5/tcp_table.5
@@ -126,6 +132,7 @@
 share/doc/postfix/LOCAL_RECIPIENT_README
 share/doc/postfix/MAILDROP_README
 share/doc/postfix/MILTER_README
+share/doc/postfix/MULTI_INSTANCE_README
 share/doc/postfix/MYSQL_README
 share/doc/postfix/NFS_README
 share/doc/postfix/OVERVIEW
diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/distinfo
--- a/mail/postfix-current/distinfo     Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/distinfo     Wed May 13 10:34:06 2009 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.51 2009/01/05 10:25:39 martti Exp $
+$NetBSD: distinfo,v 1.52 2009/05/13 10:34:06 martti Exp $
 
-SHA1 (postfix/postfix-2.6-20081205.tar.gz) = 56a18a5fa084896ed2e7386773dcc58ed3af65a8
-RMD160 (postfix/postfix-2.6-20081205.tar.gz) = acee503b01233acd0f77de3d40b113edca3cff42
-Size (postfix/postfix-2.6-20081205.tar.gz) = 3180585 bytes
+SHA1 (postfix/postfix-2.7-20090511.tar.gz) = d1893f38a2066fcd8e9a6157bc8f4cdc14b7fc28
+RMD160 (postfix/postfix-2.7-20090511.tar.gz) = 7226d666f7da1cdcf9de2e7ac445ae58fc2a30a9
+Size (postfix/postfix-2.7-20090511.tar.gz) = 3322707 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = 643d6aea9574bbe05d252638b34ce132cd9bc4ac
-SHA1 (patch-ai) = a9a1e0ebcf38c570c51283006419f7a4fdac2225
-SHA1 (patch-as) = b70ce22b253a011f4917ed170db29da2c92f675b
-SHA1 (patch-at) = cb8a292f56c985a68e112e7fad8b05b482886251
+SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa
+SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e
+SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622
+SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
-SHA1 (patch-av) = b1569145f8ff0d81351ca6b94a1172260ba6b932
+SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73
diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/patches/patch-ag
--- a/mail/postfix-current/patches/patch-ag     Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/patches/patch-ag     Wed May 13 10:34:06 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.19 2008/11/03 00:47:36 taca Exp $
+$NetBSD: patch-ag,v 1.20 2009/05/13 10:34:06 martti Exp $
 
 Only define HAS_DB if it hasn't been defined.
 Add support for NetBSD 5.x and DragonFly BSD.
 
---- src/util/sys_defs.h.orig   2008-08-23 05:47:16.000000000 +0900
-+++ src/util/sys_defs.h
+--- src/util/sys_defs.h.orig   2009-05-11 03:45:27.000000000 +0300
++++ src/util/sys_defs.h        2009-05-13 12:25:40.000000000 +0300
 @@ -28,8 +28,8 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
@@ -26,7 +26,7 @@
  #define HAS_SA_LEN
  #define DEF_DB_TYPE   "hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -155,9 +157,19 @@
+@@ -158,9 +160,19 @@
  #define HAS_FUTIMES
  #endif
  
@@ -46,7 +46,7 @@
      || defined(USAGI_LIBINET6)
  #ifndef NO_IPV6
  # define HAS_IPV6
-@@ -166,14 +178,16 @@
+@@ -169,14 +181,16 @@
  
  #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/patches/patch-ai
--- a/mail/postfix-current/patches/patch-ai     Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/patches/patch-ai     Wed May 13 10:34:06 2009 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ai,v 1.22 2008/11/03 00:47:36 taca Exp $
+$NetBSD: patch-ai,v 1.23 2009/05/13 10:34:06 martti Exp $
 
 Make this pkgsrc friendly.
 Add support for NetBSD 5.x and DragonFly BSD.
 
---- makedefs.orig      2008-09-04 08:46:54.000000000 +0900
-+++ makedefs
-@@ -144,6 +144,8 @@ case "$SYSTEM.$RELEASE" in
+--- makedefs.orig      2009-05-12 00:26:46.000000000 +0300
++++ makedefs   2009-05-13 12:26:34.000000000 +0300
+@@ -144,6 +144,8 @@
                ;;
    FreeBSD.7*) SYSTYPE=FREEBSD7
                ;;
@@ -14,7 +14,7 @@
    OpenBSD.2*) SYSTYPE=OPENBSD2
                ;;
    OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -160,6 +162,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -160,6 +162,8 @@
                ;;
     NetBSD.4*) SYSTYPE=NETBSD4
                ;;
@@ -23,7 +23,7 @@
     BSD/OS.2*) SYSTYPE=BSDI2
                ;;
     BSD/OS.3*) SYSTYPE=BSDI3
-@@ -210,13 +214,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -212,13 +216,6 @@
                esac
                ;;
     ULTRIX.4*) SYSTYPE=ULTRIX4
@@ -37,7 +37,7 @@
                for l in syslog resolv; do
                    if [ -f /usr/local/lib/lib$l.a ]; then
                        SYSLIBS="$SYSLIBS -l$l"
-@@ -248,25 +245,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -250,25 +247,8 @@
                esac;;
                # Tested with RedHat 3.03 on 20020729.
      Linux.1*) SYSTYPE=LINUX1
@@ -63,7 +63,7 @@
                # GDBM locks the DBM .pag file after open. This breaks postmap.
                # if [ -f /usr/include/gdbm-ndbm.h ]
                # then
-@@ -277,7 +257,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -279,7 +259,6 @@
                #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
                #     GDBM_LIBS=gdbm
                # fi
@@ -71,7 +71,7 @@
                for name in nsl resolv $GDBM_LIBS
                do
                    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -370,25 +349,13 @@ EOF
+@@ -372,25 +351,13 @@
  HP-UX.A.09.*) SYSTYPE=HPUX9
                SYSLIBS=-ldbm
                CCARGS="$CCARGS -DMISSING_USLEEP"
diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/patches/patch-as
--- a/mail/postfix-current/patches/patch-as     Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/patches/patch-as     Wed May 13 10:34:06 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-as,v 1.4 2008/10/16 09:56:58 martti Exp $
+$NetBSD: patch-as,v 1.5 2009/05/13 10:34:06 martti Exp $
 
 Support for sqlite.
 
---- src/global/Makefile.in.orig        2007-12-06 14:49:03.000000000 +0100
-+++ src/global/Makefile.in
+--- src/global/Makefile.in.orig        2009-02-13 03:25:05.000000000 +0200
++++ src/global/Makefile.in     2009-05-13 12:27:54.000000000 +0300
 @@ -4,7 +4,7 @@
        clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \
        defer.c deliver_completed.c deliver_flock.c deliver_pass.c \
@@ -13,7 +13,7 @@
        dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \
        ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \
        header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
        clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
        defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
        deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \
@@ -22,7 +22,7 @@
        dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \
        ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \
        header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@
        canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \
        conv_time.h db_common.h debug_peer.h debug_process.h defer.h \
        deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \
@@ -31,7 +31,7 @@
        dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \
        dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \
        file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \
-@@ -860,6 +860,13 @@
+@@ -862,6 +862,13 @@
  dict_proxy.o: dict_proxy.h
  dict_proxy.o: mail_params.h
  dict_proxy.o: mail_proto.h
@@ -45,7 +45,7 @@
  domain_list.o: ../../include/match_list.h
  domain_list.o: ../../include/match_ops.h
  domain_list.o: ../../include/sys_defs.h
-@@ -1219,6 +1226,7 @@
+@@ -1233,6 +1240,7 @@
  mail_dict.o: dict_mysql.h
  mail_dict.o: dict_pgsql.h
  mail_dict.o: dict_proxy.h
diff -r b3e3c31a17bc -r 709845e5551f mail/postfix-current/patches/patch-at
--- a/mail/postfix-current/patches/patch-at     Wed May 13 10:33:23 2009 +0000
+++ b/mail/postfix-current/patches/patch-at     Wed May 13 10:34:06 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-at,v 1.4 2008/10/16 09:56:58 martti Exp $
+$NetBSD: patch-at,v 1.5 2009/05/13 10:34:06 martti Exp $
 
 Support for sqlite.
 
 --- src/global/dict_sqlite.c.orig      2008-10-17 00:40:21.000000000 +0200
 +++ src/global/dict_sqlite.c
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,254 @@
 +/*++
 +/* NAME
 +/*    dict_sqlite 3
@@ -46,15 +46,18 @@
 +/*    Configuration parameters:
 +/*
 +/*    The parameters encodes a number of pieces of information:
-+/*    dbpath, query, result_format and expansion_limit:
++/*    dbpath, query, table, select_field and where_field:
 +/* .IP \fIdbpath\fR
 +/*    Path to SQLite database
 +/* .IP \fIquery\fR
-+/*    Query template, before the query is actually issued, variable
-+/*    substitutions are performed. See sqlite_table(5) for details. 
++/*      Query template, before the query is actually issued, variable
++/*    substitutions are performed. See sqlite_table(5) for details. If
++/*    No query is specified, the legacy variables \fItable\fR,
++/*    \fIselect_field\fR, \fIwhere_field\fR and \fIadditional_conditions\fR
++/*    are used to construct the query template.
 +/* .IP \fIresult_format\fR
-+/*    The format used to expand results from queries.  Substitutions
-+/*    are performed as described in sqlite_table(5). Defaults to returning
++/*      The format used to expand results from queries.  Substitutions
++/*      are performed as described in sqlite_table(5). Defaults to returning
 +/*    the lookup result unchanged.
 +/* .IP expansion_limit
 +/*    Limit (if any) on the total number of lookup result values. Lookups which
@@ -75,17 +78,12 @@
 +#ifdef HAS_SQLITE
 +#include <sqlite3.h> 
 +
-+#if !defined(SQLITE_VERSION_NUMBER) || (SQLITE_VERSION_NUMBER < 3005004)
-+#error "Your SQLite version is too old"
-+#endif
-+
 +/* Utility library. */
 +
 +#include "msg.h"
 +#include "dict.h"
 +#include "vstring.h"
 +#include "stringops.h"
-+#include "mymalloc.h"
 +
 +/* Global library. */
 +



Home | Main Index | Thread Index | Old Index