- updated for 3.0.2

[packages/postfix.git] / postfix-config.patch

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