1.1 --- a/postfix/postfix.patch Wed Aug 08 20:36:32 2012 +0200
1.2 +++ b/postfix/postfix.patch Thu Aug 09 00:41:14 2012 +0200
1.3 @@ -1,20 +1,18 @@
1.4 Index: makedefs
1.5 ---- makedefs.orig 2008-01-15 21:20:24 +0100
1.6 -+++ makedefs 2008-01-24 12:31:48 +0100
1.7 -@@ -132,6 +132,10 @@
1.8 +--- makedefs.orig 2011-01-16 22:02:31.000000000 +0100
1.9 ++++ makedefs 2011-01-21 09:43:55.000000000 +0100
1.10 +@@ -153,6 +153,8 @@
1.11 ;;
1.12 - FreeBSD.7*) SYSTYPE=FREEBSD7
1.13 + FreeBSD.8*) SYSTYPE=FREEBSD8
1.14 ;;
1.15 -+ FreeBSD.7*) SYSTYPE=FREEBSD7
1.16 -+ ;;
1.17 -+ FreeBSD.8*) SYSTYPE=FREEBSD8
1.18 ++ FreeBSD.9*) SYSTYPE=FREEBSD9
1.19 + ;;
1.20 OpenBSD.2*) SYSTYPE=OPENBSD2
1.21 ;;
1.22 OpenBSD.3*) SYSTYPE=OPENBSD3
1.23 Index: src/util/file_limit.c
1.24 ---- src/util/file_limit.c.orig 2003-10-22 20:48:36 +0200
1.25 -+++ src/util/file_limit.c 2008-01-24 12:31:48 +0100
1.26 +--- src/util/file_limit.c.orig 2003-10-22 20:48:36.000000000 +0200
1.27 ++++ src/util/file_limit.c 2011-01-21 09:43:55.000000000 +0100
1.28 @@ -80,12 +80,21 @@
1.29 void set_file_limit(off_t limit)
1.30 {
1.31 @@ -38,8 +36,8 @@
1.32 msg_fatal("setrlimit: %m");
1.33 #ifdef SIGXFSZ
1.34 Index: src/util/msg_syslog.c
1.35 ---- src/util/msg_syslog.c.orig 2006-06-15 20:07:16 +0200
1.36 -+++ src/util/msg_syslog.c 2008-01-24 12:31:48 +0100
1.37 +--- src/util/msg_syslog.c.orig 2006-06-15 20:07:16.000000000 +0200
1.38 ++++ src/util/msg_syslog.c 2011-01-21 09:43:55.000000000 +0100
1.39 @@ -50,6 +50,11 @@
1.40 #include <syslog.h>
1.41 #include <string.h>
1.42 @@ -89,27 +87,25 @@
1.43
1.44 /* msg_syslog_init - initialize */
1.45 Index: src/util/sys_defs.h
1.46 ---- src/util/sys_defs.h.orig 2008-01-15 01:51:44 +0100
1.47 -+++ src/util/sys_defs.h 2008-01-24 12:32:41 +0100
1.48 -@@ -24,7 +24,7 @@
1.49 - * 4.4BSD and close derivatives.
1.50 +--- src/util/sys_defs.h.orig 2011-01-17 15:44:25.000000000 +0100
1.51 ++++ src/util/sys_defs.h 2011-01-21 09:43:55.000000000 +0100
1.52 +@@ -25,7 +25,7 @@
1.53 */
1.54 #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
1.55 -- || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
1.56 -+ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) || defined(FREEBSD8) \
1.57 + || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
1.58 +- || defined(FREEBSD8) \
1.59 ++ || defined(FREEBSD8) || defined(FREEBSD9) \
1.60 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
1.61 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
1.62 - || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
1.63 -Index: src/smtp/smtp_reuse.c
1.64 ---- src/smtp/smtp_reuse.c.orig 2008-12-04 01:06:42.000000000 +0100
1.65 -+++ src/smtp/smtp_reuse.c 2009-04-06 20:38:18.974597344 +0200
1.66 -@@ -216,7 +216,9 @@
1.67 - /*
1.68 - * Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE.
1.69 - */
1.70 -+#if 0
1.71 - vstream_tweak_sock(session->stream);
1.72 + || defined(OPENBSD5) \
1.73 +@@ -117,6 +117,10 @@
1.74 + #define HAS_CLOSEFROM
1.75 + #endif
1.76 +
1.77 ++#if (__FreeBSD_version < 800000 && __FreeBSD_version >= 702104) || (__FreeBSD_version >= 800100)
1.78 ++#define HAS_CLOSEFROM
1.79 +#endif
1.80 ++
1.81 + /* OpenBSD version is year+month */
1.82
1.83 - /*
1.84 - * Update the list of used cached addresses.
1.85 + #if OpenBSD >= 199805 /* XXX */
