From 6ec72ab3660a14e8279b95beeac9dfa2b7e9a252 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 4 Apr 2022 19:59:33 +0200 Subject: [PATCH] - rediffed patches --- postfix-conf_msg.patch | 34 +++++++++++++++++----------------- postfix-config.patch | 40 ++++++++++++++++++++-------------------- postfix.spec | 2 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch index 55f0247..7bf98f5 100644 --- 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, diff --git a/postfix-config.patch b/postfix-config.patch index f6c1c62..f77368d 100644 --- a/postfix-config.patch +++ b/postfix-config.patch @@ -1,7 +1,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 @@ +diff -urNp -x '*.orig' postfix-3.7.0.org/conf/main.cf postfix-3.7.0/conf/main.cf +--- postfix-3.7.0.org/conf/main.cf 2021-12-22 23:49:37.000000000 +0100 ++++ postfix-3.7.0/conf/main.cf 2022-04-04 19:57:04.594313194 +0200 +@@ -62,7 +62,7 @@ command_directory = /usr/sbin # daemon programs (i.e. programs listed in the master.cf file). This # directory must be owned by root. # @@ -10,7 +10,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf # The data_directory parameter specifies the location of Postfix-writable # data files (caches, random numbers). This directory must be owned -@@ -82,7 +82,7 @@ +@@ -86,7 +86,7 @@ mail_owner = postfix # These rights are used in the absence of a recipient user context. # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. # @@ -19,7 +19,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf # INTERNET HOST AND DOMAIN NAMES # -@@ -114,7 +114,7 @@ +@@ -118,7 +118,7 @@ mail_owner = postfix # myorigin also specifies the default domain name that is appended # to recipient addresses that have no @domain part. # @@ -28,7 +28,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf #myorigin = $mydomain # RECEIVING MAIL -@@ -398,7 +398,7 @@ +@@ -407,7 +407,7 @@ unknown_local_recipient_reject_code = 55 # "postfix reload" to eliminate the delay. # #alias_maps = dbm:/etc/aliases @@ -37,7 +37,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf #alias_maps = hash:/etc/aliases, nis:mail.aliases #alias_maps = netinfo:/aliases -@@ -409,7 +409,7 @@ +@@ -418,7 +418,7 @@ unknown_local_recipient_reject_code = 55 # #alias_database = dbm:/etc/aliases #alias_database = dbm:/etc/mail/aliases @@ -46,7 +46,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases # ADDRESS EXTENSIONS (e.g., user+foo) -@@ -437,7 +437,7 @@ +@@ -446,7 +446,7 @@ unknown_local_recipient_reject_code = 55 # UNIX-style mailboxes are kept. The default setting depends on the # system type. # @@ -55,7 +55,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf #mail_spool_directory = /var/spool/mail # The mailbox_command parameter specifies the optional external -@@ -459,8 +459,8 @@ +@@ -468,8 +468,8 @@ unknown_local_recipient_reject_code = 55 # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. # @@ -66,7 +66,7 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf # The mailbox_transport specifies the optional transport in master.cf # to use after processing aliases and .forward files. This parameter -@@ -632,45 +632,24 @@ +@@ -641,45 +641,24 @@ debugger_command = # -dmS $process_name gdb $daemon_directory/$process_name # $process_id & sleep 1 @@ -121,10 +121,10 @@ diff -ur postfix-3.0.2.orig/conf/main.cf postfix-3.0.2/conf/main.cf -readme_directory = -inet_protocols = ipv4 +unknown_address_reject_code = 550 -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 @@ +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-01-24 01:03:32.000000000 +0100 ++++ postfix-3.7.0/src/global/mail_params.h 2022-04-04 19:57:04.594313194 +0200 +@@ -107,7 +107,7 @@ extern uid_t var_owner_uid; extern gid_t var_owner_gid; #define VAR_SGID_GROUP "setgid_group" @@ -133,11 +133,11 @@ diff -ur postfix-3.0.2.orig/src/global/mail_params.h postfix-3.0.2/src/global/ma 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/postfix/aliases" /* OpenBSD 2.7 */ +diff -urNp -x '*.orig' postfix-3.7.0.org/src/util/sys_defs.h postfix-3.7.0/src/util/sys_defs.h +--- postfix-3.7.0.org/src/util/sys_defs.h 2021-12-05 19:59:27.000000000 +0100 ++++ postfix-3.7.0/src/util/sys_defs.h 2022-04-04 19:57:04.595313196 +0200 +@@ -61,7 +61,7 @@ + #define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/mail/aliases" /* OpenBSD 2.7 */ #endif #ifndef ALIAS_DB_MAP -#define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/aliases" diff --git a/postfix.spec b/postfix.spec index 393201b..9b81f36 100644 --- a/postfix.spec +++ b/postfix.spec @@ -18,7 +18,7 @@ Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho Summary(sk.UTF-8): Agent prenosu pošty Postfix Name: postfix Version: 3.7.0 -Release: 1 +Release: 2 Epoch: 2 License: distributable Group: Networking/Daemons/SMTP -- 2.44.0