Update postfix to version 2.6.3 Fixes from release notes: ========================= 20090605 Bugfix: "postmulti -e destroy" used hard-coded /bin/env command. Simplified the "destroy" procedure to destroy only known safe names without "/". File: conf/postmulti-script. 20090710 Bugfix (introduced Postfix 2.3): Postfix got out of sync with a Milter application after the application sent a "quarantine" request at end-of-message time. The milter application would still be in the end-of-message state, while Postfix would already be working on the next SMTP event (typically, QUIT or MAIL FROM). Problem diagnosed with help from Alban Deniz. File: milter/milter8.c. 20090712 Bugfix (garbage introduced Postfix 2.6): the ugly ${multi_instance_name:postfix}${multi_instance_name ?$multi_instance_name} garbage in Postfix logging is now hopefully gone. File: global/mail_task.c. 20090715 Documentation: as of Postfix 2.6, the reject_unauth_pipelining feature can be used meaningfully at any protocol stage. BTW: can someone pick up PR 134711 (missing repo copy from postfix 2.5.x)
Maintainer of mail/postfix, Please note that PR ports/137460 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137460 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-ports-bugs->wxs I'll take it.
Thanks for the patch. I believe we should maintain the precedent of setting IGNORE= in case WITH_VDA is defined... until the VDA folks release a patch specifically for 2.6.3. CVS diff attached. Tested on 7.1-RELEASE. -- Sahil Tandon <sahil@tandon.net>
> I believe we should maintain the precedent of setting > IGNORE= in case WITH_VDA is defined... until the VDA folks release a > patch specifically for 2.6.3. Hi Sahil, what about the following patch. If you compare the VDA patches 2.6.1 and 2.6.2 you will notice no changes except the line numbers. Then compare the sources of the postfix versions and you will also notice there is no change which breaks the VDA patch. Additional I made a notice in the options that VDA patch is for 32Bit only since there is a difference between the 32Bit and 64Bit patch. //olli --- patch-mail_postfix_update_v2.6.3_v2.txt begins here --- --- Makefile +++ Makefile @@ -6,8 +6,8 @@ # PORTNAME= postfix -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 2.6.3 +VDAVERSION= 2.6.2 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -55,9 +55,11 @@ OPENLDAP "OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)" ${STATUS_OpenLDAP} \ CDB "CDB maps lookups" ${STATUS_CDB} \ NIS "NIS maps lookups" ${STATUS_NIS} \ - VDA "VDA (Virtual Delivery Agent)" ${STATUS_VDA} \ + VDA "VDA (Virtual Delivery Agent 32Bit)" ${STATUS_VDA} \ TEST "SMTP/LMTP test server and generator" ${STATUS_Test} +.include <bsd.port.options.mk> + MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \ sendmail.1 qshape.1 @@ -87,8 +89,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" -.include <bsd.port.pre.mk> - POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ @@ -195,9 +195,10 @@ _REQUIRE+= ypserv .endif +# 32Bit VDA patch (64Bit has different patch) .if defined(WITH_VDA) PATCH_SITES+= http://vda.sourceforge.net/VDA/ -PATCHFILES+= postfix-${PORTVERSION}-vda-ng.patch.gz +PATCHFILES+= postfix-${VDAVERSION}-vda-ng.patch.gz PATCH_DIST_STRIP= -p1 PLIST_SUB+= VDA="" .else @@ -321,4 +322,4 @@ @${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> --- distinfo +++ distinfo @@ -1,6 +1,6 @@ -MD5 (postfix/postfix-2.6.2.tar.gz) = 1f0edbd521d2b0473626f4d61e8bb4eb -SHA256 (postfix/postfix-2.6.2.tar.gz) = 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c -SIZE (postfix/postfix-2.6.2.tar.gz) = 3323255 +MD5 (postfix/postfix-2.6.3.tar.gz) = 9810a52d7df6718b9e7258caba6bebab +SHA256 (postfix/postfix-2.6.3.tar.gz) = 69e31fa939b92f4520f4699e1362abcb5bbbb82c10d03493c31eea237a14c26a +SIZE (postfix/postfix-2.6.3.tar.gz) = 3324979 MD5 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 648f09acd31125c99d1bc36860e21910 SHA256 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4 SIZE (postfix/postfix-2.6.2-vda-ng.patch.gz) = 12661 --- patch-mail_postfix_update_v2.6.3_v2.txt ends here ---
Please use the patch below instead: ------BEGIN CHANGELOG * Fix rcfile bugs (and bump PORTREVISION): - load configuration earlier so that we don't run without config file, analyzed, reported and patch suggested by Fumiyuki Shimizu - mention /etc/rc.conf.local (as suggested in the Porter's handbook) - mention dnsmasq_flags for additional command line arguments - pass pidfile and dnsmasq_conf as arguments to dnsmasq (previously, overriding dnsmasq_conf had no effect). * Fix COMMENT to mention TFTP server; shorten it so it fully fits on the pkg_info list. ------END CHANGELOG Add further PR and submitter info as usual. --- dnsmasq-2.49_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/Makefile /usr/home/ma/ports/dns/dnsmasq/Makefile --- /usr/ports/dns/dnsmasq/Makefile 2009-07-16 00:57:30.000000000 +0200 +++ /usr/home/ma/ports/dns/dnsmasq/Makefile 2009-08-07 10:56:37.000000000 +0200 @@ -7,14 +7,14 @@ PORTNAME= dnsmasq PORTVERSION= 2.49 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ ${MASTER_SITE_GENTOO} MASTER_SITE_SUBDIR= distfiles MAINTAINER= matthias.andree@gmx.de -COMMENT= Lightweight, easy to configure DNS forwarder and DHCP server +COMMENT= Lightweight DNS forwarder, DHCP and TFTP server MAN8= dnsmasq.8 diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/files/dnsmasq.sh.in /usr/home/ma/ports/dns/dnsmasq/files/dnsmasq.sh.in --- /usr/ports/dns/dnsmasq/files/dnsmasq.sh.in 2009-07-16 00:57:30.000000000 +0200 +++ /usr/home/ma/ports/dns/dnsmasq/files/dnsmasq.sh.in 2009-08-07 10:48:41.000000000 +0200 @@ -5,25 +5,36 @@ # BEFORE: DAEMON # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable dnsmasq: +# Add the following line to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: # -# dnsmasq_enable="YES" +# dnsmasq_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable dnsmasq at boot. +# +# Further settings you can change in /etc/rc.conf if desired: +# +# dnsmasq_conf (path): Set to %%PREFIX%%/etc/dnsmasq.conf by default. +# Set it to another configuration file if you want. +# +# dnsmasq_flags (string): Empty by default. Set it to additional command +# line arguments if desired. # - -# override these variables in /etc/rc.conf -dnsmasq_enable=${dnsmasq_enable:-"NO"} . %%RC_SUBR%% name=dnsmasq rcvar=$(set_rcvar) -command=%%PREFIX%%/sbin/${name} +command="%%PREFIX%%/sbin/${name}" +extra_commands=reload pidfile=/var/run/${name}.pid + +load_rc_config ${name} + +: ${dnsmasq_enable="NO"} +: ${dnsmasq_conf="%%PREFIX%%/etc/${name}.conf"} required_files=${dnsmasq_conf} -extra_commands=reload +command_args="-x $pidfile -C $dnsmasq_conf" -load_rc_config ${name} run_rc_command "$1" - --- dnsmasq-2.49_2.patch ends here ---
I don't use VDA in production but that looks OK to me in principle. Thanks.
State Changed From-To: feedback->open Approved by maintainer (with misfiled PRs now added to Audit-Trail).
wxs 2009-08-14 21:33:30 UTC FreeBSD ports repository Modified files: mail/postfix Makefile distinfo Log: - Update to 2.6.3 - Keep the VDA patch at 2.6.2 - Use bsd.port.options.mk PR: ports/137460 Submitted by: olli hauer <ohauer@gmx.de> Approved by: Sahil Tandon <sahil@tandon.net> (maintainer) Revision Changes Path 1.150 +8 -7 ports/mail/postfix/Makefile 1.103 +3 -3 ports/mail/postfix/distinfo _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!