Browse Source

apply FreeBSD 8 patch and remove obsolete vstream related patch

Ralf S. Engelschall 16 years ago
parent
commit
afb9ebfdce
2 changed files with 16 additions and 18 deletions
  1. 15 17
      postfix/postfix.patch
  2. 1 1
      postfix/postfix.spec

+ 15 - 17
postfix/postfix.patch

@@ -1,6 +1,6 @@
 Index: makedefs
 --- makedefs.orig	2009-05-11 23:26:46 +0200
-+++ makedefs	2009-05-12 09:08:00 +0200
++++ makedefs	2009-07-13 19:43:04 +0200
 @@ -144,6 +144,8 @@
  		;;
    FreeBSD.7*)	SYSTYPE=FREEBSD7
@@ -10,22 +10,9 @@ Index: makedefs
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-Index: src/smtp/smtp_reuse.c
---- src/smtp/smtp_reuse.c.orig	2008-12-04 01:06:42 +0100
-+++ src/smtp/smtp_reuse.c	2009-05-12 09:07:29 +0200
-@@ -216,7 +216,9 @@
-     /*
-      * Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE.
-      */
-+#if 0
-     vstream_tweak_sock(session->stream);
-+#endif
- 
-     /*
-      * Update the list of used cached addresses.
 Index: src/util/file_limit.c
 --- src/util/file_limit.c.orig	2003-10-22 20:48:36 +0200
-+++ src/util/file_limit.c	2009-05-12 08:58:45 +0200
++++ src/util/file_limit.c	2009-07-13 19:43:04 +0200
 @@ -80,12 +80,21 @@
  void    set_file_limit(off_t limit)
  {
@@ -50,7 +37,7 @@ Index: src/util/file_limit.c
  #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	2009-05-12 08:58:45 +0200
++++ src/util/msg_syslog.c	2009-07-13 19:43:04 +0200
 @@ -50,6 +50,11 @@
  #include <syslog.h>
  #include <string.h>
@@ -101,7 +88,7 @@ Index: src/util/msg_syslog.c
  /* msg_syslog_init - initialize */
 Index: src/util/sys_defs.h
 --- src/util/sys_defs.h.orig	2009-05-11 02:45:27 +0200
-+++ src/util/sys_defs.h	2009-05-12 08:58:45 +0200
++++ src/util/sys_defs.h	2009-07-13 19:43:55 +0200
 @@ -24,7 +24,7 @@
    * 4.4BSD and close derivatives.
    */
@@ -111,3 +98,14 @@ Index: src/util/sys_defs.h
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
      || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
+@@ -110,6 +110,10 @@
+ #define HAS_DUPLEX_PIPE			/* 4.1 breaks with kqueue(2) */
+ #endif
+ 
++#if __FreeBSD_version >= 800100
++#define HAS_CLOSEFROM
++#endif
++
+ /* OpenBSD version is year+month */
+ 
+ #if OpenBSD >= 199805			/* XXX */

+ 1 - 1
postfix/postfix.spec

@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Mail
 License:      IPL
 Version:      %{V_postfix}
-Release:      20090705
+Release:      20090713
 
 #   package options
 %option       with_fsl       yes