Date: Sun, 4 Apr 2010 18:39:28 -0400 (EDT) From: Sahil Tandon <sahil@tandon.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mnag@FreeBSD.org, itetcu@FreeBSD.org Subject: ports/145394: [PATCH] mail/postfix24: update to 2.4.14 + fix build WITH_SASLKRB5 on 8.0 & 9.0 Message-ID: <20100404223928.143CF17173@spartan.hamla.org> Resent-Message-ID: <201004042240.o34Me9tK048978@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145394 >Category: ports >Synopsis: [PATCH] mail/postfix24: update to 2.4.14 + fix build WITH_SASLKRB5 on 8.0 & 9.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Apr 04 22:40:09 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sahil Tandon >Release: FreeBSD 9.0-RELEASE i386 >Organization: >Environment: >Description: - Update to 2.4.14 - Fix build when WITH_SASLKRB5 is set on 8.0 & 9.0 which have the new Heimdal >How-To-Repeat: >Fix: --- postfix24.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/postfix24/Makefile,v retrieving revision 1.140 diff -u -r1.140 Makefile --- Makefile 19 Jan 2010 23:10:41 -0000 1.140 +++ Makefile 4 Apr 2010 21:57:46 -0000 @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.4.13 +PORTVERSION= 2.4.14 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -126,7 +126,10 @@ .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT) BROKEN= Select only one SASL Kerberos option .endif -POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken +.if ${OSVERSION} >= 800037 +KRB5_EXTR= -lhx509 +.endif +POSTFIX_AUXLIBS+= -lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif .if defined(WITH_SASLKMIT) Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/postfix24/distinfo,v retrieving revision 1.96 diff -u -r1.96 distinfo --- distinfo 19 Jan 2010 23:10:41 -0000 1.96 +++ distinfo 4 Apr 2010 21:57:46 -0000 @@ -1,6 +1,6 @@ -MD5 (postfix/postfix-2.4.13.tar.gz) = a2e19384deeed77d83c94ad59f4051c3 -SHA256 (postfix/postfix-2.4.13.tar.gz) = 9fe936029cf151e8fd30fcd88cd965112a905c63808dd6ed01c5bb222d60f911 -SIZE (postfix/postfix-2.4.13.tar.gz) = 2938465 +MD5 (postfix/postfix-2.4.14.tar.gz) = fb2dde4d7db56e5a3fcc5b83cc93cd73 +SHA256 (postfix/postfix-2.4.14.tar.gz) = bcc109fa3da85fbeaa868840fab94e3523615b964cf7ab835b0c4498182abcc3 +SIZE (postfix/postfix-2.4.14.tar.gz) = 2939655 MD5 (postfix/postfix-2.4.6-vda-ng.patch.gz) = 6090de66e36051357e37bb94a1eea342 SHA256 (postfix/postfix-2.4.6-vda-ng.patch.gz) = 847e9c39bdbd92c912f71521ab4e5266d9baae749d135f220db9c8a5a13e8b3f SIZE (postfix/postfix-2.4.6-vda-ng.patch.gz) = 12244 Index: files/patch-makedefs =================================================================== RCS file: /home/ncvs/ports/mail/postfix24/files/patch-makedefs,v retrieving revision 1.7 diff -u -r1.7 patch-makedefs --- files/patch-makedefs 27 Sep 2009 18:06:28 -0000 1.7 +++ files/patch-makedefs 4 Apr 2010 21:57:46 -0000 @@ -1,14 +1,10 @@ ---- makedefs.orig 2009-09-15 12:11:32.000000000 -0300 -+++ makedefs 2009-09-15 12:12:04.000000000 -0300 -@@ -130,6 +130,12 @@ +--- makedefs.orig 2010-04-04 17:17:26.000000000 -0400 ++++ makedefs 2010-04-04 17:18:07.000000000 -0400 +@@ -134,6 +134,8 @@ ;; - FreeBSD.6*) SYSTYPE=FREEBSD6 + FreeBSD.8*) SYSTYPE=FREEBSD8 ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD6 -+ ;; -+ FreeBSD.8*) SYSTYPE=FREEBSD6 -+ ;; -+ FreeBSD.9*) SYSTYPE=FREEBSD6 ++ FreeBSD.9*) SYSTYPE=FREEBSD9 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 ;; Index: files/patch-src__util__sys_defs.h =================================================================== RCS file: /home/ncvs/ports/mail/postfix24/files/patch-src__util__sys_defs.h,v retrieving revision 1.1 diff -u -r1.1 patch-src__util__sys_defs.h --- files/patch-src__util__sys_defs.h 30 Jul 2009 00:22:14 -0000 1.1 +++ files/patch-src__util__sys_defs.h 4 Apr 2010 21:57:46 -0000 @@ -1,13 +1,20 @@ ---- src/util/sys_defs.h.orig 2009-07-29 16:58:28.000000000 -0300 -+++ src/util/sys_defs.h 2009-07-29 16:59:15.000000000 -0300 -@@ -110,6 +110,10 @@ - #define HAS_DUPLEX_PIPE /* 4.1 breaks with kqueue(2) */ +--- src/util/sys_defs.h.orig 2010-04-04 17:19:32.000000000 -0400 ++++ src/util/sys_defs.h 2010-04-04 17:23:49.000000000 -0400 +@@ -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) \ +@@ -98,7 +98,7 @@ + #define SOCKOPT_SIZE socklen_t #endif +-#if __FreeBSD_version >= 800107 /* safe; don't believe the experts */ +#if (__FreeBSD_version >= 702104 && __FreeBSD_version < 800000) || (__FreeBSD_version >= 800099) -+#define HAS_CLOSEFROM -+#endif -+ - /* OpenBSD version is year+month */ + #define HAS_CLOSEFROM + #endif - #if OpenBSD >= 199805 /* XXX */ --- postfix24.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100404223928.143CF17173>