- rediffed patches

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

diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch
index 55f0247e9bd8d0cc25cb6313551dc32bfcda40e9..7bf98f509d29047f8385233b26065f789e5fbd2c 100644 (file)
--- a/postfix-conf_msg.patch
+++ b/postfix-conf_msg.patch
@@ -1,6 +1,6 @@
-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
+diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.c postfix-3.7.0/src/global/mail_params.c
+--- postfix-3.7.0.org/src/global/mail_params.c 2021-10-22 20:47:31.000000000 +0200
++++ postfix-3.7.0/src/global/mail_params.c     2022-04-04 19:57:20.999351108 +0200
 @@ -83,6 +83,7 @@
  /*    char    *var_debug_peer_list;
  /*    int     var_debug_peer_level;
@@ -9,7 +9,7 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/ma
  /*    int     var_fault_inj_code;
  /*    char   *var_bounce_service;
  /*    char   *var_cleanup_service;
-@@ -304,6 +305,7 @@
+@@ -319,6 +320,7 @@ char   *var_import_environ;
  char   *var_export_environ;
  char   *var_debug_peer_list;
  int     var_debug_peer_level;
@@ -17,7 +17,7 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/ma
  int     var_fault_inj_code;
  char   *var_bounce_service;
  char   *var_cleanup_service;
-@@ -762,6 +764,7 @@
+@@ -806,6 +808,7 @@ void    mail_params_init()
        VAR_SMTPUTF8_AUTOCLASS, DEF_SMTPUTF8_AUTOCLASS, &var_smtputf8_autoclass, 1, 0,
        VAR_DROP_HDRS, DEF_DROP_HDRS, &var_drop_hdrs, 0, 0,
        VAR_INFO_LOG_ADDR_FORM, DEF_INFO_LOG_ADDR_FORM, &var_info_log_addr_form, 1, 0,
@@ -25,12 +25,12 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.c postfix-3.0.2/src/global/ma
        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;
+diff -urNp -x '*.orig' postfix-3.7.0.org/src/global/mail_params.h postfix-3.7.0/src/global/mail_params.h
+--- postfix-3.7.0.org/src/global/mail_params.h 2022-04-04 19:57:20.803350655 +0200
++++ postfix-3.7.0/src/global/mail_params.h     2022-04-04 19:57:21.000351111 +0200
+@@ -4322,6 +4322,13 @@ extern char *var_dnssec_probe;
+               "lmtp=24, smtp=25, smtps=submissions=465, submission=587"
+ extern char *var_known_tcp_ports;
  
 + /*
 +  * SMTPD messages
@@ -42,12 +42,12 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.h postfix-3.0.2/src/global/ma
  /* 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,
+diff -urNp -x '*.orig' postfix-3.7.0.org/src/smtpd/smtpd.c postfix-3.7.0/src/smtpd/smtpd.c
+--- postfix-3.7.0.org/src/smtpd/smtpd.c        2021-10-02 16:46:46.000000000 +0200
++++ postfix-3.7.0/src/smtpd/smtpd.c    2022-04-04 19:57:21.001351113 +0200
+@@ -6577,6 +6577,7 @@ int     main(int argc, char **argv)
+       VAR_MILT_MACRO_DEFLTS, DEF_MILT_MACRO_DEFLTS, &var_milt_macro_deflts, 0, 0,
+       VAR_SMTPD_MILTER_MAPS, DEF_SMTPD_MILTER_MAPS, &var_smtpd_milter_maps, 0, 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,