comparison: postfix/postfix.patch
postfix/postfix.patch
- changeset 641
- 4fa917def625
- parent 147
- 13509f36148e
equal
deleted
inserted
replaced
| 1:dc624a99b996 | 2:872252d30db1 |
|---|---|
| 1 Index: makedefs | 1 Index: makedefs |
| 2 --- makedefs.orig 2008-01-15 21:20:24 +0100 | 2 --- makedefs.orig 2011-01-16 22:02:31.000000000 +0100 |
| 3 +++ makedefs 2008-01-24 12:31:48 +0100 | 3 +++ makedefs 2011-01-21 09:43:55.000000000 +0100 |
| 4 @@ -132,6 +132,10 @@ | 4 @@ -153,6 +153,8 @@ |
| 5 ;; | 5 ;; |
| 6 FreeBSD.7*) SYSTYPE=FREEBSD7 | 6 FreeBSD.8*) SYSTYPE=FREEBSD8 |
| 7 ;; | 7 ;; |
| 8 + FreeBSD.7*) SYSTYPE=FREEBSD7 | 8 + FreeBSD.9*) SYSTYPE=FREEBSD9 |
| 9 + ;; | |
| 10 + FreeBSD.8*) SYSTYPE=FREEBSD8 | |
| 11 + ;; | 9 + ;; |
| 12 OpenBSD.2*) SYSTYPE=OPENBSD2 | 10 OpenBSD.2*) SYSTYPE=OPENBSD2 |
| 13 ;; | 11 ;; |
| 14 OpenBSD.3*) SYSTYPE=OPENBSD3 | 12 OpenBSD.3*) SYSTYPE=OPENBSD3 |
| 15 Index: src/util/file_limit.c | 13 Index: src/util/file_limit.c |
| 16 --- src/util/file_limit.c.orig 2003-10-22 20:48:36 +0200 | 14 --- src/util/file_limit.c.orig 2003-10-22 20:48:36.000000000 +0200 |
| 17 +++ src/util/file_limit.c 2008-01-24 12:31:48 +0100 | 15 +++ src/util/file_limit.c 2011-01-21 09:43:55.000000000 +0100 |
| 18 @@ -80,12 +80,21 @@ | 16 @@ -80,12 +80,21 @@ |
| 19 void set_file_limit(off_t limit) | 17 void set_file_limit(off_t limit) |
| 20 { | 18 { |
| 21 #ifdef USE_ULIMIT | 19 #ifdef USE_ULIMIT |
| 22 +#ifdef USE_SOFTLIMITONLY | 20 +#ifdef USE_SOFTLIMITONLY |
| 36 +#endif | 34 +#endif |
| 37 if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) | 35 if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) |
| 38 msg_fatal("setrlimit: %m"); | 36 msg_fatal("setrlimit: %m"); |
| 39 #ifdef SIGXFSZ | 37 #ifdef SIGXFSZ |
| 40 Index: src/util/msg_syslog.c | 38 Index: src/util/msg_syslog.c |
| 41 --- src/util/msg_syslog.c.orig 2006-06-15 20:07:16 +0200 | 39 --- src/util/msg_syslog.c.orig 2006-06-15 20:07:16.000000000 +0200 |
| 42 +++ src/util/msg_syslog.c 2008-01-24 12:31:48 +0100 | 40 +++ src/util/msg_syslog.c 2011-01-21 09:43:55.000000000 +0100 |
| 43 @@ -50,6 +50,11 @@ | 41 @@ -50,6 +50,11 @@ |
| 44 #include <syslog.h> | 42 #include <syslog.h> |
| 45 #include <string.h> | 43 #include <string.h> |
| 46 #include <time.h> | 44 #include <time.h> |
| 47 +#ifdef USE_SOFTLIMITONLY | 45 +#ifdef USE_SOFTLIMITONLY |
| 87 +#endif | 85 +#endif |
| 88 } | 86 } |
| 89 | 87 |
| 90 /* msg_syslog_init - initialize */ | 88 /* msg_syslog_init - initialize */ |
| 91 Index: src/util/sys_defs.h | 89 Index: src/util/sys_defs.h |
| 92 --- src/util/sys_defs.h.orig 2008-01-15 01:51:44 +0100 | 90 --- src/util/sys_defs.h.orig 2011-01-17 15:44:25.000000000 +0100 |
| 93 +++ src/util/sys_defs.h 2008-01-24 12:32:41 +0100 | 91 +++ src/util/sys_defs.h 2011-01-21 09:43:55.000000000 +0100 |
| 94 @@ -24,7 +24,7 @@ | 92 @@ -25,7 +25,7 @@ |
| 95 * 4.4BSD and close derivatives. | |
| 96 */ | 93 */ |
| 97 #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ | 94 #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ |
| 98 - || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ | 95 || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ |
| 99 + || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) || defined(FREEBSD8) \ | 96 - || defined(FREEBSD8) \ |
| 97 + || defined(FREEBSD8) || defined(FREEBSD9) \ | |
| 100 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ | 98 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ |
| 101 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ | 99 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ |
| 102 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ | 100 || defined(OPENBSD5) \ |
| 103 Index: src/smtp/smtp_reuse.c | 101 @@ -117,6 +117,10 @@ |
| 104 --- src/smtp/smtp_reuse.c.orig 2008-12-04 01:06:42.000000000 +0100 | 102 #define HAS_CLOSEFROM |
| 105 +++ src/smtp/smtp_reuse.c 2009-04-06 20:38:18.974597344 +0200 | 103 #endif |
| 106 @@ -216,7 +216,9 @@ | 104 |
| 107 /* | 105 +#if (__FreeBSD_version < 800000 && __FreeBSD_version >= 702104) || (__FreeBSD_version >= 800100) |
| 108 * Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE. | 106 +#define HAS_CLOSEFROM |
| 109 */ | |
| 110 +#if 0 | |
| 111 vstream_tweak_sock(session->stream); | |
| 112 +#endif | 107 +#endif |
| 108 + | |
| 109 /* OpenBSD version is year+month */ | |
| 113 | 110 |
| 114 /* | 111 #if OpenBSD >= 199805 /* XXX */ |
| 115 * Update the list of used cached addresses. |
