X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostfix.git;a=blobdiff_plain;f=postfix-config.patch;h=f6c1c626cadf195d8574ba3097a0e479bc06c86e;hp=1cdc87f17e9cf8b6cb02c2ccf334d76f219f39b2;hb=HEAD;hpb=fda255c0d1cee6b10e37844d3b6a7ee388f7f1a6

diff --git a/postfix-config.patch b/postfix-config.patch
index 1cdc87f..f77368d 100644
--- 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 -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.
  #
@@ -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 @@
+@@ -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.
  #
@@ -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 @@
+@@ -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.
  #
@@ -48,25 +28,25 @@ 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 @@
+@@ -407,7 +407,7 @@ unknown_local_recipient_reject_code = 55
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
 -#alias_maps = hash:/etc/aliases
-+alias_maps = hash:/etc/mail/aliases
++alias_maps = hash:/etc/postfix/aliases
  #alias_maps = hash:/etc/aliases, nis:mail.aliases
  #alias_maps = netinfo:/aliases
  
-@@ -390,7 +390,7 @@
+@@ -418,7 +418,7 @@ unknown_local_recipient_reject_code = 55
  #
  #alias_database = dbm:/etc/aliases
  #alias_database = dbm:/etc/mail/aliases
 -#alias_database = hash:/etc/aliases
-+alias_database = hash:/etc/mail/aliases
++alias_database = hash:/etc/postfix/aliases
  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
  
  # ADDRESS EXTENSIONS (e.g., user+foo)
-@@ -418,7 +418,7 @@
+@@ -446,7 +446,7 @@ unknown_local_recipient_reject_code = 55
  # 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 @@
+@@ -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.
  #
@@ -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 @@
+@@ -641,45 +641,24 @@ debugger_command =
  #	-dmS $process_name gdb $daemon_directory/$process_name
  #	$process_id & sleep 1
  
@@ -141,14 +121,27 @@ 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 -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"
+-#define DEF_SGID_GROUP		"postdrop"
++#define DEF_SGID_GROUP		"maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
+ 
+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"
-+#define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/mail/aliases"
++#define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/postfix/aliases"
  #endif
  #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"