summaryrefslogtreecommitdiff
path: root/mail/postfix-current/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mail/postfix-current/patches')
-rw-r--r--mail/postfix-current/patches/patch-aa10
-rw-r--r--mail/postfix-current/patches/patch-ab2
-rw-r--r--mail/postfix-current/patches/patch-ac2
-rw-r--r--mail/postfix-current/patches/patch-ae21
-rw-r--r--mail/postfix-current/patches/patch-af14
-rw-r--r--mail/postfix-current/patches/patch-ag16
-rw-r--r--mail/postfix-current/patches/patch-ah2
-rw-r--r--mail/postfix-current/patches/patch-ai10
-rw-r--r--mail/postfix-current/patches/patch-bd12
-rw-r--r--mail/postfix-current/patches/patch-be30
-rw-r--r--mail/postfix-current/patches/patch-bg17
-rw-r--r--mail/postfix-current/patches/patch-bk13
-rw-r--r--mail/postfix-current/patches/patch-bs17
-rw-r--r--mail/postfix-current/patches/patch-bt17
14 files changed, 33 insertions, 150 deletions
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index 403a584ed98..c4aff913353 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-aa,v 1.13 2004/07/02 08:03:04 martti Exp $
---- postfix-install.orig 2004-04-15 00:45:23.000000000 +0900
-+++ postfix-install
-@@ -354,33 +354,13 @@ HTML files. Specify \"no\" if you do not
+--- postfix-install.orig 2004-04-14 11:45:23.000000000 -0400
++++ postfix-install 2004-05-23 22:32:31.000000000 -0400
+@@ -354,33 +354,13 @@
: ${tempdir=`pwd`}
: ${config_directory=`bin/postconf -h -d config_directory`}
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.12 2004/06/06 13:50:41 taca Exp $
# If a parameter is not set via the command line or environment,
# try to use settings from installed configuration files.
-@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -715,10 +695,3 @@
"sample_directory = $sample_directory" \
"readme_directory = $readme_directory" \
|| exit 1
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
index 34c044ab034..6c535a114ab 100644
--- a/mail/postfix-current/patches/patch-ab
+++ b/mail/postfix-current/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ab,v 1.6 2004/07/02 08:03:04 martti Exp $
--- src/lmtp/lmtp.h.orig 2003-09-10 02:48:03.000000000 +0200
+++ src/lmtp/lmtp.h 2004-01-20 20:30:12.000000000 +0100
diff --git a/mail/postfix-current/patches/patch-ac b/mail/postfix-current/patches/patch-ac
index 7536289c357..26261cb6ccc 100644
--- a/mail/postfix-current/patches/patch-ac
+++ b/mail/postfix-current/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ac,v 1.4 2004/07/02 08:03:04 martti Exp $
--- src/smtp/smtp.h.orig 2002-05-23 21:18:02.000000000 +0200
+++ src/smtp/smtp.h 2004-01-20 20:29:21.000000000 +0100
diff --git a/mail/postfix-current/patches/patch-ae b/mail/postfix-current/patches/patch-ae
index 5a9480f2e7c..6298f3b891b 100644
--- a/mail/postfix-current/patches/patch-ae
+++ b/mail/postfix-current/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ae,v 1.4 2004/07/02 08:03:04 martti Exp $
---- src/global/mail_params.h.orig 2004-01-18 02:04:00.000000000 +1100
-+++ src/global/mail_params.h
-@@ -64,7 +64,7 @@ extern uid_t var_owner_uid;
+--- src/global/mail_params.h.orig 2004-04-21 14:56:04.000000000 -0400
++++ src/global/mail_params.h 2004-05-23 22:44:13.000000000 -0400
+@@ -64,7 +64,7 @@
extern gid_t var_owner_gid;
#define VAR_SGID_GROUP "setgid_group"
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
extern char *var_sgid_group;
extern gid_t var_sgid_gid;
-@@ -202,13 +202,13 @@ extern char *var_queue_dir;
+@@ -202,13 +202,13 @@
*/
#define VAR_DAEMON_DIR "daemon_directory"
#ifndef DEF_DAEMON_DIR
@@ -27,14 +27,3 @@ $NetBSD: patch-ae,v 1.3 2004/03/06 15:08:32 grant Exp $
#endif
extern char *var_command_dir;
-@@ -334,6 +334,10 @@ extern char *var_send_canon_maps;
- #define DEF_RCPT_CANON_MAPS ""
- extern char *var_rcpt_canon_maps;
-
-+#define VAR_CANON_ENV_RCPT "canonicalize_envelope_recipient"
-+#define DEF_CANON_ENV_RCPT 1
-+extern bool var_canon_env_rcpt;
-+
- #define VAR_SEND_BCC_MAPS "sender_bcc_maps"
- #define DEF_SEND_BCC_MAPS ""
- extern char *var_send_bcc_maps;
diff --git a/mail/postfix-current/patches/patch-af b/mail/postfix-current/patches/patch-af
index e96ec88897b..ee35fcfcb3d 100644
--- a/mail/postfix-current/patches/patch-af
+++ b/mail/postfix-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-af,v 1.10 2004/07/02 08:03:04 martti Exp $
---- conf/main.cf.orig 2004-04-15 22:27:21.000000000 +0900
-+++ conf/main.cf
-@@ -32,13 +32,18 @@ queue_directory = /var/spool/postfix
+--- conf/main.cf.orig 2004-04-15 09:27:21.000000000 -0400
++++ conf/main.cf 2004-05-23 22:51:16.000000000 -0400
+@@ -32,13 +32,18 @@
# The command_directory parameter specifies the location of all
# postXXX commands.
#
@@ -23,7 +23,7 @@ $NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
# QUEUE AND PROCESS OWNERSHIP
#
-@@ -56,7 +61,7 @@ mail_owner = postfix
+@@ -56,7 +61,7 @@
# These rights are used in the absence of a recipient user context.
# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
#
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
# INTERNET HOST AND DOMAIN NAMES
#
-@@ -611,7 +616,7 @@ mailq_path =
+@@ -611,7 +616,7 @@
# commands. This must be a group name with a numerical group ID that
# is not shared with other accounts, not even with the Postfix account.
#
@@ -41,7 +41,7 @@ $NetBSD: patch-af,v 1.9 2004/06/06 13:50:41 taca Exp $
# html_directory: The location of the Postfix HTML documentation.
#
-@@ -619,13 +624,13 @@ html_directory =
+@@ -619,13 +624,13 @@
# manpage_directory: The location of the Postfix on-line manual pages.
#
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index aa593d661d1..d49a39f69a1 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.4 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-ag,v 1.5 2004/07/02 08:03:04 martti Exp $
---- src/util/sys_defs.h.orig 2004-04-15 04:49:40.000000000 +0900
-+++ src/util/sys_defs.h
-@@ -50,8 +50,13 @@
- #endif
- #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
+--- src/util/sys_defs.h.orig 2004-06-14 21:13:40.000000000 +0300
++++ src/util/sys_defs.h 2004-06-20 11:40:54.000000000 +0300
+@@ -127,8 +127,13 @@
+ #define ALIAS_DB_MAP "hash:/etc/aliases"
+ #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
+#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
+#define USE_STATVFS
@@ -14,5 +14,5 @@ $NetBSD: patch-ag,v 1.4 2004/06/06 13:50:41 taca Exp $
#define STATFS_IN_SYS_MOUNT_H
+#endif
#define HAS_POSIX_REGEXP
- #define HAS_ST_GEN /* struct stat contains inode generation number */
- #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NORETURN void
+ #define PRINTFLIKE(x,y)
diff --git a/mail/postfix-current/patches/patch-ah b/mail/postfix-current/patches/patch-ah
index a936e20ba7c..d83dbe02eb5 100644
--- a/mail/postfix-current/patches/patch-ah
+++ b/mail/postfix-current/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ah,v 1.4 2004/07/02 08:03:04 martti Exp $
--- src/smtpd/smtpd.h.orig 2003-10-02 06:48:30.000000000 -0400
+++ src/smtpd/smtpd.h 2003-10-02 06:48:31.000000000 -0400
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 1d33174f62f..e3ec76951c7 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2004/06/06 13:50:41 taca Exp $
+$NetBSD: patch-ai,v 1.7 2004/07/02 08:03:04 martti Exp $
---- makedefs.orig 2004-04-15 04:18:06.000000000 +0900
-+++ makedefs
-@@ -182,22 +182,6 @@ case "$SYSTEM.$RELEASE" in
+--- makedefs.orig 2004-04-14 14:59:43.000000000 -0400
++++ makedefs 2004-05-23 22:53:06.000000000 -0400
+@@ -182,22 +182,6 @@
SYSLIBS="-ldb"
;;
Linux.2*) SYSTYPE=LINUX2
@@ -25,7 +25,7 @@ $NetBSD: patch-ai,v 1.6 2004/06/06 13:50:41 taca Exp $
# GDBM locks the DBM .pag file after open. This breaks postmap.
# if [ -f /usr/include/gdbm-ndbm.h ]
# then
-@@ -208,7 +192,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -208,7 +192,6 @@
# CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
# GDBM_LIBS=gdbm
# fi
diff --git a/mail/postfix-current/patches/patch-bd b/mail/postfix-current/patches/patch-bd
deleted file mode 100644
index deaf11fa350..00000000000
--- a/mail/postfix-current/patches/patch-bd
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2004/03/06 15:08:32 grant Exp $
-
---- src/cleanup/cleanup_init.c.orig 2004-01-06 11:27:08.000000000 +1100
-+++ src/cleanup/cleanup_init.c
-@@ -112,6 +112,7 @@ char *var_prop_extension; /* propagat
- char *var_always_bcc; /* big brother */
- char *var_rcpt_witheld; /* recipients not disclosed */
- char *var_masq_classes; /* what to masquerade */
-+bool var_canon_env_rcpt; /* canonicalize envelope recipient */
- int var_qattr_count_limit; /* named attribute limit */
- int var_virt_recur_limit; /* maximum virtual alias recursion */
- int var_virt_expan_limit; /* maximum virtual alias expansion */
diff --git a/mail/postfix-current/patches/patch-be b/mail/postfix-current/patches/patch-be
deleted file mode 100644
index 4dc1c4cc711..00000000000
--- a/mail/postfix-current/patches/patch-be
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-be,v 1.3 2004/03/06 15:08:32 grant Exp $
-
---- src/cleanup/cleanup_message.c.orig 2004-01-21 12:25:27.000000000 +1100
-+++ src/cleanup/cleanup_message.c
-@@ -177,15 +177,17 @@ static void cleanup_rewrite_sender(CLEAN
- for (tpp = addr_list; *tpp; tpp++) {
- cleanup_rewrite_tree(*tpp);
- if (state->flags & CLEANUP_FLAG_MAP_OK) {
-- if (cleanup_send_canon_maps)
-- cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps,
-- cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-- if (cleanup_comm_canon_maps)
-- cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps,
-- cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-- if (cleanup_masq_domains
-- && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM))
-+ if (var_canon_env_rcpt) {
-+ if (cleanup_send_canon_maps)
-+ cleanup_map11_tree(state, *tpp, cleanup_send_canon_maps,
-+ cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+ if (cleanup_comm_canon_maps)
-+ cleanup_map11_tree(state, *tpp, cleanup_comm_canon_maps,
-+ cleanup_ext_prop_mask & EXT_PROP_CANONICAL);
-+ if (cleanup_masq_domains
-+ && (cleanup_masq_flags & CLEANUP_MASQ_FLAG_HDR_FROM))
- cleanup_masquerade_tree(*tpp, cleanup_masq_domains);
-+ }
- }
- if (hdr_opts->type == HDR_FROM && state->from == 0)
- state->from = cleanup_extract_internal(header_buf, *tpp);
diff --git a/mail/postfix-current/patches/patch-bg b/mail/postfix-current/patches/patch-bg
deleted file mode 100644
index 8f76730275c..00000000000
--- a/mail/postfix-current/patches/patch-bg
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bg,v 1.3 2004/06/06 13:50:41 taca Exp $
-
---- src/local/file.c.orig 2002-11-17 08:44:57.000000000 +0900
-+++ src/local/file.c
-@@ -181,7 +181,11 @@ int deliver_file(LOCAL_STATE state,
- if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
- deliver_status = DEL_STAT_DEFER;
- } else if (mail_copy_status != 0) {
-- deliver_status = (errno == EAGAIN || errno == ENOSPC || errno == ESTALE ?
-+ deliver_status = (errno == EAGAIN || errno == ENOSPC ||
-+#ifdef EDQUOT
-+ errno == EDQUOT ||
-+#endif
-+ errno == ESTALE ?
- defer_append : bounce_append)
- (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr),
- "cannot append message to destination file %s: %s",
diff --git a/mail/postfix-current/patches/patch-bk b/mail/postfix-current/patches/patch-bk
deleted file mode 100644
index 1358a028aeb..00000000000
--- a/mail/postfix-current/patches/patch-bk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2004/06/06 13:50:41 taca Exp $
-
---- src/util/sys_defs.h.orig 2004-06-06 01:38:41.000000000 +0900
-+++ src/util/sys_defs.h
-@@ -951,6 +951,8 @@ extern int h_errno;
- #endif
- #endif
-
-+#define RECEIVED_ENVELOPE_FROM
-+
- #define CAST_CHAR_PTR_TO_INT(cptr) ((int) (long) (cptr))
- #define CAST_INT_TO_CHAR_PTR(ival) ((char *) (long) (ival))
-
diff --git a/mail/postfix-current/patches/patch-bs b/mail/postfix-current/patches/patch-bs
deleted file mode 100644
index 9b3dd71f057..00000000000
--- a/mail/postfix-current/patches/patch-bs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bs,v 1.1 2004/06/06 13:50:41 taca Exp $
-
---- src/local/mailbox.c.orig 2002-11-17 08:44:57.000000000 +0900
-+++ src/local/mailbox.c
-@@ -213,7 +213,11 @@ static int deliver_mailbox_file(LOCAL_ST
- if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
- deliver_status = DEL_STAT_DEFER;
- } else if (mail_copy_status != 0) {
-- deliver_status = (errno == EAGAIN || errno == ENOSPC || errno == ESTALE ?
-+ deliver_status = (errno == EAGAIN || errno == ENOSPC ||
-+#ifdef EDQUOT
-+ errno == EDQUOT ||
-+#endif
-+ errno == ESTALE ?
- defer_append : bounce_append)
- (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr),
- "cannot access mailbox %s for user %s. %s",
diff --git a/mail/postfix-current/patches/patch-bt b/mail/postfix-current/patches/patch-bt
deleted file mode 100644
index 485fe37a21b..00000000000
--- a/mail/postfix-current/patches/patch-bt
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bt,v 1.1 2004/06/06 13:50:41 taca Exp $
-
---- src/local/maildir.c.orig 2003-04-17 00:03:02.000000000 +0900
-+++ src/local/maildir.c
-@@ -212,7 +212,11 @@ int deliver_maildir(LOCAL_STATE stat
- if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) {
- deliver_status = DEL_STAT_DEFER;
- } else if (mail_copy_status != 0) {
-- deliver_status = (errno == ENOSPC || errno == ESTALE ?
-+ deliver_status = (errno == ENOSPC ||
-+#ifdef EDQUOT
-+ errno == EDQUOT ||
-+#endif
-+ errno == ESTALE ?
- defer_append : bounce_append)
- (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr),
- "maildir delivery failed: %s", vstring_str(why));
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-29 11:39:31 +0000