Merging debian version 3.9.1-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 58 deletions

diff --git a/debian/patches/05_debian_defaults.diff b/debian/patches/05_debian_defaults.diff
index 3dd3121..070ef9c 100644
--- a/debian/patches/05_debian_defaults.diff
+++ b/debian/patches/05_debian_defaults.diff
@@ -1,22 +1,17 @@
 From: LaMont Jones <lamont@debian.org>
 Subject: Set Debian specific defaults
 Forwarded: not-needed
-Index: postfix/conf/main.cf
-===================================================================
---- postfix.orig/conf/main.cf
-+++ postfix/conf/main.cf
-@@ -79,7 +79,7 @@ data_directory = /var/lib/postfix
- # particular, don't specify nobody or daemon. PLEASE USE A DEDICATED
- # USER.
+Updated: Wed, 11 Dec 2024 00:08:31 +0300
+
+diff --git a/conf/main.cf b/conf/main.cf
+--- a/conf/main.cf
++++ b/conf/main.cf
+@@ -81,3 +81,3 @@ data_directory = /var/lib/postfix
  #
 -mail_owner = postfix
 +#mail_owner = postfix
  
- # The default_privs parameter specifies the default rights used by
- # the local delivery agent for delivery to external file or command.
-@@ -118,6 +118,11 @@ mail_owner = postfix
- # myorigin also specifies the default domain name that is appended
- # to recipient addresses that have no @domain part.
+@@ -120,2 +120,7 @@ mail_owner = postfix
  #
 +# Debian GNU/Linux specific:  Specifying a file name will cause the
 +# first line of that file to be used as the name.  The Debian default
@@ -24,57 +19,23 @@ Index: postfix/conf/main.cf
 +#
 +#myorigin = /etc/mailname
  #myorigin = $myhostname
- #myorigin = $mydomain
- 
-@@ -286,6 +291,7 @@ unknown_local_recipient_reject_code = 55
- #mynetworks = 168.100.3.0/28, 127.0.0.0/8
- #mynetworks = $config_directory/mynetworks
+@@ -288,2 +293,3 @@ unknown_local_recipient_reject_code = 550
  #mynetworks = hash:/etc/postfix/network_table
 +mynetworks = 127.0.0.0/8
  
- # The relay_domains parameter restricts what destinations this system will
- # relay mail to.  See the smtpd_relay_restrictions and
-@@ -576,6 +582,8 @@ unknown_local_recipient_reject_code = 55
- #
- #smtpd_banner = $myhostname ESMTP $mail_name
+@@ -578,2 +584,3 @@ unknown_local_recipient_reject_code = 550
  #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
 +smtpd_banner = $myhostname ESMTP $mail_name (@@DISTRO@@)
-+
  
- # PARALLEL DELIVERY TO THE SAME DESTINATION
- #
-@@ -600,7 +608,7 @@ unknown_local_recipient_reject_code = 55
- # logging level when an SMTP client or server host name or address
- # matches a pattern in the debug_peer_list parameter.
+@@ -602,3 +609,3 @@ unknown_local_recipient_reject_code = 550
  #
 -debug_peer_level = 2
 +#debug_peer_level = 2
  
- # The debug_peer_list parameter specifies an optional list of domain
- # or network patterns, /file/name patterns or type:name tables. When
-Index: postfix/conf/main.cf.tls
-===================================================================
---- /dev/null
-+++ postfix/conf/main.cf.tls
-@@ -0,0 +1,11 @@
-+
-+# TLS parameters
-+smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-+smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-+smtpd_tls_security_level=may
-+
-+smtp_tls_CApath=/etc/ssl/certs
-+smtp_tls_security_level=may
-+smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
-+
-+
-Index: postfix/conf/postfix-files
-===================================================================
---- postfix.orig/conf/postfix-files
-+++ postfix/conf/postfix-files
-@@ -144,27 +144,28 @@ $newaliases_path:l:$sendmail_path
- $mailq_path:l:$sendmail_path
- $config_directory/LICENSE:f:root:-:644:1
+diff --git a/conf/postfix-files b/conf/postfix-files
+--- a/conf/postfix-files
++++ b/conf/postfix-files
+@@ -146,24 +146,25 @@ $config_directory/LICENSE:f:root:-:644:1
  $config_directory/TLS_LICENSE:f:root:-:644:1
 -$config_directory/access:f:root:-:644:p1
 -$config_directory/aliases:f:root:-:644:p1
@@ -105,17 +66,18 @@ Index: postfix/conf/postfix-files
 -$config_directory/tcp_table:f:root:-:644:o
 -$config_directory/transport:f:root:-:644:p1
 -$config_directory/virtual:f:root:-:644:p1
+-$config_directory/postfix-script:f:root:-:755:o
+-$config_directory/postfix-script-sgid:f:root:-:755:o
+-$config_directory/postfix-script-nosgid:f:root:-:755:o
+-$config_directory/post-install:f:root:-:755:o
 +#$config_directory/pcre_table:f:root:-:644:o
 +#$config_directory/regexp_table:f:root:-:644:o
 +#$config_directory/relocated:f:root:-:644:p1
 +#$config_directory/tcp_table:f:root:-:644:o
 +#$config_directory/transport:f:root:-:644:p1
 +#$config_directory/virtual:f:root:-:644:p1
- $config_directory/postfix-script:f:root:-:755:o
--$config_directory/postfix-script-sgid:f:root:-:755:o
--$config_directory/postfix-script-nosgid:f:root:-:755:o
++#$config_directory/postfix-script:f:root:-:755:o
 +#$config_directory/postfix-script-sgid:f:root:-:755:o
 +#$config_directory/postfix-script-nosgid:f:root:-:755:o
- $config_directory/post-install:f:root:-:755:o
++#$config_directory/post-install:f:root:-:755:o
  $manpage_directory/man1/mailq.1:f:root:-:644
- $manpage_directory/man1/newaliases.1:f:root:-:644