Accepting request 858657 from home:adkorte:branches:server:mail

- Set database type for address_verify_map and postscreen_cache_map
  to lmdb (btree requires Berkeley DB)
- Set default database type to lmdb and fix update_postmaps script
- Use variable substition instead of sed to remove .db suffix and
  substitute hash: for lmdb: in /etc/postfix/master.cf as well.
  Check before substitution if there is something to do (to keep
  rpmcheck happy).

OBS-URL: https://build.opensuse.org/request/show/858657
OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=394

convert-bdb-to-lmdb.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
-sed -i 's/hash:/lmdb:/g' /etc/postfix/main.cf
+if grep -q "hash:" /etc/postfix/{main.cf,master.cf}; then
+	sed -i 's/hash:/lmdb:/g' /etc/postfix/{main.cf,master.cf}
+fi
 for i in $( find /etc/postfix/  -name "*.db"  )
 do
-        j=$( echo $i | sed 's/.db$//' )
-        postmap $j
 	mv $i $i-back
+	postmap ${i%.db}
 done
 for i in $( find /etc/aliases.d/  -name "*.db" )
 do
-        j=$( echo $i | sed 's/.db$//' )
-        postalias $j
 	mv $i $i-back
+	postalias ${i%.db}
 done
 if [ -e /etc/aliases.db ]; then
 	mv /etc/aliases.db /etc/aliases.db-back

postfix-SUSE.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fc0d9079d0fabb16191c3d2e3af9bd6bb06317abe07d30c65017b8537f3cbf0
+oid sha256:694d01f378319f2cf087acef611a849f5b03738e882f172fd00dd53a9e4cbc0e
-size 24077
+size 22916

postfix-no-btree.patch

@@ -0,0 +1,20 @@
+--- 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;
+ extern char *var_verify_service;
+ 
+ #define VAR_VERIFY_MAP			"address_verify_map"
+-#define DEF_VERIFY_MAP			"btree:$data_directory/verify_cache"
++#define DEF_VERIFY_MAP			"lmdb:$data_directory/verify_cache"
+ 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;
+   * postscreen(8)
+   */
+ #define VAR_PSC_CACHE_MAP	"postscreen_cache_map"
+-#define DEF_PSC_CACHE_MAP	"btree:$data_directory/postscreen_cache"
++#define DEF_PSC_CACHE_MAP	"lmdb:$data_directory/postscreen_cache"
+ extern char *var_psc_cache_map;
+ 
+ #define VAR_SMTPD_SERVICE	"smtpd_service_name"

postfix.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Dec 25 20:32:04 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
+
+- Set database type for address_verify_map and postscreen_cache_map
+  to lmdb (btree requires Berkeley DB)
+
+-------------------------------------------------------------------
+Fri Dec 25 10:28:30 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
+
+- Set default database type to lmdb and fix update_postmaps script
+
+-------------------------------------------------------------------
+Thu Dec 24 14:09:32 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
+
+- Use variable substition instead of sed to remove .db suffix and
+  substitute hash: for lmdb: in /etc/postfix/master.cf as well.
+  Check before substitution if there is something to do (to keep
+  rpmcheck happy).
+
 -------------------------------------------------------------------
 Tue Dec  8 13:36:35 UTC 2020 - Peter Varkoly <varkoly@suse.com>
 

postfix.spec

@@ -81,6 +81,7 @@ Patch7:         %{name}-ssl-release-buffers.patch
 Patch8:         %{name}-vda-v14-3.0.3.patch
 Patch9:         fix-postfix-script.patch
 Patch10:        %{name}-avoid-infinit-loop-if-no-permission.patch
+Patch11:        %{name}-no-btree.patch
 BuildRequires:  ca-certificates
 BuildRequires:  cyrus-sasl-devel
 #BuildRequires:  db-devel
@@ -192,6 +193,7 @@ maps with Postfix, you need this.
 %patch8
 %patch9
 %patch10
+%patch11
 
 # ---------------------------------------------------------------------------
 
@@ -244,8 +246,8 @@ export AUXLIBS_LMDB="-llmdb"
 #export AUXLIBS_SQLITE
 #export AUXLIBS_CDB
 #export AUXLIBS_SDBM
-# Remove berkeley DB
+# Remove berkeley DB and set lmdb as default
-export CCARGS="${CCARGS} -DNO_DB"
+export CCARGS="${CCARGS} -DNO_DB -DDEF_DB_TYPE=\\\"lmdb\\\""
 
 export PIE=-pie
 # using SHLIB_RPATH to specify unrelated linker flags, because LDFLAGS is