diff --git a/fix-postfix-script.patch b/fix-postfix-script.patch
index 6c57220..cb767bc 100644
--- a/fix-postfix-script.patch
+++ b/fix-postfix-script.patch
@@ -2,7 +2,7 @@ Index: conf/postfix-script
 ===================================================================
 --- conf/postfix-script.orig
 +++ conf/postfix-script
-@@ -299,10 +299,17 @@ check-warn)
+@@ -311,10 +311,17 @@ check-warn)
  	}
  	todo=`echo "$todo" | tr ' ' '\12' | sort -u`
  
diff --git a/ipv6_disabled.patch b/ipv6_disabled.patch
index c0f9f3a..cc3ac86 100644
--- a/ipv6_disabled.patch
+++ b/ipv6_disabled.patch
@@ -2,7 +2,7 @@ Index: src/util/inet_proto.c
 ===================================================================
 --- src/util/inet_proto.c.orig
 +++ src/util/inet_proto.c
-@@ -195,7 +195,6 @@ INET_PROTO_INFO *inet_proto_init(const c
+@@ -200,7 +200,6 @@ const INET_PROTO_INFO *inet_proto_init(c
  	if ((sock = socket(PF_INET6, SOCK_STREAM, 0)) >= 0) {
  	    close(sock);
  	} else if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) {
diff --git a/pointer_to_literals.patch b/pointer_to_literals.patch
index f6edc01..a356ccf 100644
--- a/pointer_to_literals.patch
+++ b/pointer_to_literals.patch
@@ -2,7 +2,7 @@ Index: src/cleanup/cleanup_message.c
 ===================================================================
 --- src/cleanup/cleanup_message.c.orig
 +++ src/cleanup/cleanup_message.c
-@@ -296,7 +296,7 @@ static const char *cleanup_act(CLEANUP_S
+@@ -299,7 +299,7 @@ static const char *cleanup_act(CLEANUP_S
      while (*optional_text && ISSPACE(*optional_text))
  	optional_text++;
  
@@ -28,7 +28,7 @@ Index: src/smtpd/smtpd_check.c
 ===================================================================
 --- src/smtpd/smtpd_check.c.orig
 +++ src/smtpd/smtpd_check.c
-@@ -380,6 +380,10 @@ static STRING_LIST *smtpd_acl_perm_log;
+@@ -383,6 +383,10 @@ static STRING_LIST *smtpd_acl_perm_log;
  #define CONST_STR(x)	((const char *) vstring_str(x))
  #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); }
  
@@ -39,7 +39,7 @@ Index: src/smtpd/smtpd_check.c
   /*
    * If some decision can't be made due to a temporary error, then change
    * other decisions into deferrals.
-@@ -2339,8 +2343,6 @@ static int check_table_result(SMTPD_STAT
+@@ -2394,8 +2398,6 @@ static int check_table_result(SMTPD_STAT
      if (msg_verbose)
  	msg_info("%s: %s %s %s", myname, table, value, datum);
  
@@ -48,7 +48,7 @@ Index: src/smtpd/smtpd_check.c
      /*
       * DUNNO means skip this table. Silently ignore optional text.
       */
-@@ -3375,8 +3377,6 @@ static const char *rbl_expand_lookup(con
+@@ -3482,8 +3484,6 @@ static const char *rbl_expand_lookup(con
      SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context;
      SMTPD_STATE *state = rbl_exp->state;
  
diff --git a/postfix-3.5.10.tar.gz b/postfix-3.5.10.tar.gz
deleted file mode 100644
index e747303..0000000
--- a/postfix-3.5.10.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bb4d7d72d7512b58f3a31426dcbd394fd354e0a43de21da89466b057a0228f8
-size 4621130
diff --git a/postfix-3.5.10.tar.gz.asc b/postfix-3.5.10.tar.gz.asc
deleted file mode 100644
index c71482a..0000000
--- a/postfix-3.5.10.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (FreeBSD)
-
-iFcDBQBgcxhnDAtZDoDKFacRCtagAP4umj05h3oJQmQPtJuCrJ383eRGoljQLvkc
-kifkMp+vzwD+LjAFR73rQ7rI+Za6BQq8ALKnrcYwBSJEXpRGvm6iSlw=
-=1LQK
------END PGP SIGNATURE-----
diff --git a/postfix-3.6.0.tar.gz b/postfix-3.6.0.tar.gz
new file mode 100644
index 0000000..403fba9
--- /dev/null
+++ b/postfix-3.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77462894d7671d63cbe5fc2733f941088515a6d67108b9f1808b7dae37e83c2e
+size 4748506
diff --git a/postfix-3.6.0.tar.gz.asc b/postfix-3.6.0.tar.gz.asc
new file mode 100644
index 0000000..3340d30
--- /dev/null
+++ b/postfix-3.6.0.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (FreeBSD)
+
+iFcDBQBgixN5DAtZDoDKFacRCvGZAP4h7z5Qaj9C6JpNu2NBU7nlVBfuRWWnp3Lv
+Z7oSfHfp3gD+McRFFjL7leRDWWN2W1SpeS3Fsey6tCH/resSt5U68ac=
+=AC1l
+-----END PGP SIGNATURE-----
diff --git a/postfix-bdb.changes b/postfix-bdb.changes
index 45d5042..7ac7aec 100644
--- a/postfix-bdb.changes
+++ b/postfix-bdb.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Jun  2 00:26:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.6.0
+  - Major changes - internal protocol identification
+    Internal protocols have changed. You need to "postfix stop"
+    before updating, or before backing out to an earlier release,
+    otherwise long-running daemons (pickup, qmgr, verify, tlsproxy,
+    postscreen) may fail to communicate with the rest of Postfix,
+    causing mail delivery delays until Postfix is restarted.
+  For more see /usr/share/doc/packages/postfix/RELEASE_NOTES 
+- refreshed patches to apply cleanly again:
+  fix-postfix-script.patch
+  ipv6_disabled.patch
+  pointer_to_literals.patch
+  postfix-linux45.patch
+  postfix-main.cf.patch
+  postfix-master.cf.patch
+  postfix-no-md5.patch
+  postfix-ssl-release-buffers.patch
+  postfix-vda-v14-3.0.3.patch
+  set-default-db-type.patch
+
 -------------------------------------------------------------------
 Tue Jun  1 10:47:29 UTC 2021 - Peter Varkoly <varkoly@suse.com>
 
diff --git a/postfix-bdb.spec b/postfix-bdb.spec
index 825cd45..55682c4 100644
--- a/postfix-bdb.spec
+++ b/postfix-bdb.spec
@@ -56,7 +56,7 @@
 %endif
 %bcond_without ldap
 Name:           postfix-bdb
-Version: 3.5.10
+Version:        3.6.0
 Release:        0
 Summary:        A fast, secure, and flexible mailer
 License:        IPL-1.0 OR EPL-2.0
@@ -88,7 +88,7 @@ BuildRequires:  db-devel
 BuildRequires:  diffutils
 BuildRequires:  fdupes
 BuildRequires:  libicu-devel
-BuildRequires:  libopenssl-devel
+BuildRequires:  libopenssl-devel >= 1.1.1
 BuildRequires:  m4
 BuildRequires:  mysql-devel
 %if %{with ldap}
@@ -437,7 +437,8 @@ fi
 # ---------------------------------------------------------------------------
 
 %files
-%license LICENSE
+%license LICENSE TLS_LICENSE
+%doc RELEASE_NOTES
 %config %{_sysconfdir}/pam.d/*
 %{_fillupdir}/sysconfig.postfix
 %{_fillupdir}/sysconfig.mail-postfix
diff --git a/postfix-linux45.patch b/postfix-linux45.patch
index b8e236f..3b8b33d 100644
--- a/postfix-linux45.patch
+++ b/postfix-linux45.patch
@@ -1,6 +1,8 @@
---- makedefs.orig	2019-03-11 13:54:48.176455533 +0100
-+++ makedefs	2019-03-11 13:55:44.512455319 +0100
-@@ -557,8 +557,8 @@
+Index: makedefs
+===================================================================
+--- makedefs.orig
++++ makedefs
+@@ -568,8 +568,8 @@ EOF
  		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
  		: ${PLUGIN_LD="${CC-gcc} -shared"}
  		;;
diff --git a/postfix-main.cf.patch b/postfix-main.cf.patch
index f1c6c0f..c2beb5e 100644
--- a/postfix-main.cf.patch
+++ b/postfix-main.cf.patch
@@ -1,15 +1,17 @@
---- conf/main.cf-orig	2020-11-26 19:22:10.273349060 +0100
-+++ conf/main.cf	2020-11-26 19:22:57.917974110 +0100
-@@ -278,7 +278,7 @@
+Index: conf/main.cf
+===================================================================
+--- conf/main.cf.orig
++++ conf/main.cf
+@@ -278,7 +278,7 @@ unknown_local_recipient_reject_code = 55
  #
- #mynetworks = 168.100.189.0/28, 127.0.0.0/8
+ #mynetworks = 168.100.3.0/28, 127.0.0.0/8
  #mynetworks = $config_directory/mynetworks
 -#mynetworks = hash:/etc/postfix/network_table
 +#mynetworks = lmdb:/etc/postfix/network_table
  
  # The relay_domains parameter restricts what destinations this system will
  # relay mail to.  See the smtpd_recipient_restrictions description in
-@@ -343,7 +343,7 @@
+@@ -343,7 +343,7 @@ unknown_local_recipient_reject_code = 55
  # In the left-hand side, specify an @domain.tld wild-card, or specify
  # a user@domain.tld address.
  # 
@@ -18,7 +20,7 @@
  
  # INPUT RATE CONTROL
  #
-@@ -398,8 +398,8 @@
+@@ -398,8 +398,8 @@ unknown_local_recipient_reject_code = 55
  # "postfix reload" to eliminate the delay.
  #
  #alias_maps = dbm:/etc/aliases
@@ -29,7 +31,7 @@
  #alias_maps = netinfo:/aliases
  
  # The alias_database parameter specifies the alias database(s) that
-@@ -409,8 +409,8 @@
+@@ -409,8 +409,8 @@ unknown_local_recipient_reject_code = 55
  #
  #alias_database = dbm:/etc/aliases
  #alias_database = dbm:/etc/mail/aliases
@@ -40,7 +42,7 @@
  
  # ADDRESS EXTENSIONS (e.g., user+foo)
  #
-@@ -567,6 +567,7 @@
+@@ -567,6 +567,7 @@ unknown_local_recipient_reject_code = 55
  #
  #smtpd_banner = $myhostname ESMTP $mail_name
  #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
@@ -48,7 +50,7 @@
  
  # PARALLEL DELIVERY TO THE SAME DESTINATION
  #
-@@ -673,4 +674,140 @@
+@@ -673,4 +674,140 @@ sample_directory =
  # readme_directory: The location of the Postfix README files.
  #
  readme_directory =
diff --git a/postfix-master.cf.patch b/postfix-master.cf.patch
index 53996bf..bda2107 100644
--- a/postfix-master.cf.patch
+++ b/postfix-master.cf.patch
@@ -1,5 +1,7 @@
---- conf/master.cf.orig	2020-04-19 12:30:46.108385239 +0200
-+++ conf/master.cf	2020-04-19 12:33:14.899620955 +0200
+Index: conf/master.cf
+===================================================================
+--- conf/master.cf.orig
++++ conf/master.cf
 @@ -10,6 +10,11 @@
  #               (yes)   (yes)   (no)    (never) (100)
  # ==========================================================================
@@ -12,7 +14,7 @@
  #smtp      inet  n       -       n       -       1       postscreen
  #smtpd     pass  -       -       n       -       -       smtpd
  #dnsblog   unix  -       -       n       -       0       dnsblog
-@@ -17,6 +22,7 @@
+@@ -19,6 +24,7 @@ smtp      inet  n       -       n
  #submission inet n       -       n       -       -       smtpd
  #  -o syslog_name=postfix/submission
  #  -o smtpd_tls_security_level=encrypt
@@ -20,7 +22,7 @@
  #  -o smtpd_sasl_auth_enable=yes
  #  -o smtpd_tls_auth_only=yes
  #  -o smtpd_reject_unlisted_recipient=no
-@@ -65,6 +71,26 @@
+@@ -69,6 +75,26 @@ lmtp      unix  -       -       n
  anvil     unix  -       -       n       -       1       anvil
  scache    unix  -       -       n       -       1       scache
  postlog   unix-dgram n  -       n       -       1       postlogd
@@ -47,7 +49,7 @@
  #
  # ====================================================================
  # Interfaces to non-Postfix software. Be sure to examine the manual
-@@ -98,7 +124,7 @@
+@@ -102,7 +128,7 @@ postlog   unix-dgram n  -       n
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
  #
  #cyrus     unix  -       n       n       -       -       pipe
@@ -56,7 +58,7 @@
  #
  # ====================================================================
  #
-@@ -131,3 +157,10 @@
+@@ -135,3 +161,10 @@ postlog   unix-dgram n  -       n
  #mailman   unix  -       n       n       -       -       pipe
  #  flags=FRX user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
  #  ${nexthop} ${user}
diff --git a/postfix-no-md5.patch b/postfix-no-md5.patch
index f13d827..083a9df 100644
--- a/postfix-no-md5.patch
+++ b/postfix-no-md5.patch
@@ -2,24 +2,25 @@ Index: src/global/mail_params.h
 ===================================================================
 --- src/global/mail_params.h.orig
 +++ src/global/mail_params.h
-@@ -1349,7 +1349,7 @@ extern char *var_smtpd_tls_excl_ciph;
- extern char *var_smtpd_tls_mand_excl;
+@@ -1381,7 +1381,7 @@ extern char *var_smtpd_tls_mand_excl;
  
  #define VAR_SMTPD_TLS_FPT_DGST	"smtpd_tls_fingerprint_digest"
--#define DEF_SMTPD_TLS_FPT_DGST	"md5"
-+#define DEF_SMTPD_TLS_FPT_DGST	"sha1"
+ #define DEF_SMTPD_TLS_FPT_DGST	"${{$compatibility_level} <level {3.6} ? " \
+-                                "{md5} : {sha256}}"
++                                "{sha1} : {sha256}}"
  extern char *var_smtpd_tls_fpt_dgst;
  
  #define VAR_SMTPD_TLS_512_FILE	"smtpd_tls_dh512_param_file"
-@@ -1508,9 +1508,9 @@ extern char *var_smtp_tls_excl_ciph;
- extern char *var_smtp_tls_mand_excl;
+@@ -1543,10 +1543,10 @@ extern char *var_smtp_tls_mand_excl;
  
  #define VAR_SMTP_TLS_FPT_DGST	"smtp_tls_fingerprint_digest"
--#define DEF_SMTP_TLS_FPT_DGST	"md5"
-+#define DEF_SMTP_TLS_FPT_DGST	"sha1"
+ #define DEF_SMTP_TLS_FPT_DGST	"${{$compatibility_level} <level {3.6} ? " \
+-                                "{md5} : {sha256}}"
++                                "{sha1} : {sha256}}"
  #define VAR_LMTP_TLS_FPT_DGST	"lmtp_tls_fingerprint_digest"
--#define DEF_LMTP_TLS_FPT_DGST	"md5"
-+#define DEF_LMTP_TLS_FPT_DGST	"sha1"
+ #define DEF_LMTP_TLS_FPT_DGST	"${{$compatibility_level} <level {3.6} ? " \
+-                                "{md5} : {sha256}}"
++                                "{sha1} : {sha256}}"
  extern char *var_smtp_tls_fpt_dgst;
  
  #define VAR_SMTP_TLS_TAFILE	"smtp_tls_trust_anchor_file"
diff --git a/postfix-ssl-release-buffers.patch b/postfix-ssl-release-buffers.patch
index 38c4763..ed8ebff 100644
--- a/postfix-ssl-release-buffers.patch
+++ b/postfix-ssl-release-buffers.patch
@@ -1,6 +1,8 @@
---- src/tls/tls_client.c.orig	2019-03-11 14:24:34.492448719 +0100
-+++ src/tls/tls_client.c	2019-03-11 14:27:42.824448001 +0100
-@@ -397,6 +397,11 @@
+Index: src/tls/tls_client.c
+===================================================================
+--- src/tls/tls_client.c.orig
++++ src/tls/tls_client.c
+@@ -693,6 +693,11 @@ TLS_APPL_STATE *tls_client_init(const TL
      SSL_CTX_set_security_level(client_ctx, 0);
  #endif
  
@@ -12,9 +14,11 @@
      /*
       * See the verify callback in tls_verify.c
       */
---- src/tls/tls_server.c.orig	2019-03-11 14:26:04.700448375 +0100
-+++ src/tls/tls_server.c	2019-03-11 14:27:49.184447977 +0100
-@@ -455,6 +455,10 @@
+Index: src/tls/tls_server.c
+===================================================================
+--- src/tls/tls_server.c.orig
++++ src/tls/tls_server.c
+@@ -439,6 +439,10 @@ TLS_APPL_STATE *tls_server_init(const TL
      SSL_CTX_set_security_level(sni_ctx, 0);
  #endif
  
diff --git a/postfix-vda-v14-3.0.3.patch b/postfix-vda-v14-3.0.3.patch
index a105011..58fabeb 100644
--- a/postfix-vda-v14-3.0.3.patch
+++ b/postfix-vda-v14-3.0.3.patch
@@ -19,7 +19,7 @@ Index: src/global/mail_params.h
 ===================================================================
 --- src/global/mail_params.h.orig
 +++ src/global/mail_params.h
-@@ -2538,6 +2538,54 @@ extern char *var_virt_uid_maps;
+@@ -2620,6 +2620,54 @@ extern char *var_virt_uid_maps;
  #define DEF_VIRT_GID_MAPS		""
  extern char *var_virt_gid_maps;
  
@@ -1274,7 +1274,7 @@ Index: src/virtual/virtual.c
 ===================================================================
 --- src/virtual/virtual.c.orig
 +++ src/virtual/virtual.c
-@@ -357,12 +357,28 @@ char   *var_mail_spool_dir;		/* XXX depe
+@@ -364,12 +364,28 @@ char   *var_mail_spool_dir;		/* XXX depe
  bool    var_strict_mbox_owner;
  char   *var_virt_dsn_filter;
  
@@ -1303,7 +1303,7 @@ Index: src/virtual/virtual.c
  
   /*
    * Bit masks.
-@@ -472,18 +488,27 @@ static void post_init(char *unused_name,
+@@ -479,18 +495,27 @@ static void post_init(char *unused_name,
       */
      virtual_mailbox_maps =
  	maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps,
@@ -1337,7 +1337,7 @@ Index: src/virtual/virtual.c
  
      virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock);
  }
-@@ -535,11 +560,23 @@ int     main(int argc, char **argv)
+@@ -545,11 +570,23 @@ int     main(int argc, char **argv)
  	VAR_VIRT_GID_MAPS, DEF_VIRT_GID_MAPS, &var_virt_gid_maps, 0, 0,
  	VAR_VIRT_MAILBOX_BASE, DEF_VIRT_MAILBOX_BASE, &var_virt_mailbox_base, 1, 0,
  	VAR_VIRT_MAILBOX_LOCK, DEF_VIRT_MAILBOX_LOCK, &var_virt_mailbox_lock, 1, 0,
@@ -1361,7 +1361,7 @@ Index: src/virtual/virtual.c
  	0,
      };
  
-@@ -556,6 +593,7 @@ int     main(int argc, char **argv)
+@@ -566,6 +603,7 @@ int     main(int argc, char **argv)
  		       CA_MAIL_SERVER_PRE_INIT(pre_init),
  		       CA_MAIL_SERVER_POST_INIT(post_init),
  		       CA_MAIL_SERVER_PRE_ACCEPT(pre_accept),
diff --git a/postfix.changes b/postfix.changes
index 45d5042..7ac7aec 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Jun  2 00:26:36 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.6.0
+  - Major changes - internal protocol identification
+    Internal protocols have changed. You need to "postfix stop"
+    before updating, or before backing out to an earlier release,
+    otherwise long-running daemons (pickup, qmgr, verify, tlsproxy,
+    postscreen) may fail to communicate with the rest of Postfix,
+    causing mail delivery delays until Postfix is restarted.
+  For more see /usr/share/doc/packages/postfix/RELEASE_NOTES 
+- refreshed patches to apply cleanly again:
+  fix-postfix-script.patch
+  ipv6_disabled.patch
+  pointer_to_literals.patch
+  postfix-linux45.patch
+  postfix-main.cf.patch
+  postfix-master.cf.patch
+  postfix-no-md5.patch
+  postfix-ssl-release-buffers.patch
+  postfix-vda-v14-3.0.3.patch
+  set-default-db-type.patch
+
 -------------------------------------------------------------------
 Tue Jun  1 10:47:29 UTC 2021 - Peter Varkoly <varkoly@suse.com>
 
diff --git a/postfix.spec b/postfix.spec
index cfa0097..1a020fd 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -42,7 +42,7 @@
 %bcond_without libnsl
 %bcond_without ldap
 Name:           postfix
-Version:        3.5.10
+Version:        3.6.0
 Release:        0
 Summary:        A fast, secure, and flexible mailer
 License:        IPL-1.0 OR EPL-2.0
@@ -75,7 +75,7 @@ BuildRequires:  cyrus-sasl-devel
 BuildRequires:  diffutils
 BuildRequires:  fdupes
 BuildRequires:  libicu-devel
-BuildRequires:  libopenssl-devel
+BuildRequires:  libopenssl-devel >= 1.1.1
 BuildRequires:  m4
 BuildRequires:  mysql-devel
 %if %{with ldap}
@@ -473,6 +473,7 @@ fi
 
 %files
 %license LICENSE TLS_LICENSE
+%doc RELEASE_NOTES
 %config %{_sysconfdir}/pam.d/*
 %{_fillupdir}/sysconfig.%{name}
 %{_fillupdir}/sysconfig.mail-%{name}
diff --git a/set-default-db-type.patch b/set-default-db-type.patch
index e87ff18..227d202 100644
--- a/set-default-db-type.patch
+++ b/set-default-db-type.patch
@@ -1,5 +1,7 @@
---- src/util/sys_defs.h.orig	2021-01-04 13:12:06.272285413 +0100
-+++ src/util/sys_defs.h	2021-01-04 13:12:38.412720371 +0100
+Index: src/util/sys_defs.h
+===================================================================
+--- src/util/sys_defs.h.orig
++++ src/util/sys_defs.h
 @@ -51,7 +51,7 @@
  #define HAS_FSYNC
  #define HAS_DB
@@ -27,7 +29,7 @@
  #define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
  #else
  #define HAS_DBM
-@@ -761,7 +761,7 @@
+@@ -761,7 +761,7 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"	/* RedHat >= 4.x */
  #define HAS_FSYNC
  #define HAS_DB
@@ -36,7 +38,7 @@
  #define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
  #ifndef NO_NIS
  #define HAS_NIS
-@@ -841,7 +841,7 @@
+@@ -841,7 +841,7 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "dotlock"	/* verified RedHat 3.03 */
  #define HAS_FSYNC
  #define HAS_DB
@@ -45,7 +47,7 @@
  #define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
  #ifndef NO_NIS
  #define HAS_NIS
-@@ -874,7 +874,7 @@
+@@ -874,7 +874,7 @@ extern int initgroups(const char *, int)
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"	/* RedHat >= 4.x */
  #define HAS_FSYNC
  #define HAS_DB
@@ -54,7 +56,7 @@
  #define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
  #ifndef NO_NIS
  #define HAS_NIS
-@@ -1199,7 +1199,7 @@
+@@ -1199,7 +1199,7 @@ extern int opterr;			/* XXX use <getopt.
  #define INTERNAL_LOCK	MYFLOCK_STYLE_FCNTL
  #define DEF_MAILBOX_LOCK "fcntl, dotlock"
  #define HAS_FSYNC
@@ -63,9 +65,11 @@
  #define ALIAS_DB_MAP	DEF_DB_TYPE ":/etc/aliases"
  /* Uncomment the following line if you have NIS package installed */
  /* #define HAS_NIS */
---- src/global/mail_params.h.orig	2020-05-09 17:51:27.000000000 +0200
-+++ src/global/mail_params.h	2020-12-25 21:04:11.428544623 +0100
-@@ -2826,7 +2826,7 @@ extern int var_vrfy_pend_limit;
+Index: src/global/mail_params.h
+===================================================================
+--- src/global/mail_params.h.orig
++++ src/global/mail_params.h
+@@ -2923,7 +2923,7 @@ extern int var_vrfy_pend_limit;
  extern char *var_verify_service;
  
  #define VAR_VERIFY_MAP			"address_verify_map"
@@ -74,7 +78,7 @@
  extern char *var_verify_map;
  
  #define VAR_VERIFY_POS_EXP		"address_verify_positive_expire_time"
-@@ -3594,7 +3594,7 @@ extern char *var_multi_cntrl_cmds;
+@@ -3691,7 +3691,7 @@ extern char *var_multi_cntrl_cmds;
    * postscreen(8)
    */
  #define VAR_PSC_CACHE_MAP	"postscreen_cache_map"
@@ -83,9 +87,11 @@
  extern char *var_psc_cache_map;
  
  #define VAR_SMTPD_SERVICE	"smtpd_service_name"
---- man/man1/postmap.1.orig	2021-01-05 10:57:44.915488687 +0100
-+++ man/man1/postmap.1	2021-01-05 11:10:12.377571721 +0100
-@@ -63,7 +63,7 @@
+Index: man/man1/postmap.1
+===================================================================
+--- man/man1/postmap.1.orig
++++ man/man1/postmap.1
+@@ -63,7 +63,7 @@ by RFC 5322. For example, an address loc
  By default the lookup key is mapped to lowercase to make
  the lookups case insensitive; as of Postfix 2.3 this case
  folding happens only with tables whose lookup keys are
@@ -94,7 +100,7 @@
  earlier versions, the lookup key is folded even with tables
  where a lookup field can match both upper and lower case
  text, such as regexp: and pcre:. This resulted in loss of
-@@ -210,9 +210,9 @@
+@@ -210,9 +210,9 @@ the "\fBpostconf \-m\fR" command.
  The \fBpostmap\fR(1) command can query any supported file type,
  but it can create only the following file types:
  .RS
@@ -107,17 +113,17 @@
  .IP \fBcdb\fR
  The output consists of one file, named \fIfile_name\fB.cdb\fR.
  This is available on systems with support for \fBcdb\fR databases.
-@@ -220,9 +220,6 @@
- The output consists of two files, named \fIfile_name\fB.pag\fR and
- \fIfile_name\fB.dir\fR.
- This is available on systems with support for \fBdbm\fR databases.
+@@ -224,9 +224,6 @@ This is available on systems with suppor
+ A table that reliably fails all requests. The lookup table
+ name is used for logging only. This table exists to simplify
+ Postfix error tests.
 -.IP \fBhash\fR
 -The output file is a hashed file, named \fIfile_name\fB.db\fR.
 -This is available on systems with support for \fBdb\fR databases.
- .IP \fBfail\fR
- A table that reliably fails all requests. The lookup table
- name is used for logging only. This table exists to simplify
-@@ -267,12 +264,6 @@
+ .IP \fBlmdb\fR
+ The output is a btree\-based file, named \fIfile_name\fB.lmdb\fR.
+ \fBlmdb\fR supports concurrent writes and reads from different
+@@ -272,12 +269,6 @@ The following \fBmain.cf\fR parameters a
  this program.
  The text below provides only a parameter summary. See
  \fBpostconf\fR(5) for more details including examples.
@@ -130,9 +136,11 @@
  .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  The default location of the Postfix main.cf and master.cf
  configuration files.
---- man/man1/postalias.1.orig	2021-01-05 10:58:04.579753235 +0100
-+++ man/man1/postalias.1	2021-01-05 11:08:10.135919006 +0100
-@@ -34,7 +34,7 @@
+Index: man/man1/postalias.1
+===================================================================
+--- man/man1/postalias.1.orig
++++ man/man1/postalias.1
+@@ -34,7 +34,7 @@ The format of Postfix alias input files
  By default the lookup key is mapped to lowercase to make
  the lookups case insensitive; as of Postfix 2.3 this case
  folding happens only with tables whose lookup keys are
@@ -141,7 +149,7 @@
  earlier versions, the lookup key is folded even with tables
  where a lookup field can match both upper and lower case
  text, such as regexp: and pcre:. This resulted in loss of
-@@ -122,9 +122,9 @@
+@@ -122,9 +122,9 @@ the "\fBpostconf \-m\fR" command.
  The \fBpostalias\fR(1) command can query any supported file type,
  but it can create only the following file types:
  .RS
@@ -154,17 +162,17 @@
  .IP \fBcdb\fR
  The output is one file named \fIfile_name\fB.cdb\fR.
  This is available on systems with support for \fBcdb\fR databases.
-@@ -132,9 +132,6 @@
- The output consists of two files, named \fIfile_name\fB.pag\fR and
- \fIfile_name\fB.dir\fR.
- This is available on systems with support for \fBdbm\fR databases.
+@@ -136,9 +136,6 @@ This is available on systems with suppor
+ A table that reliably fails all requests. The lookup table
+ name is used for logging only. This table exists to simplify
+ Postfix error tests.
 -.IP \fBhash\fR
 -The output is a hashed file, named \fIfile_name\fB.db\fR.
 -This is available on systems with support for \fBdb\fR databases.
- .IP \fBfail\fR
- A table that reliably fails all requests. The lookup table
- name is used for logging only. This table exists to simplify
-@@ -187,12 +184,6 @@
+ .IP \fBlmdb\fR
+ The output is a btree\-based file, named \fIfile_name\fB.lmdb\fR.
+ \fBlmdb\fR supports concurrent writes and reads from different
+@@ -192,12 +189,6 @@ The alias databases for \fBlocal\fR(8) d
  .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
  The default location of the Postfix main.cf and master.cf
  configuration files.