sync with non-production postfix snapshot 2.2-20041221 with TLS support.
NOTE: IPv6 currently not enabled.
This commit is contained in:
jakob
parent
bef41ef35c
commit
2128ebfd13
@ -1,14 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.88 2004/11/16 06:56:07 jakob Exp $
|
||||
# $OpenBSD: Makefile,v 1.89 2004/12/28 09:08:12 jakob Exp $
|
||||
|
||||
VERSION= 2.2-20040616
|
||||
DISTNAME= postfix-${VERSION}
|
||||
VERSION= 2.2-20041221
|
||||
DISTNAME= postfix-${VERSION}+tls-nonprod
|
||||
PKGNAME= postfix-${VERSION:S/-/./}
|
||||
|
||||
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}
|
||||
|
||||
IPV6VERSION= 1.25
|
||||
IPV6POSTFIX= ${VERSION}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,6 +1,3 @@
|
||||
MD5 (postfix/postfix-2.2-20040616.tar.gz) = c2981ee34169d30e9bede8d9b28602d4
|
||||
MD5 (postfix/tls+ipv6-1.25-pf-2.2-20040616.patch.gz) = 5805d82c309232fb74ecf9cd3aae1dfd
|
||||
RMD160 (postfix/postfix-2.2-20040616.tar.gz) = 1cf8a6559a358802cdcb35a64346d4db977b60f0
|
||||
RMD160 (postfix/tls+ipv6-1.25-pf-2.2-20040616.patch.gz) = fd3505b19c0351ba2d632871a40c2e881fff1da1
|
||||
SHA1 (postfix/postfix-2.2-20040616.tar.gz) = e0ff2dd5af22fda17d1a5fd0b8f7880a3b767639
|
||||
SHA1 (postfix/tls+ipv6-1.25-pf-2.2-20040616.patch.gz) = 0f98b9a292b80472da3a8c4fb9e7eb918430509a
|
||||
MD5 (postfix/postfix-2.2-20041221+tls-nonprod.tar.gz) = 0b141e5dd14abe0725b31f937c5af35c
|
||||
RMD160 (postfix/postfix-2.2-20041221+tls-nonprod.tar.gz) = b32556c6afb516cf68ac0f3eeb5b135cdd0474e6
|
||||
SHA1 (postfix/postfix-2.2-20041221+tls-nonprod.tar.gz) = f5dc3a8e8e462658084cfa085b8b1ed3f0cb157e
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- src/util/inet_addr_list.h.orig Fri Nov 19 20:00:59 2004
|
||||
+++ src/util/inet_addr_list.h Fri Nov 19 20:01:44 2004
|
||||
@@ -58,12 +58,10 @@
|
||||
* Only on KAME? Use without implementation will result in EAI_BADFLAGS.
|
||||
*/
|
||||
#ifdef INET6
|
||||
-# ifndef INET6_KAME
|
||||
# ifdef NI_WITHSCOPEID
|
||||
# undef NI_WITHSCOPEID
|
||||
# endif
|
||||
# define NI_WITHSCOPEID 0
|
||||
-# endif
|
||||
#endif
|
||||
|
||||
/* LICENSE
|
||||
@ -1,24 +1,29 @@
|
||||
$OpenBSD: patch-master.cf,v 1.12 2004/04/25 10:36:39 jakob Exp $
|
||||
$OpenBSD: patch-master.cf,v 1.13 2004/12/28 09:08:12 jakob Exp $
|
||||
|
||||
--- conf/master.cf.orig Sat Apr 24 23:39:28 2004
|
||||
+++ conf/master.cf Sat Apr 24 23:42:33 2004
|
||||
@@ -77,33 +77,33 @@
|
||||
--- conf/master.cf.orig Thu Dec 16 16:46:38 2004
|
||||
+++ conf/master.cf Tue Dec 28 09:19:27 2004
|
||||
@@ -6,39 +6,39 @@
|
||||
# service type private unpriv chroot wakeup maxproc command + args
|
||||
# (yes) (yes) (yes) (never) (100)
|
||||
# ==========================================================================
|
||||
-smtp inet n - n - - smtpd
|
||||
-#smtps inet n - n - - smtpd
|
||||
-#submission inet n - n - - smtpd
|
||||
+smtp inet n - - - - smtpd
|
||||
+#submission inet n - - - - smtpd
|
||||
# -o smtpd_etrn_restrictions=reject
|
||||
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||
-#smtps inet n - n - - smtpd
|
||||
+#smtps inet n - - - - smtpd
|
||||
# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
|
||||
#submission inet n - n - - smtpd
|
||||
# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes -o smtpd_etrn_restrictions=reject
|
||||
# -o smtpd_etrn_restrictions=reject
|
||||
# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
|
||||
-#628 inet n - n - - qmqpd
|
||||
-pickup fifo n - n 60 1 pickup
|
||||
-cleanup unix n - n - 0 cleanup
|
||||
-qmgr fifo n - n 300 1 qmgr
|
||||
-#qmgr fifo n - n 300 1 oqmgr
|
||||
-#tlsmgr fifo - - n 300 1 tlsmgr
|
||||
-tlsmgr unix - - n 1000? 1 tlsmgr
|
||||
-rewrite unix - - n - - trivial-rewrite
|
||||
-bounce unix - - n - 0 bounce
|
||||
-defer unix - - n - 0 bounce
|
||||
@ -30,7 +35,7 @@ $OpenBSD: patch-master.cf,v 1.12 2004/04/25 10:36:39 jakob Exp $
|
||||
+cleanup unix n - - - 0 cleanup
|
||||
+qmgr fifo n - - 300 1 qmgr
|
||||
+#qmgr fifo n - - 300 1 oqmgr
|
||||
+#tlsmgr fifo - - - 300 1 tlsmgr
|
||||
+tlsmgr unix - - - 1000? 1 tlsmgr
|
||||
+rewrite unix - - - - - trivial-rewrite
|
||||
+bounce unix - - - - 0 bounce
|
||||
+defer unix - - - - 0 bounce
|
||||
@ -45,14 +50,18 @@ $OpenBSD: patch-master.cf,v 1.12 2004/04/25 10:36:39 jakob Exp $
|
||||
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
|
||||
-showq unix n - n - - showq
|
||||
-error unix - - n - - error
|
||||
-discard unix - - n - - discard
|
||||
+showq unix n - - - - showq
|
||||
+error unix - - - - - error
|
||||
+discard unix - - - - - discard
|
||||
local unix - n n - - local
|
||||
virtual unix - n n - - virtual
|
||||
-lmtp unix - - n - - lmtp
|
||||
-anvil unix - - n - 1 anvil
|
||||
-scache unix - - n - 1 scache
|
||||
+lmtp unix - - - - - lmtp
|
||||
+anvil unix - - - - 1 anvil
|
||||
+scache unix - - - - 1 scache
|
||||
#
|
||||
# ====================================================================
|
||||
# Interfaces to non-Postfix software. Be sure to examine the manual
|
||||
# pages of the non-Postfix software to find out what options it wants.
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
@comment $OpenBSD: PLIST,v 1.29 2004/09/18 12:54:10 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.30 2004/12/28 09:08:12 jakob Exp $
|
||||
@conflict postfix-*
|
||||
libexec/postfix/
|
||||
libexec/postfix/anvil
|
||||
libexec/postfix/bounce
|
||||
libexec/postfix/cleanup
|
||||
libexec/postfix/discard
|
||||
libexec/postfix/error
|
||||
libexec/postfix/flush
|
||||
libexec/postfix/lmtp
|
||||
@ -16,6 +17,7 @@ libexec/postfix/pipe
|
||||
libexec/postfix/proxymap
|
||||
libexec/postfix/qmgr
|
||||
libexec/postfix/qmqpd
|
||||
libexec/postfix/scache
|
||||
libexec/postfix/showq
|
||||
libexec/postfix/smtp
|
||||
libexec/postfix/smtpd
|
||||
@ -46,7 +48,9 @@ libexec/postfix/virtual
|
||||
@man man/man5/cidr_table.5
|
||||
@man man/man5/header_checks.5
|
||||
@man man/man5/ldap_table.5
|
||||
@man man/man5/master.5
|
||||
@man man/man5/mysql_table.5
|
||||
@man man/man5/nisplus_table.5
|
||||
@man man/man5/pcre_table.5
|
||||
@man man/man5/pgsql_table.5
|
||||
@man man/man5/postconf.5
|
||||
@ -59,6 +63,7 @@ libexec/postfix/virtual
|
||||
@man man/man8/bounce.8
|
||||
@man man/man8/cleanup.8
|
||||
@man man/man8/defer.8
|
||||
@man man/man8/discard.8
|
||||
@man man/man8/error.8
|
||||
@man man/man8/flush.8
|
||||
@man man/man8/lmtp.8
|
||||
@ -70,6 +75,7 @@ libexec/postfix/virtual
|
||||
@man man/man8/proxymap.8
|
||||
@man man/man8/qmgr.8
|
||||
@man man/man8/qmqpd.8
|
||||
@man man/man8/scache.8
|
||||
@man man/man8/showq.8
|
||||
@man man/man8/smtp.8
|
||||
@man man/man8/smtpd.8
|
||||
@ -80,6 +86,7 @@ libexec/postfix/virtual
|
||||
@man man/man8/verify.8
|
||||
@man man/man8/virtual.8
|
||||
sbin/mailq
|
||||
sbin/newaliases
|
||||
sbin/postalias
|
||||
sbin/postcat
|
||||
sbin/postconf
|
||||
@ -131,6 +138,7 @@ share/doc/postfix/html/SMTPD_ACCESS_README.html
|
||||
share/doc/postfix/html/SMTPD_POLICY_README.html
|
||||
share/doc/postfix/html/SMTPD_PROXY_README.html
|
||||
share/doc/postfix/html/STANDARD_CONFIGURATION_README.html
|
||||
share/doc/postfix/html/TLS_README.html
|
||||
share/doc/postfix/html/TUNING_README.html
|
||||
share/doc/postfix/html/ULTRIX_README.html
|
||||
share/doc/postfix/html/UUCP_README.html
|
||||
@ -146,6 +154,7 @@ share/doc/postfix/html/canonical.5.html
|
||||
share/doc/postfix/html/cidr_table.5.html
|
||||
share/doc/postfix/html/cleanup.8.html
|
||||
share/doc/postfix/html/defer.8.html
|
||||
share/doc/postfix/html/discard.8.html
|
||||
share/doc/postfix/html/error.8.html
|
||||
share/doc/postfix/html/flush.8.html
|
||||
share/doc/postfix/html/header_checks.5.html
|
||||
@ -154,9 +163,11 @@ share/doc/postfix/html/ldap_table.5.html
|
||||
share/doc/postfix/html/lmtp.8.html
|
||||
share/doc/postfix/html/local.8.html
|
||||
share/doc/postfix/html/mailq.1.html
|
||||
share/doc/postfix/html/master.5.html
|
||||
share/doc/postfix/html/master.8.html
|
||||
share/doc/postfix/html/mysql_table.5.html
|
||||
share/doc/postfix/html/newaliases.1.html
|
||||
share/doc/postfix/html/nisplus_table.5.html
|
||||
share/doc/postfix/html/oqmgr.8.html
|
||||
share/doc/postfix/html/pcre_table.5.html
|
||||
share/doc/postfix/html/pgsql_table.5.html
|
||||
@ -212,7 +223,6 @@ share/doc/postfix/readme/DEBUG_README
|
||||
share/doc/postfix/readme/ETRN_README
|
||||
share/doc/postfix/readme/FILTER_README
|
||||
share/doc/postfix/readme/INSTALL
|
||||
share/doc/postfix/readme/IPV6_README
|
||||
share/doc/postfix/readme/LDAP_README
|
||||
share/doc/postfix/readme/LINUX_README
|
||||
share/doc/postfix/readme/LMTP_README
|
||||
@ -234,6 +244,7 @@ share/doc/postfix/readme/SMTPD_ACCESS_README
|
||||
share/doc/postfix/readme/SMTPD_POLICY_README
|
||||
share/doc/postfix/readme/SMTPD_PROXY_README
|
||||
share/doc/postfix/readme/STANDARD_CONFIGURATION_README
|
||||
share/doc/postfix/readme/TLS_README
|
||||
share/doc/postfix/readme/TUNING_README
|
||||
share/doc/postfix/readme/ULTRIX_README
|
||||
share/doc/postfix/readme/UUCP_README
|
||||
@ -241,31 +252,15 @@ share/doc/postfix/readme/VERP_README
|
||||
share/doc/postfix/readme/VIRTUAL_README
|
||||
share/doc/postfix/readme/XCLIENT_README
|
||||
share/doc/postfix/readme/XFORWARD_README
|
||||
share/doc/postfix/tls/
|
||||
share/doc/postfix/tls/conf.html
|
||||
share/doc/postfix/tls/index.html
|
||||
share/doc/postfix/tls/install.html
|
||||
share/doc/postfix/tls/intro.html
|
||||
share/doc/postfix/tls/loadCAcert.pl
|
||||
share/doc/postfix/tls/myownca.html
|
||||
share/doc/postfix/tls/prng.html
|
||||
share/doc/postfix/tls/references.html
|
||||
share/doc/postfix/tls/relaycert.html
|
||||
share/doc/postfix/tls/rfc2246.txt
|
||||
share/doc/postfix/tls/rfc2487.txt
|
||||
share/doc/postfix/tls/rfc3207.txt
|
||||
share/doc/postfix/tls/security.html
|
||||
share/doc/postfix/tls/setup.html
|
||||
share/doc/postfix/tls/test.html
|
||||
share/examples/postfix/
|
||||
share/examples/postfix/LICENSE
|
||||
share/examples/postfix/TLS_LICENSE
|
||||
share/examples/postfix/access
|
||||
share/examples/postfix/aliases
|
||||
share/examples/postfix/canonical
|
||||
share/examples/postfix/header_checks
|
||||
share/examples/postfix/main.cf
|
||||
share/examples/postfix/main.cf.default
|
||||
share/examples/postfix/makedefs.out
|
||||
share/examples/postfix/master.cf
|
||||
share/examples/postfix/post-install
|
||||
share/examples/postfix/postfix-files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user