- updated for 3.0.2

diff --git a/postfix-conf.patch b/postfix-conf.patch
index 28db6efe693d89277dc7190fed4163c5e60fd4e5..0bc4ce9359c7566a5017f19632613192aaad3c93 100644 (file)
--- a/postfix-conf.patch
+++ b/postfix-conf.patch
@@ -1,6 +1,7 @@
---- postfix-2.3.0/conf/master.cf~      2006-07-25 13:36:17.245609587 +0300
-+++ postfix-2.3.0/conf/master.cf       2006-07-25 13:37:53.847756797 +0300
-@@ -55,7 +55,7 @@
+diff -ur postfix-3.0.2.orig/conf/master.cf postfix-3.0.2/conf/master.cf
+--- postfix-3.0.2.orig/conf/master.cf  2015-07-25 18:23:32.000000000 +0000
++++ postfix-3.0.2/conf/master.cf       2015-07-25 18:24:44.966826277 +0000
+@@ -76,7 +76,7 @@
  # Also specify in main.cf: maildrop_destination_recipient_limit=1
  #
  #maildrop  unix  -       n       n       -       -       pipe
@@ -9,7 +10,7 @@
  #
  # ====================================================================
  #
-@@ -76,7 +76,7 @@
+@@ -119,7 +119,7 @@
  #  flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
  #
  #bsmtp     unix  -       n       n       -       -       pipe

diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch
index 25a381ee6f9d32dc3da8b54ba7477d0ce1714038..0515c0474f69f56045810b3f0c5976df4a6d4324 100644 (file)
--- a/postfix-conf_msg.patch
+++ b/postfix-conf_msg.patch
@@ -1,32 +1,7 @@
---- src/global/mail_params.h.orig      2004-06-22 14:32:58.615734426 +0200
-+++ src/global/mail_params.h   2004-06-22 14:33:21.260418134 +0200
-@@ -2204,6 +2204,13 @@
- extern char *var_anvil_service;
- #endif
- 
-+ /*
-+  * SMTPD messages
-+  */
-+#define VAR_REJECT_REPLY_MSG_ACCESS_DENIED    "smtpd_reject_msg_access_denied"
-+#define DEF_REJECT_REPLY_MSG_ACCESS_DENIED    "rejected: Relay access denied."
-+extern char *var_reject_reply_msg_access_denied;
-+
- /* LICENSE
- /* .ad
- /* .fi
---- src/smtpd/smtpd.c.orig     2009-05-25 19:13:15.584397697 +0200
-+++ src/smtpd/smtpd.c  2009-05-25 19:14:31.066487776 +0200
-@@ -5062,6 +5062,7 @@
-       VAR_MILT_DAEMON_NAME, DEF_MILT_DAEMON_NAME, &var_milt_daemon_name, 1, 0,
-       VAR_MILT_V, DEF_MILT_V, &var_milt_v, 1, 0,
-       VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,
-+      VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
-       VAR_UNV_FROM_WHY, DEF_UNV_FROM_WHY, &var_unv_from_why, 0, 0,
-       VAR_UNV_RCPT_WHY, DEF_UNV_RCPT_WHY, &var_unv_rcpt_why, 0, 0,
-       VAR_REJECT_TMPF_ACT, DEF_REJECT_TMPF_ACT, &var_reject_tmpf_act, 1, 0,
---- src/global/mail_params.c.orig      2010-04-05 21:25:33.331592727 +0200
-+++ src/global/mail_params.c   2010-04-05 21:27:01.504746061 +0200
-@@ -80,6 +80,7 @@
+diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/mail_params.c
+--- postfix-3.0.2.orig/src/global/mail_params.c        2015-01-27 19:27:44.000000000 +0000
++++ postfix-3.0.2/src/global/mail_params.c     2015-07-25 15:55:35.700514288 +0000
+@@ -82,6 +82,7 @@
  /*    char    *var_debug_peer_list;
  /*    int     var_debug_peer_level;
  /*    int     var_in_flow_delay;
@@ -34,7 +9,7 @@
  /*    int     var_fault_inj_code;
  /*    char   *var_bounce_service;
  /*    char   *var_cleanup_service;
-@@ -265,6 +266,7 @@
+@@ -286,6 +287,7 @@
  char   *var_export_environ;
  char   *var_debug_peer_list;
  int     var_debug_peer_level;
@@ -42,11 +17,39 @@
  int     var_fault_inj_code;
  char   *var_bounce_service;
  char   *var_cleanup_service;
-@@ -569,6 +571,7 @@
-       VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0,
-       /* multi_instance_wrapper may have dependencies but not dependents. */
-       VAR_MULTI_WRAPPER, DEF_MULTI_WRAPPER, &var_multi_wrapper, 0, 0,
+@@ -695,6 +697,7 @@
+       VAR_DSN_FILTER, DEF_DSN_FILTER, &var_dsn_filter, 0, 0,
+       VAR_SMTPUTF8_AUTOCLASS, DEF_SMTPUTF8_AUTOCLASS, &var_smtputf8_autoclass, 1, 0,
+       VAR_DROP_HDRS, DEF_DROP_HDRS, &var_drop_hdrs, 0, 0,
 +      VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
        0,
      };
      static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
+diff -ur postfix-3.0.2.orig/src/global/mail_params.h postfix-3.0.2/src/global/mail_params.h
+--- postfix-3.0.2.orig/src/global/mail_params.h        2015-07-25 15:53:06.000000000 +0000
++++ postfix-3.0.2/src/global/mail_params.h     2015-07-25 15:55:35.696514288 +0000
+@@ -3908,6 +3908,13 @@
+                                       MAIL_SRC_NAME_VERIFY
+ extern char *var_smtputf8_autoclass;
+ 
++ /*
++  * SMTPD messages
++  */
++#define VAR_REJECT_REPLY_MSG_ACCESS_DENIED    "smtpd_reject_msg_access_denied"
++#define DEF_REJECT_REPLY_MSG_ACCESS_DENIED    "rejected: Relay access denied."
++extern char *var_reject_reply_msg_access_denied;
++
+ /* LICENSE
+ /* .ad
+ /* .fi
+diff -ur postfix-3.0.2.orig/src/smtpd/smtpd.c postfix-3.0.2/src/smtpd/smtpd.c
+--- postfix-3.0.2.orig/src/smtpd/smtpd.c       2015-07-19 22:34:26.000000000 +0000
++++ postfix-3.0.2/src/smtpd/smtpd.c    2015-07-25 15:55:35.699514288 +0000
+@@ -5751,6 +5751,7 @@
+       VAR_MILT_DAEMON_NAME, DEF_MILT_DAEMON_NAME, &var_milt_daemon_name, 1, 0,
+       VAR_MILT_V, DEF_MILT_V, &var_milt_v, 1, 0,
+       VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,
++      VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
+       VAR_UNV_FROM_WHY, DEF_UNV_FROM_WHY, &var_unv_from_why, 0, 0,
+       VAR_UNV_RCPT_WHY, DEF_UNV_RCPT_WHY, &var_unv_rcpt_why, 0, 0,
+       VAR_REJECT_TMPF_ACT, DEF_REJECT_TMPF_ACT, &var_reject_tmpf_act, 1, 0,

diff --git a/postfix-config.patch b/postfix-config.patch
index 1cdc87f17e9cf8b6cb02c2ccf334d76f219f39b2..0d5918ede8584ef94744d9196c805f34563f2765 100644 (file)
--- a/postfix-config.patch
+++ b/postfix-config.patch
@@ -1,27 +1,7 @@
-diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
---- postfix-2.1.3.orig/src/global/mail_params.h        2004-06-22 14:20:57.890585644 +0200
-+++ postfix-2.1.3/src/global/mail_params.h     2004-06-22 14:21:17.963422126 +0200
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP                "setgid_group"
--#define DEF_SGID_GROUP                "postdrop"
-+#define DEF_SGID_GROUP                "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-#@@ -231,7 +231,7 @@
-#   */
-# #define VAR_CONFIG_DIR               "config_directory"
-# #ifndef DEF_CONFIG_DIR
-#-#define DEF_CONFIG_DIR               "/etc/postfix"
-#+#define DEF_CONFIG_DIR               "/etc/mail"
-# #endif
-# extern char *var_config_dir;
-# 
---- postfix-2.9.0/conf/main.cf.orig    2012-02-04 19:05:20.960656539 +0100
-+++ postfix-2.9.0/conf/main.cf 2012-02-04 19:12:31.810624906 +0100
-@@ -39,7 +39,7 @@
+diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf
+--- postfix-3.0.2.orig/conf/main.cf    2014-10-09 23:46:44.000000000 +0000
++++ postfix-3.0.2/conf/main.cf 2015-07-25 15:53:06.027514288 +0000
+@@ -58,7 +58,7 @@
  # daemon programs (i.e. programs listed in the master.cf file). This
  # directory must be owned by root.
  #
@@ -30,7 +10,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  
  # The data_directory parameter specifies the location of Postfix-writable
  # data files (caches, random numbers). This directory must be owned
-@@ -63,7 +63,7 @@
+@@ -82,7 +82,7 @@
  # These rights are used in the absence of a recipient user context.
  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
  #
@@ -39,7 +19,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  
  # INTERNET HOST AND DOMAIN NAMES
  # 
-@@ -95,7 +95,7 @@
+@@ -114,7 +114,7 @@
  # myorigin also specifies the default domain name that is appended
  # to recipient addresses that have no @domain part.
  #
@@ -48,7 +28,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  #myorigin = $mydomain
  
  # RECEIVING MAIL
-@@ -379,7 +379,7 @@
+@@ -398,7 +398,7 @@
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
@@ -57,7 +37,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  #alias_maps = hash:/etc/aliases, nis:mail.aliases
  #alias_maps = netinfo:/aliases
  
-@@ -390,7 +390,7 @@
+@@ -409,7 +409,7 @@
  #
  #alias_database = dbm:/etc/aliases
  #alias_database = dbm:/etc/mail/aliases
@@ -66,7 +46,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
  
  # ADDRESS EXTENSIONS (e.g., user+foo)
-@@ -418,7 +418,7 @@
+@@ -437,7 +437,7 @@
  # UNIX-style mailboxes are kept. The default setting depends on the
  # system type.
  #
@@ -75,7 +55,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  #mail_spool_directory = /var/spool/mail
  
  # The mailbox_command parameter specifies the optional external
-@@ -440,8 +440,8 @@
+@@ -459,8 +459,8 @@
  # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
  # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
  #
@@ -86,7 +66,7 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
  
  # The mailbox_transport specifies the optional transport in master.cf
  # to use after processing aliases and .forward files. This parameter
-@@ -613,45 +613,24 @@
+@@ -632,45 +632,24 @@
  #     -dmS $process_name gdb $daemon_directory/$process_name
  #     $process_id & sleep 1
  
@@ -141,9 +121,22 @@ diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/m
 -readme_directory =
 -inet_protocols = ipv4
 +unknown_address_reject_code = 550
---- postfix-2.11.0/src/util/sys_defs.h.orig    2014-01-21 20:07:14.000000000 +0100
-+++ postfix-2.11.0/src/util/sys_defs.h 2014-01-21 20:09:42.583892396 +0100
-@@ -54,7 +54,7 @@
+diff -ur postfix-3.0.2.orig/src/global/mail_params.h postfix-3.0.2/src/global/mail_params.h
+--- postfix-3.0.2.orig/src/global/mail_params.h        2015-07-19 22:24:25.000000000 +0000
++++ postfix-3.0.2/src/global/mail_params.h     2015-07-25 15:53:06.026514288 +0000
+@@ -85,7 +85,7 @@
+ extern gid_t var_owner_gid;
+ 
+ #define VAR_SGID_GROUP                "setgid_group"
+-#define DEF_SGID_GROUP                "postdrop"
++#define DEF_SGID_GROUP                "maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
+ 
+diff -ur postfix-3.0.2.orig/src/util/sys_defs.h postfix-3.0.2/src/util/sys_defs.h
+--- postfix-3.0.2.orig/src/util/sys_defs.h     2015-07-18 13:28:17.000000000 +0000
++++ postfix-3.0.2/src/util/sys_defs.h  2015-07-25 15:53:06.028514288 +0000
+@@ -55,7 +55,7 @@
  #define ALIAS_DB_MAP   DEF_DB_TYPE ":/etc/mail/aliases"       /* OpenBSD 2.7 */
  #endif
  #ifndef ALIAS_DB_MAP

diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch
index 1947926ecfc2da396a04a562c06758590082867e..9d59e84802ac803395fa8e0db7d9adde06217d4a 100644 (file)
--- a/postfix-master.cf_cyrus.patch
+++ b/postfix-master.cf_cyrus.patch
@@ -1,6 +1,7 @@
---- postfix-2.2.2/conf/master.cf.orig  2005-01-24 20:12:46.000000000 +0100
-+++ postfix-2.2.2/conf/master.cf       2005-04-26 11:46:51.000000000 +0200
-@@ -60,14 +60,14 @@
+diff -ur postfix-3.0.2.orig/conf/master.cf postfix-3.0.2/conf/master.cf
+--- postfix-3.0.2.orig/conf/master.cf  2015-01-31 22:54:26.000000000 +0000
++++ postfix-3.0.2/conf/master.cf       2015-07-25 18:23:32.695826277 +0000
+@@ -95,14 +95,14 @@
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe

diff --git a/postfix-scache_clnt.patch b/postfix-scache_clnt.patch
index e34ee5e9485feec1d26bbaa36af163377088f017..729638146bdc415ad9ee752ca5c5ccafdceccf1c 100644 (file)
--- a/postfix-scache_clnt.patch
+++ b/postfix-scache_clnt.patch
@@ -1,5 +1,6 @@
---- postfix-2.8.3/src/global/scache_clnt.c.orig        2011-05-17 14:24:55.245798704 +0200
-+++ postfix-2.8.3/src/global/scache_clnt.c     2011-05-17 14:24:26.382381790 +0200
+diff -ur postfix-3.0.2.orig/src/global/scache_clnt.c postfix-3.0.2/src/global/scache_clnt.c
+--- postfix-3.0.2.orig/src/global/scache_clnt.c        2014-12-14 18:22:05.000000000 +0000
++++ postfix-3.0.2/src/global/scache_clnt.c     2015-07-25 18:31:06.208826277 +0000
 @@ -414,7 +414,7 @@
      sp->scache->size = scache_clnt_size;
      sp->scache->free = scache_clnt_free;