- update VDA patch to version 2.7.0 - get rid off patchfiles with '::' in filename - remove empty var from startup script ( http://wiki.freebsd.org/PortsLongtermTargets section 'Not using :: in patchfile name' )
Please use this patch instead, I just notice the update to 2.7.1 - update postfix to version 2.7.1 - update VDA patch to version 2.7.0 - get rid off patchfiles with '::' in filename - remove empty var from startup script ( http://wiki.freebsd.org/PortsLongtermTargets section 'Not using :: in patchfile name' ) --- patch_mail_postfix.txt begins here --- Index: distinfo =================================================================== --- distinfo (revision 1) +++ distinfo (working copy) @@ -1,6 +1,6 @@ MD5 (postfix/postfix-2.7.0.tar.gz) = df648f59421604e895cce56325f00bae SHA256 (postfix/postfix-2.7.0.tar.gz) = c5b232ae5e396107bc58aed4178cf6cfd0a75b9dcbbedb49d158eb71d6c91b75 SIZE (postfix/postfix-2.7.0.tar.gz) = 3418064 -MD5 (postfix/postfix-2.6.5-vda-ng.patch.gz) = 43e54d0a1a016b90d15a1bd231e6fa38 -SHA256 (postfix/postfix-2.6.5-vda-ng.patch.gz) = e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797 -SIZE (postfix/postfix-2.6.5-vda-ng.patch.gz) = 12435 +MD5 (postfix/postfix-vda-2.7.0.patch) = f73d119fc9e00f31f23599176554e763 +SHA256 (postfix/postfix-vda-2.7.0.patch) = 6a81aadc21ddd9ffa22fd3a64c924a241b92fc5f2b3bafd352075e830e086e0b +SIZE (postfix/postfix-vda-2.7.0.patch) = 59667 Index: files/patch-src__util__sys_defs.h =================================================================== --- files/patch-src__util__sys_defs.h (revision 0) +++ files/patch-src__util__sys_defs.h (revision 2) @@ -0,0 +1,21 @@ +--- src/util/sys_defs.h.orig 2010-02-16 20:15:11.000000000 -0500 ++++ src/util/sys_defs.h 2010-02-16 20:19:41.000000000 -0500 +@@ -25,7 +25,7 @@ + */ + #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ + || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ +- || defined(FREEBSD8) \ ++ || defined(FREEBSD8) || defined(FREEBSD9) \ + || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ + || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ + || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ +@@ -111,7 +111,8 @@ + #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ + #endif + +-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */ ++#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ ++ || __FreeBSD_version >= 800100 + #define HAS_CLOSEFROM + #endif + Property changes on: files/patch-src__util__sys_defs.h ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Index: files/postfix.sh.in =================================================================== --- files/postfix.sh.in (revision 1) +++ files/postfix.sh.in (working copy) @@ -28,7 +28,6 @@ : ${postfix_enable:="NO"} : ${postfix_pidfile:="/var/spool/postfix/pid/master.pid"} : ${postfix_procname:="%%PREFIX%%/libexec/postfix/master"} -: ${postfix_flags:=""} start_cmd=${name}_start stop_cmd=${name}_stop Index: files/patch-src::util::sys_defs.h =================================================================== --- files/patch-src::util::sys_defs.h (revision 1) +++ files/patch-src::util::sys_defs.h (working copy) @@ -1,21 +0,0 @@ ---- src/util/sys_defs.h.orig 2010-02-16 20:15:11.000000000 -0500 -+++ src/util/sys_defs.h 2010-02-16 20:19:41.000000000 -0500 -@@ -25,7 +25,7 @@ - */ - #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ - || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ -- || defined(FREEBSD8) \ -+ || defined(FREEBSD8) || defined(FREEBSD9) \ - || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ - || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ - || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ -@@ -111,7 +111,8 @@ - #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ - #endif - --#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */ -+#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \ -+ || __FreeBSD_version >= 800100 - #define HAS_CLOSEFROM - #endif - Index: Makefile =================================================================== --- Makefile (revision 1) +++ Makefile (working copy) @@ -22,7 +22,7 @@ MAINTAINER= sahil@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail -VDAVERSION= 2.6.5 +VDAVERSION= 2.7.0 CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-68-9].* postfix-current-2.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* @@ -107,7 +107,7 @@ -DDEF_SGID_GROUP=\\\"maildrop\\\" \ # Default requirement for postfix rc script -_REQUIRE= LOGIN cleanvar +_REQUIRE= LOGIN cleanvar .if defined(WITH_PCRE) LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre @@ -195,7 +195,7 @@ # 32Bit VDA patch (64Bit has different patch) .if defined(WITH_VDA) PATCH_SITES+= http://vda.sourceforge.net/VDA/ -PATCHFILES+= postfix-${VDAVERSION}-vda-ng.patch.gz +PATCHFILES+= postfix-vda-${VDAVERSION}.patch PATCH_DIST_STRIP= -p1 PLIST_SUB+= VDA="" .else --- patch_mail_postfix.txt ends here ---
Responsible Changed From-To: freebsd-ports-bugs->sahil I'll take it.
- mail/postfix has been at 2.7.0 for some time and now it is already 2.7.1; why are you submitting a patch against 2.6.5? - The other changes you have suggested can be considered in conjunction with the next actual update. I will close this PR unless you have any objections. -- Sahil Tandon <sahil@FreeBSD.org>
On 2010-06-12 18:01, Sahil Tandon wrote: > - mail/postfix has been at 2.7.0 for some time and now it is already > 2.7.1; why are you submitting a patch against 2.6.5? > > - The other changes you have suggested can be considered in conjunction > with the next actual update. > > I will close this PR unless you have any objections. > If you look at the submit date then you will notice the PR is older than your commit Quick explanation since I guess you mix the version numbers for postfix and VDA I submitted 3 patches PR 147731 contains an update for postfix-2.7.0 to postfix-2.7.1 and an update for VDA to 2.7.0 PR 147732 contains an update for postfix-current from 20100323 to 20100603 PR 147734 contains an update for postfix26 from 2.6.6 to 2.6.7 regards, olli
> PR 147731 contains an update for postfix-2.7.0 to postfix-2.7.1 and an update > for VDA to 2.7.0 Have you tested the *experimental* VDA patch? You also mis-spelled the word 'postfix' in your PR and I only saw this by fluke. > PR 147732 contains an update for postfix-current from 20100323 to 20100603 I do not maintain that port. > PR 147734 contains an update for postfix26 from 2.6.6 to 2.6.7 This was already committed. -- Sahil Tandon <sahil@FreeBSD.org>
On 2010-06-12 18:38, Sahil Tandon wrote: >> PR 147731 contains an update for postfix-2.7.0 to postfix-2.7.1 and an update >> for VDA to 2.7.0 > > Have you tested the *experimental* VDA patch? No, not tested. >You also mis-spelled the word 'postfix' in your PR and I only saw this by fluke. I recognized this even now, but there is no way for me to change the subject after submitting. >> PR 147732 contains an update for postfix-current from 20100323 to 20100603 > I do not maintain that port. Maybe it is a good idea if you take over the postfix24 and postfix-current port, so there is only one maintainer for postfix. If the patch for current is applied there are only a view differences between the postfix and current port which makes further updates easier. >> PR 147734 contains an update for postfix26 from 2.6.6 to 2.6.7 > > This was already committed. thanks,
State Changed From-To: open->analyzed reworking patch
sahil 2010-09-13 02:09:35 UTC FreeBSD ports repository Modified files: mail/postfix Makefile distinfo pkg-plist mail/postfix/files postfix.sh.in Log: - Update VDA patch to version 2.7.0 [1] - Remove "empty variable" assignment from rc script [1] - Re-introduce optional SPF support [2] - Remove default DISTNAME assignment from Makefile - The affected OPTIONS are off by default, so do not bump PORTREVISION PR: [1]: ports/147731 [2]: ports/150428 Submitted by: [1]: ohauer@ [2]: mm@ Revision Changes Path 1.159 +26 -7 ports/mail/postfix/Makefile 1.108 +6 -3 ports/mail/postfix/distinfo 1.9 +1 -2 ports/mail/postfix/files/postfix.sh.in 1.33 +1 -0 ports/mail/postfix/pkg-plist _______________________________________________ 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: analyzed->closed Committed, with minor changes. Thanks!