pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q3]: pkgsrc/mail/postfix-current Pullup ticket 801 - reque...
details: https://anonhg.NetBSD.org/pkgsrc/rev/de26d7e61760
branches: pkgsrc-2005Q3
changeset: 499560:de26d7e61760
user: salo <salo%pkgsrc.org@localhost>
date: Wed Oct 05 13:45:39 2005 +0000
description:
Pullup ticket 801 - requested by Martti Kuparinen
postfix-current update and PLIST fix
Revisions pulled up:
- pkgsrc/mail/postfix-current/MESSAGE.sasl 1.3
- pkgsrc/mail/postfix-current/MESSAGE.tls removed
- pkgsrc/mail/postfix-current/Makefile 1.45
- pkgsrc/mail/postfix-current/PLIST 1.7, 1.8
- pkgsrc/mail/postfix-current/PLIST.inet6 removed
- pkgsrc/mail/postfix-current/PLIST.sasl removed
- pkgsrc/mail/postfix-current/PLIST.tls removed
- pkgsrc/mail/postfix-current/distinfo 1.14
- pkgsrc/mail/postfix-current/options.mk 1.11
- pkgsrc/mail/postfix-current/patches/patch-aa 1.15
- pkgsrc/mail/postfix-current/patches/patch-ab 1.8
- pkgsrc/mail/postfix-current/patches/patch-ac 1.6
- pkgsrc/mail/postfix-current/patches/patch-ag 1.9
- pkgsrc/mail/postfix-current/patches/patch-ai 1.10
Module Name: pkgsrc
Committed By: martti
Date: Fri Sep 30 05:42:38 UTC 2005
Modified Files:
pkgsrc/mail/postfix-current: PLIST
Removed Files:
pkgsrc/mail/postfix-current: PLIST.tls
Log Message:
Fix PLIST issues noted in bulkbuilds
---
Module Name: pkgsrc
Committed By: martti
Date: Fri Sep 30 06:04:32 UTC 2005
Modified Files:
pkgsrc/mail/postfix-current: MESSAGE.sasl Makefile PLIST distinfo
options.mk
pkgsrc/mail/postfix-current/patches: patch-aa patch-ag patch-ai
Added Files:
pkgsrc/mail/postfix-current/patches: patch-ab patch-ac
Removed Files:
pkgsrc/mail/postfix-current: MESSAGE.tls PLIST.inet6 PLIST.sasl
Log Message:
Updated postfix-current to 2.3-20050922
* lots of bug fixes and new features (see RELEASE_NOTES for details)
* sync PLIST.*, MESSAGE.*, Makefile and options.mk with pkgsrc/mail/postfix
diffstat:
mail/postfix-current/MESSAGE.sasl | 22 +++++++-
mail/postfix-current/MESSAGE.tls | 20 --------
mail/postfix-current/Makefile | 16 ++----
mail/postfix-current/PLIST | 21 ++++++--
mail/postfix-current/PLIST.inet6 | 2 -
mail/postfix-current/PLIST.sasl | 2 -
mail/postfix-current/PLIST.tls | 5 --
mail/postfix-current/distinfo | 16 +++--
mail/postfix-current/options.mk | 87 ++++++++++++----------------------
mail/postfix-current/patches/patch-aa | 10 ++--
mail/postfix-current/patches/patch-ab | 14 +++++
mail/postfix-current/patches/patch-ac | 27 ++++++++++
mail/postfix-current/patches/patch-ag | 41 ++--------------
mail/postfix-current/patches/patch-ai | 74 +++++++++++++++++++++--------
14 files changed, 184 insertions(+), 173 deletions(-)
diffs (truncated from 603 to 300 lines):
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/MESSAGE.sasl
--- a/mail/postfix-current/MESSAGE.sasl Wed Oct 05 12:19:11 2005 +0000
+++ b/mail/postfix-current/MESSAGE.sasl Wed Oct 05 13:45:39 2005 +0000
@@ -1,16 +1,30 @@
===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.2 2004/07/31 05:53:44 jlam Exp $
+$NetBSD: MESSAGE.sasl,v 1.2.10.1 2005/10/05 13:45:39 salo Exp $
-To enable SASL authentication, you may want to edit
+To enable SASL authentication in the SMTP server, you may want to edit
${SASLLIBDIR}/smtpd.conf
and change the method used to check plaintext passwords. To use
-security/cyrus-saslauthd, you should change the contents of smtpd.conf to:
+security/cyrus-saslauthd, you should change the contents of smtpd.conf
+to:
pwcheck_method: saslauthd
-Please consult:
+You may also want to edit
+
+ ${PKG_SYSCONFDIR}/main.cf
+
+and set the smtpd_sasl_* variables to appropriate values.
+
+To enable SASL authentication in the SMTP client, you may want to edit
+
+ ${PKG_SYSCONFDIR}/main.cf
+
+and set the smtp_sasl_* variables to appropriate values.
+
+The corresponding SASL authentication plugins will also need to be
+installed. Please consult:
${DOCDIR}/SASL_README
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/MESSAGE.tls
--- a/mail/postfix-current/MESSAGE.tls Wed Oct 05 12:19:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.tls,v 1.2 2004/07/31 05:53:44 jlam Exp $
-
-To enable TLS, you might need to reconfigure the following files:
-
- ${PKG_SYSCONFDIR}/main.cf
- ${PKG_SYSCONFDIR}/master.cf
-
-master.cf:
-----------
-# ==========================================================================
-# service type private unpriv chroot wakeup maxproc command + args
-# ==========================================================================
-tlsmgr fifo - - y 300 1 tlsmgr
-smtps inet n - y - - smtpd
- -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-submission inet n - y - - smtpd
- -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-
-===========================================================================
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile Wed Oct 05 12:19:11 2005 +0000
+++ b/mail/postfix-current/Makefile Wed Oct 05 13:45:39 2005 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.44 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.44.2.1 2005/10/05 13:45:39 salo Exp $
-DISTNAME= postfix-2.3-20050726
+DISTNAME= postfix-2.3-20050922
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
http://public.planetmirror.com.au/pub/postfix/experimental/
-DIST_SUBDIR= postfix
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.postfix.org/
COMMENT= Postfix SMTP server and tools
+DIST_SUBDIR= postfix
+
CONFLICTS+= sendmail-[0-9]* fastforward>=0.51nb2
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -105,6 +106,8 @@
CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
.endif
+MAKE_ENV+= DEBUG= # empty
+
do-configure:
cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
@@ -117,10 +120,6 @@
${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
.endif
-POSTFIX_EXAMPLE_FILES= LICENSE access aliases canonical header_checks \
- main.cf main.cf.default makedefs.out master.cf \
- postfix-files relocated transport virtual
-
do-install:
${INSTALL_DATA_DIR} ${LIBEXECDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
@@ -129,9 +128,6 @@
.if !empty(PKG_OPTIONS:Msasl)
${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
.endif
- @for i in ${POSTFIX_EXAMPLE_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/conf/$$i ${EXAMPLEDIR}/$$i; \
- done
${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/PLIST
--- a/mail/postfix-current/PLIST Wed Oct 05 12:19:11 2005 +0000
+++ b/mail/postfix-current/PLIST Wed Oct 05 13:45:39 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/08/14 21:51:02 christos Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2005/10/05 13:45:39 salo Exp $
bin/mailq
bin/newaliases
libexec/postfix/anvil
@@ -22,6 +22,7 @@
libexec/postfix/smtp
libexec/postfix/smtpd
libexec/postfix/spawn
+libexec/postfix/tlsmgr
libexec/postfix/trivial-rewrite
libexec/postfix/verify
libexec/postfix/virtual
@@ -44,9 +45,12 @@
man/man5/body_checks.5
man/man5/canonical.5
man/man5/cidr_table.5
+man/man5/generic.5
man/man5/header_checks.5
man/man5/ldap_table.5
+man/man5/master.5
man/man5/mysql_table.5
+man/man5/nisplus_table.5
man/man5/pcre_table.5
man/man5/pgsql_table.5
man/man5/postconf.5
@@ -59,6 +63,7 @@
man/man8/bounce.8
man/man8/cleanup.8
man/man8/defer.8
+man/man8/discard.8
man/man8/error.8
man/man8/flush.8
man/man8/lmtp.8
@@ -70,10 +75,12 @@
man/man8/proxymap.8
man/man8/qmgr.8
man/man8/qmqpd.8
+man/man8/scache.8
man/man8/showq.8
man/man8/smtp.8
man/man8/smtpd.8
man/man8/spawn.8
+man/man8/tlsmgr.8
man/man8/trace.8
man/man8/trivial-rewrite.8
man/man8/verify.8
@@ -97,13 +104,17 @@
share/doc/postfix/BACKSCATTER_README
share/doc/postfix/BASIC_CONFIGURATION_README
share/doc/postfix/BUILTIN_FILTER_README
+share/doc/postfix/CDB_README
+share/doc/postfix/CONNECTION_CACHE_README
share/doc/postfix/CONTENT_INSPECTION_README
share/doc/postfix/DATABASE_README
share/doc/postfix/DB_README
share/doc/postfix/DEBUG_README
+share/doc/postfix/DSN_README
share/doc/postfix/ETRN_README
share/doc/postfix/FILTER_README
share/doc/postfix/INSTALL
+share/doc/postfix/IPV6_README
share/doc/postfix/LDAP_README
share/doc/postfix/LINUX_README
share/doc/postfix/LMTP_README
@@ -125,6 +136,7 @@
share/doc/postfix/SMTPD_POLICY_README
share/doc/postfix/SMTPD_PROXY_README
share/doc/postfix/STANDARD_CONFIGURATION_README
+share/doc/postfix/TLS_README
share/doc/postfix/TUNING_README
share/doc/postfix/ULTRIX_README
share/doc/postfix/UUCP_README
@@ -132,15 +144,13 @@
share/doc/postfix/VIRTUAL_README
share/doc/postfix/XCLIENT_README
share/doc/postfix/XFORWARD_README
-share/doc/postfix/CDB_README
-share/doc/postfix/DSN_README
-share/doc/postfix/CONNECTION_CACHE_README
share/examples/postfix/LICENSE
+share/examples/postfix/TLS_LICENSE
share/examples/postfix/access
share/examples/postfix/aliases
share/examples/postfix/canonical
+share/examples/postfix/generic
share/examples/postfix/header_checks
-share/examples/postfix/generic
share/examples/postfix/mailer.conf
share/examples/postfix/main.cf
share/examples/postfix/main.cf.default
@@ -150,6 +160,7 @@
share/examples/postfix/postfix-files
share/examples/postfix/postfix-script
share/examples/postfix/relocated
+${SASL}share/examples/postfix/smtpd.conf
share/examples/postfix/transport
share/examples/postfix/virtual
share/examples/rc.d/postfix
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/PLIST.inet6
--- a/mail/postfix-current/PLIST.inet6 Wed Oct 05 12:19:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.inet6,v 1.1 2004/08/07 17:08:26 jlam Exp $
-share/doc/postfix/IPV6_README
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/PLIST.sasl
--- a/mail/postfix-current/PLIST.sasl Wed Oct 05 12:19:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.sasl,v 1.1.1.1 2004/03/06 15:04:12 grant Exp $
-share/examples/postfix/smtpd.conf
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/PLIST.tls
--- a/mail/postfix-current/PLIST.tls Wed Oct 05 12:19:11 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.tls,v 1.4 2005/08/14 21:51:02 christos Exp $
-libexec/postfix/tlsmgr
-man/man8/tlsmgr.8
-share/examples/postfix/TLS_LICENSE
-share/doc/postfix/TLS_README
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/distinfo
--- a/mail/postfix-current/distinfo Wed Oct 05 12:19:11 2005 +0000
+++ b/mail/postfix-current/distinfo Wed Oct 05 13:45:39 2005 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.13 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.13.2.1 2005/10/05 13:45:39 salo Exp $
-SHA1 (postfix/postfix-2.3-20050726.tar.gz) = 7b5c10f01a003b4764c6e4a672ae866ca53e793c
-RMD160 (postfix/postfix-2.3-20050726.tar.gz) = 4eecae72057e23c97f05280485ad2ce9d1df7973
-Size (postfix/postfix-2.2-20040628.tar.gz) = 2504873 bytes
-SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
-SHA1 (patch-ag) = 806a75127cb596059ca68664ad7ba070e96cc589
-SHA1 (patch-ai) = 14fdae53a54422c9714442df2bc7c308393e0dfa
+SHA1 (postfix/postfix-2.3-20050922.tar.gz) = 392548fef18c860bc6d75155f0e6b259fd4489a5
+RMD160 (postfix/postfix-2.3-20050922.tar.gz) = 848bcfcc5e044fdae3f42ed384bbc7bea98a1ae5
+Size (postfix/postfix-2.3-20050922.tar.gz) = 2508873 bytes
+SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
+SHA1 (patch-ab) = aa08339399411b8c1e12856f6b5f8406b7775840
+SHA1 (patch-ac) = 1b0fb6da368b65ccd6e47c94ff867f0169aaa839
+SHA1 (patch-ag) = 9285c62239419876ee3351250dcc29984c39d958
+SHA1 (patch-ai) = adc9996118adc6162efbec21d6aa491e6962706b
diff -r 9228932d581d -r de26d7e61760 mail/postfix-current/options.mk
--- a/mail/postfix-current/options.mk Wed Oct 05 12:19:11 2005 +0000
+++ b/mail/postfix-current/options.mk Wed Oct 05 13:45:39 2005 +0000
@@ -1,46 +1,33 @@
-# $NetBSD: options.mk,v 1.10 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: options.mk,v 1.10.2.1 2005/10/05 13:45:39 salo Exp $
+
+# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
-#PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls
-PKG_SUPPORTED_OPTIONS= ldap mysql mysql4 pcre pgsql sasl
+PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls
.include "../../mk/bsd.options.mk"
-# ###
-# ### IPv6 and STARTTLS support (http://www.ipnet6.org/postfix/)
-# ###
-# .if !empty(PKG_OPTIONS:Minet6)
-# . if empty(PKG_OPTIONS:Mtls)
-# PKG_OPTIONS+= tls
-# . endif
-# IPV6TLS_PATCH= tls+ipv6-1.25-pf-2.2-20040616.patch.gz
-# PATCHFILES+= ${IPV6TLS_PATCH}
-# SITES_${IPV6TLS_PATCH}= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
-# PATCH_DIST_STRIP.${IPV6TLS_PATCH}= -p1
-# PLIST_SRC+= ${PKGDIR}/PLIST.inet6
-# .endif
-#
-# ###
-# ### STARTTLS support (http://mirrors.loonybin.net/postfix_tls/)
-# ###
-# .if !empty(PKG_OPTIONS:Mtls)
-# . include "../../security/openssl/buildlink3.mk"
-# . if empty(PKG_OPTIONS:Minet6)
-# TLS_PATCH= pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz
-# PATCHFILES+= ${TLS_PATCH}
-# SITES_${TLS_PATCH}= http://mirrors.loonybin.net/postfix_tls/ \
-# ftp://mirrors.loonybin.net/pub/postfix_tls/ \
-# ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/
Home |
Main Index |
Thread Index |
Old Index