|
|
@@ -1,9 +1,9 @@
|
|
|
https://rt.openpkg.org/Ticket/Display.html?id=285
|
|
|
- USE_SOFTLIMITONLY kludge
|
|
|
+USE_SOFTLIMITONLY kludge
|
|
|
|
|
|
Index: src/util/file_limit.c
|
|
|
---- src/util/file_limit.c.orig 2003-10-22 20:48:36.000000000 +0200
|
|
|
-+++ src/util/file_limit.c 2004-04-23 08:52:51.000000000 +0200
|
|
|
+--- src/util/file_limit.c.orig 2003-10-22 20:48:36 +0200
|
|
|
++++ src/util/file_limit.c 2005-02-06 13:34:59 +0100
|
|
|
@@ -80,12 +80,21 @@
|
|
|
void set_file_limit(off_t limit)
|
|
|
{
|
|
|
@@ -27,8 +27,8 @@ Index: src/util/file_limit.c
|
|
|
msg_fatal("setrlimit: %m");
|
|
|
#ifdef SIGXFSZ
|
|
|
Index: src/util/msg_syslog.c
|
|
|
---- src/util/msg_syslog.c.orig 2004-01-04 17:14:58.000000000 +0100
|
|
|
-+++ src/util/msg_syslog.c 2004-04-23 08:52:51.000000000 +0200
|
|
|
+--- src/util/msg_syslog.c.orig 2004-01-04 17:14:58 +0100
|
|
|
++++ src/util/msg_syslog.c 2005-02-06 13:34:59 +0100
|
|
|
@@ -50,6 +50,11 @@
|
|
|
#include <syslog.h>
|
|
|
#include <string.h>
|
|
|
@@ -78,16 +78,18 @@ Index: src/util/msg_syslog.c
|
|
|
|
|
|
/* msg_syslog_init - initialize */
|
|
|
|
|
|
-I [Steffen Hansen] have attached a patch for postfix-2.1.5 that makes
|
|
|
-various client information (ip, hostname etc.) available to processes
|
|
|
-run via the pipe transport. The code has been accepted for postfix-2.2,
|
|
|
-but depending on how far away from release that is, it might be a good
|
|
|
-idea to have the patch in OpenPKG.
|
|
|
+-----------------------------------------------------------------------------
|
|
|
|
|
|
-diff -upr ../postfix-2.1.5.orig/man/man8/pipe.8 ./man/man8/pipe.8
|
|
|
---- man/man8/pipe.8.orig 2004-08-09 16:51:07.000000000 +0200
|
|
|
-+++ man/man8/pipe.8 2004-12-16 13:16:01.000000000 +0100
|
|
|
-@@ -128,6 +128,22 @@ In the command argument vector, the foll
|
|
|
+Steffen Hansen has patched postfix-2.1.5 for making various client
|
|
|
+information (ip, hostname etc.) available to processes run via the pipe
|
|
|
+transport. The code has been accepted for postfix-2.2, but depending on
|
|
|
+how far away from release that is, it might be a good idea to have the
|
|
|
+patch in OpenPKG.
|
|
|
+
|
|
|
+Index: man/man8/pipe.8
|
|
|
+--- man/man8/pipe.8.orig 2004-08-09 16:51:07 +0200
|
|
|
++++ man/man8/pipe.8 2005-02-06 13:34:59 +0100
|
|
|
+@@ -128,6 +128,22 @@
|
|
|
and replaced with corresponding information from the Postfix queue
|
|
|
manager delivery request:
|
|
|
.RS
|
|
|
@@ -110,10 +112,9 @@ diff -upr ../postfix-2.1.5.orig/man/man8/pipe.8 ./man/man8/pipe.8
|
|
|
.IP \fB${\fBextension\fR}\fR
|
|
|
This macro expands to the extension part of a recipient address.
|
|
|
For example, with an address \fIuser+foo@domain\fR the extension is
|
|
|
-Kun i ../postfix-2.1.5.orig: postfix-2.1.5
|
|
|
-diff -upr ../postfix-2.1.5.orig/src/pipe/pipe.c ./src/pipe/pipe.c
|
|
|
---- src/pipe/pipe.c.orig 2004-07-24 01:09:21.000000000 +0200
|
|
|
-+++ src/pipe/pipe.c 2004-12-16 13:11:43.000000000 +0100
|
|
|
+Index: src/pipe/pipe.c
|
|
|
+--- src/pipe/pipe.c.orig 2004-07-24 01:09:21 +0200
|
|
|
++++ src/pipe/pipe.c 2005-02-06 13:34:59 +0100
|
|
|
@@ -332,6 +332,10 @@
|
|
|
#define PIPE_DICT_EXTENSION "extension" /* key */
|
|
|
#define PIPE_DICT_MAILBOX "mailbox" /* key */
|
|
|
@@ -125,7 +126,7 @@ diff -upr ../postfix-2.1.5.orig/src/pipe/pipe.c ./src/pipe/pipe.c
|
|
|
|
|
|
/*
|
|
|
* Flags used to pass back the type of special parameter found by
|
|
|
-@@ -412,6 +416,10 @@ static int parse_callback(int type, VSTR
|
|
|
+@@ -412,6 +416,10 @@
|
|
|
PIPE_DICT_EXTENSION, PIPE_FLAG_EXTENSION,
|
|
|
PIPE_DICT_MAILBOX, PIPE_FLAG_MAILBOX,
|
|
|
PIPE_DICT_SIZE, 0,
|
|
|
@@ -136,7 +137,7 @@ diff -upr ../postfix-2.1.5.orig/src/pipe/pipe.c ./src/pipe/pipe.c
|
|
|
0, 0,
|
|
|
};
|
|
|
struct cmd_flags *p;
|
|
|
-@@ -954,6 +962,15 @@ static int deliver_message(DELIVER_REQUE
|
|
|
+@@ -954,6 +962,15 @@
|
|
|
dict_update(PIPE_DICT_TABLE, PIPE_DICT_SIZE, STR(buf));
|
|
|
vstring_free(buf);
|
|
|
|
|
|
@@ -153,3 +154,30 @@ diff -upr ../postfix-2.1.5.orig/src/pipe/pipe.c ./src/pipe/pipe.c
|
|
|
rcpt_list, attr.flags)) == 0) {
|
|
|
deliver_status = eval_command_status(PIPE_STAT_DEFER, service,
|
|
|
|
|
|
+-----------------------------------------------------------------------------
|
|
|
+
|
|
|
+Index: makedefs
|
|
|
+--- makedefs.orig 2004-04-14 20:59:43 +0200
|
|
|
++++ makedefs 2005-02-06 13:34:59 +0100
|
|
|
+@@ -93,6 +93,8 @@
|
|
|
+ ;;
|
|
|
+ FreeBSD.5*) SYSTYPE=FREEBSD5
|
|
|
+ ;;
|
|
|
++ FreeBSD.6*) SYSTYPE=FREEBSD6
|
|
|
++ ;;
|
|
|
+ OpenBSD.2*) SYSTYPE=OPENBSD2
|
|
|
+ ;;
|
|
|
+ OpenBSD.3*) SYSTYPE=OPENBSD3
|
|
|
+Index: src/util/sys_defs.h
|
|
|
+--- src/util/sys_defs.h.orig 2004-08-01 23:05:23 +0200
|
|
|
++++ src/util/sys_defs.h 2005-02-06 13:34:59 +0100
|
|
|
+@@ -24,7 +24,7 @@
|
|
|
+ * 4.4BSD and close derivatives.
|
|
|
+ */
|
|
|
+ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|
|
|
+- || defined(FREEBSD5) \
|
|
|
++ || defined(FREEBSD5) || defined(FREEBSD6) \
|
|
|
+ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|
|
|
+ || defined(OPENBSD2) || defined(OPENBSD3) \
|
|
|
+ || defined(NETBSD1) || defined(NETBSD2) \
|
|
|
+
|
