diff --git a/mail/postfix/Makefile.inc b/mail/postfix/Makefile.inc index 7484d295565..dbfaa478437 100644 --- a/mail/postfix/Makefile.inc +++ b/mail/postfix/Makefile.inc @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.46 2004/12/29 07:05:07 jakob Exp $ +# $OpenBSD: Makefile.inc,v 1.47 2005/03/07 18:26:39 brad Exp $ COMMENT= "fast, secure sendmail replacement" +DISTNAME= postfix-${VERSION} +PKGNAME= postfix-${VERSION:S/-/./} CATEGORIES= mail MASTER_SITE_POSTFIX=\ @@ -11,17 +13,13 @@ MASTER_SITE_POSTFIX=\ ftp://ftp.tau.ac.il/pub/unix/mail/postfix/ \ ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/ -MASTER_SITES0= http://www.ipnet6.org/postfix/download/ - DIST_SUBDIR= postfix DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -.if defined(IPV6VERSION) && defined(IPV6POSTFIX) -PATCHFILES+= tls+ipv6-${IPV6VERSION}-pf-${IPV6POSTFIX}.patch.gz:0 -.endif - HOMEPAGE= http://www.postfix.org/ +MAINTAINER= Jakob Schlyter + PERMIT_PACKAGE_CDROM= "cannot be sold, see section 4 of license" PERMIT_PACKAGE_FTP= yes PERMIT_DISTFILES_CDROM= "cannot be sold, see section 4 of license" @@ -30,20 +28,11 @@ PERMIT_DISTFILES_FTP= yes MAKE_DEBUG?= MAKE_CCARGS?= -DFD_SETSIZE=2048 MAKE_CCARGS+= -DDEF_CONFIG_DIR=\"${SYSCONFDIR}/postfix\" -MAKE_CCARGS+= -DHAS_SSL # -stable -MAKE_CCARGS+= -DUSE_TLS # -snapshot +MAKE_CCARGS+= -DUSE_TLS MAKE_AUXLIBS+= -lssl -lcrypto WANTLIB= c crypto ssl -TLSHOMEPAGE= http://www.aet.tu-cottbus.de/personen/jaenicke/pfixtls/ -SUBST_VARS+= TLSHOMEPAGE - -IPV6HOMEPAGE= http://www.ipnet6.org/postfix/ -SUBST_VARS+= IPV6HOMEPAGE - -PATCH_DIST_STRIP=-p1 - ALL_TARGET= default NO_REGRESS= Yes @@ -80,7 +69,6 @@ MAKE_CCARGS+= -I${LOCALBASE}/include/postgresql -DHAS_PGSQL MAKE_AUXLIBS+= -L${LOCALBASE}/lib -lpq .endif - post-patch: @find ${WRKSRC} -type f -name '*.bak.orig' -print | xargs rm diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile index 0aa634a148a..eb5441338aa 100644 --- a/mail/postfix/snapshot/Makefile +++ b/mail/postfix/snapshot/Makefile @@ -1,10 +1,6 @@ -# $OpenBSD: Makefile,v 1.92 2005/02/21 00:40:18 brad Exp $ +# $OpenBSD: Makefile,v 1.93 2005/03/07 18:26:40 brad Exp $ -VERSION= 2.2-20050218 -DISTNAME= postfix-${VERSION} -PKGNAME= postfix-${VERSION:S/-/./} - -MAINTAINER= Jakob Schlyter +VERSION= 2.3-20050304 MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/} diff --git a/mail/postfix/snapshot/distinfo b/mail/postfix/snapshot/distinfo index 754cf7f0acd..59ba1e4e465 100644 --- a/mail/postfix/snapshot/distinfo +++ b/mail/postfix/snapshot/distinfo @@ -1,4 +1,4 @@ -MD5 (postfix/postfix-2.2-20050218.tar.gz) = 5b41c917635ec61e29731bc9cea07a96 -RMD160 (postfix/postfix-2.2-20050218.tar.gz) = 5975321cde204c81cc3f28a11a306d1a9d1cf3a8 -SHA1 (postfix/postfix-2.2-20050218.tar.gz) = 33fdecd21e0c51375d4783422776c1847c2c6738 -SIZE (postfix/postfix-2.2-20050218.tar.gz) = 2401756 +MD5 (postfix/postfix-2.3-20050304.tar.gz) = 0f76384ea2b344d51d1d77a61853f308 +RMD160 (postfix/postfix-2.3-20050304.tar.gz) = a38741689812d5f25d584085fac7de4b5ca41a94 +SHA1 (postfix/postfix-2.3-20050304.tar.gz) = e7d76c63d84d5fd435fcb31a31cae433ea7809ea +SIZE (postfix/postfix-2.3-20050304.tar.gz) = 2397445 diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile index aae172ff08f..5fd6f1a35f2 100644 --- a/mail/postfix/stable/Makefile +++ b/mail/postfix/stable/Makefile @@ -1,14 +1,7 @@ -# $OpenBSD: Makefile,v 1.69 2005/02/21 00:42:22 brad Exp $ +# $OpenBSD: Makefile,v 1.70 2005/03/07 18:26:40 brad Exp $ -VERSION= 2.1.5 -DISTNAME= postfix-${VERSION} -PKGNAME= ${DISTNAME}p1 - -MAINTAINER= Jakob Schlyter +VERSION= 2.2.0-RC2 MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/} -IPV6VERSION= 1.26 -IPV6POSTFIX= ${VERSION} - .include diff --git a/mail/postfix/stable/distinfo b/mail/postfix/stable/distinfo index b3693194bbb..6de0e65289e 100644 --- a/mail/postfix/stable/distinfo +++ b/mail/postfix/stable/distinfo @@ -1,8 +1,4 @@ -MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d -MD5 (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = 3d3bbabe5c17d5d0809c698ad1df1e64 -RMD160 (postfix/postfix-2.1.5.tar.gz) = c0e078babbc3e76035fe4f502ea5fb3645e8ed92 -RMD160 (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = ff2fb005681659476383fe4f32fd1d14e51fa9d9 -SHA1 (postfix/postfix-2.1.5.tar.gz) = bbc65c9fdc1cbd8e553816a5549b2685255cf69d -SHA1 (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = 6813eb7d1c1ac9a76a04b7495d540236aa0aa625 -SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931 -SIZE (postfix/tls+ipv6-1.26-pf-2.1.5.patch.gz) = 256725 +MD5 (postfix/postfix-2.2.0-RC2.tar.gz) = 882a4411251e3d9931e8189e27549271 +RMD160 (postfix/postfix-2.2.0-RC2.tar.gz) = 30e335207bf486877c7f9c4bed945076cc535371 +SHA1 (postfix/postfix-2.2.0-RC2.tar.gz) = b6abf0ce84024f423bc9f9012b9d273ac8964412 +SIZE (postfix/postfix-2.2.0-RC2.tar.gz) = 2393970 diff --git a/mail/postfix/stable/patches/patch-inet_addr_list_h b/mail/postfix/stable/patches/patch-inet_addr_list_h deleted file mode 100644 index 43c9e1aa267..00000000000 --- a/mail/postfix/stable/patches/patch-inet_addr_list_h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/util/inet_addr_list.h.orig Sun Feb 20 17:18:43 2005 -+++ src/util/inet_addr_list.h Sun Feb 20 17:18:44 2005 -@@ -58,12 +58,10 @@ extern void inet_addr_list_append(INET_A - * 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 diff --git a/mail/postfix/stable/patches/patch-master.cf b/mail/postfix/stable/patches/patch-master.cf index 65bd8e11d10..0f26c53287d 100644 --- a/mail/postfix/stable/patches/patch-master.cf +++ b/mail/postfix/stable/patches/patch-master.cf @@ -1,22 +1,29 @@ ---- conf/master.cf.orig 2004-05-19 07:32:44.000000000 +0200 -+++ conf/master.cf 2004-05-19 07:34:33.000000000 +0200 -@@ -77,33 +77,33 @@ +$OpenBSD: patch-master.cf,v 1.10 2005/03/07 18:26:40 brad Exp $ + +--- conf/master.cf.orig Mon Jan 24 20:12:46 2005 ++++ conf/master.cf Mon Feb 7 23:15:42 2005 +@@ -6,41 +6,41 @@ # 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 @@ -28,7 +35,7 @@ +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 @@ -37,20 +44,26 @@ +flush unix n - - 1000? 0 flush proxymap unix - - n - - proxymap -smtp unix - - n - - smtp --relay unix - - n - - smtp +smtp unix - - - - - smtp + # When relaying mail as backup MX, disable fallback_relay to avoid MX loops +-relay unix - - n - - smtp +relay unix - - - - - smtp + -o fallback_relay= # -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. diff --git a/mail/postfix/stable/pkg/DESCR b/mail/postfix/stable/pkg/DESCR index 8fd195f8209..f514b7ba05b 100644 --- a/mail/postfix/stable/pkg/DESCR +++ b/mail/postfix/stable/pkg/DESCR @@ -5,8 +5,6 @@ different. Extra features always included: -- SMTP over SSL/TLS (${TLSHOMEPAGE}) -- IPv6 (${IPV6HOMEPAGE}) - table lookups using PCRE (Perl-Compatible Regular Expression) Optional features included using flavors: diff --git a/mail/postfix/stable/pkg/PLIST b/mail/postfix/stable/pkg/PLIST index 5641cb30090..5fc728016e8 100644 --- a/mail/postfix/stable/pkg/PLIST +++ b/mail/postfix/stable/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2005/02/21 00:42:22 brad Exp $ +@comment $OpenBSD: PLIST,v 1.14 2005/03/07 18:26:40 brad Exp $ @conflict postfix-* @newgroup _postfix:507 @newgroup _postdrop:508 @@ -9,8 +9,10 @@ @extra ${SYSCONFDIR}/postfix/ @extra /var/spool/postfix/ libexec/postfix/ +libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup +libexec/postfix/discard libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp @@ -23,6 +25,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 @@ -51,9 +54,12 @@ libexec/postfix/virtual @man man/man5/body_checks.5 @man man/man5/canonical.5 @man man/man5/cidr_table.5 +@man man/man5/generic.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 @@ -61,9 +67,11 @@ libexec/postfix/virtual @man man/man5/relocated.5 @man man/man5/transport.5 @man man/man5/virtual.5 +@man man/man8/anvil.8 @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 @@ -75,6 +83,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 @@ -117,6 +126,7 @@ share/doc/postfix/html/DEBUG_README.html share/doc/postfix/html/ETRN_README.html share/doc/postfix/html/FILTER_README.html share/doc/postfix/html/INSTALL.html +share/doc/postfix/html/IPV6_README.html share/doc/postfix/html/LDAP_README.html share/doc/postfix/html/LINUX_README.html share/doc/postfix/html/LMTP_README.html @@ -137,6 +147,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,22 +157,27 @@ share/doc/postfix/html/XCLIENT_README.html share/doc/postfix/html/XFORWARD_README.html share/doc/postfix/html/access.5.html share/doc/postfix/html/aliases.5.html +share/doc/postfix/html/anvil.8.html share/doc/postfix/html/bounce.8.html 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/generic.5.html share/doc/postfix/html/header_checks.5.html share/doc/postfix/html/index.html 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 @@ -238,6 +254,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 @@ -245,27 +262,13 @@ 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/generic share/examples/postfix/header_checks share/examples/postfix/main.cf share/examples/postfix/main.cf.default