diff -r fd1de0c7bc20 -r 01294b31a79e postfix/postfix.patch --- a/postfix/postfix.patch Wed Aug 08 20:36:32 2012 +0200 +++ b/postfix/postfix.patch Thu Aug 09 00:41:14 2012 +0200 @@ -1,20 +1,18 @@ Index: makedefs ---- makedefs.orig 2008-01-15 21:20:24 +0100 -+++ makedefs 2008-01-24 12:31:48 +0100 -@@ -132,6 +132,10 @@ +--- makedefs.orig 2011-01-16 22:02:31.000000000 +0100 ++++ makedefs 2011-01-21 09:43:55.000000000 +0100 +@@ -153,6 +153,8 @@ ;; - FreeBSD.7*) SYSTYPE=FREEBSD7 + FreeBSD.8*) SYSTYPE=FREEBSD8 ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD7 -+ ;; -+ FreeBSD.8*) SYSTYPE=FREEBSD8 ++ FreeBSD.9*) SYSTYPE=FREEBSD9 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 ;; OpenBSD.3*) SYSTYPE=OPENBSD3 Index: src/util/file_limit.c ---- src/util/file_limit.c.orig 2003-10-22 20:48:36 +0200 -+++ src/util/file_limit.c 2008-01-24 12:31:48 +0100 +--- src/util/file_limit.c.orig 2003-10-22 20:48:36.000000000 +0200 ++++ src/util/file_limit.c 2011-01-21 09:43:55.000000000 +0100 @@ -80,12 +80,21 @@ void set_file_limit(off_t limit) { @@ -38,8 +36,8 @@ msg_fatal("setrlimit: %m"); #ifdef SIGXFSZ Index: src/util/msg_syslog.c ---- src/util/msg_syslog.c.orig 2006-06-15 20:07:16 +0200 -+++ src/util/msg_syslog.c 2008-01-24 12:31:48 +0100 +--- src/util/msg_syslog.c.orig 2006-06-15 20:07:16.000000000 +0200 ++++ src/util/msg_syslog.c 2011-01-21 09:43:55.000000000 +0100 @@ -50,6 +50,11 @@ #include #include @@ -89,27 +87,25 @@ /* msg_syslog_init - initialize */ Index: src/util/sys_defs.h ---- src/util/sys_defs.h.orig 2008-01-15 01:51:44 +0100 -+++ src/util/sys_defs.h 2008-01-24 12:32:41 +0100 -@@ -24,7 +24,7 @@ - * 4.4BSD and close derivatives. +--- src/util/sys_defs.h.orig 2011-01-17 15:44:25.000000000 +0100 ++++ src/util/sys_defs.h 2011-01-21 09:43:55.000000000 +0100 +@@ -25,7 +25,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ -- || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ -+ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) || defined(FREEBSD8) \ + || 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) \ -Index: src/smtp/smtp_reuse.c ---- src/smtp/smtp_reuse.c.orig 2008-12-04 01:06:42.000000000 +0100 -+++ src/smtp/smtp_reuse.c 2009-04-06 20:38:18.974597344 +0200 -@@ -216,7 +216,9 @@ - /* - * Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE. - */ -+#if 0 - vstream_tweak_sock(session->stream); + || defined(OPENBSD5) \ +@@ -117,6 +117,10 @@ + #define HAS_CLOSEFROM + #endif + ++#if (__FreeBSD_version < 800000 && __FreeBSD_version >= 702104) || (__FreeBSD_version >= 800100) ++#define HAS_CLOSEFROM +#endif ++ + /* OpenBSD version is year+month */ - /* - * Update the list of used cached addresses. + #if OpenBSD >= 199805 /* XXX */