diff --git a/convert-bdb-to-lmdb.sh b/convert-bdb-to-lmdb.sh index 7a10e16..48c2dcc 100644 --- a/convert-bdb-to-lmdb.sh +++ b/convert-bdb-to-lmdb.sh @@ -1,4 +1,5 @@ #!/bin/bash +systemctl stop postfix if grep -q "hash:" /etc/postfix/{main.cf,master.cf}; then sed -i 's/hash:/lmdb:/g' /etc/postfix/{main.cf,master.cf} fi @@ -19,3 +20,4 @@ if [ -e /etc/aliases.db ]; then mv /etc/aliases.db /etc/aliases.db-back postalias /etc/aliases fi +systemctl start postfix diff --git a/postfix.changes b/postfix.changes index 0ed888f..22bfeb6 100644 --- a/postfix.changes +++ b/postfix.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Mon Jan 4 12:17:03 UTC 2021 - Peter Varkoly -- Set default lmd to default db. Convert btree tables to lmdb too. - This package is without bdb support. That's why convert must be done +- Set default lmd to default db. +- Convert btree tables to lmdb too. Stop postfix befor converting from + bdb to lmdb +- This package is without bdb support. That's why convert must be done without any suse release condition. o remove patch postfix-no-btree.patch o add set-default-db-type.patch diff --git a/postfix.spec b/postfix.spec index 7626cb0..18339d9 100644 --- a/postfix.spec +++ b/postfix.spec @@ -402,9 +402,7 @@ mkdir -p %{buildroot}%{_sysusersdir} install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/ install -m 644 %{SOURCE13} %{buildroot}%{_sysusersdir}/ %endif -%if 0%{?suse_version} >= 1520 install -m 0755 %{SOURCE5} %{buildroot}%{pf_daemon_directory} -%endif %if 0%{?suse_version} >= 1330 %pre -f postfix.pre diff --git a/set-default-db-type.patch b/set-default-db-type.patch index 53cb724..e87ff18 100644 --- a/set-default-db-type.patch +++ b/set-default-db-type.patch @@ -83,3 +83,97 @@ 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 @@ + 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 +-fixed\-case strings such as btree:, dbm: or hash:. With ++fixed\-case strings such as dbm:. With + 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 @@ + The \fBpostmap\fR(1) command can query any supported file type, + but it can create only the following file types: + .RS +-.IP \fBbtree\fR +-The output file is a btree file, named \fIfile_name\fB.db\fR. +-This is available on systems with support for \fBdb\fR databases. ++.IP \fBlmdb\fR ++The output file is a lmdb file, named \fIfile_name\fB.lmdb\fR. ++This is available on systems with support for \fBlmdb\fR databases. + .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. +-.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 @@ + this program. + The text below provides only a parameter summary. See + \fBpostconf\fR(5) for more details including examples. +-.IP "\fBberkeley_db_create_buffer_size (16777216)\fR" +-The per\-table I/O buffer size for programs that create Berkeley DB +-hash or btree tables. +-.IP "\fBberkeley_db_read_buffer_size (131072)\fR" +-The per\-table I/O buffer size for programs that read Berkeley DB +-hash or btree tables. + .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 @@ + 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 +-fixed\-case strings such as btree:, dbm: or hash:. With ++fixed\-case strings such as dbm:. With + 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 @@ + The \fBpostalias\fR(1) command can query any supported file type, + but it can create only the following file types: + .RS +-.IP \fBbtree\fR +-The output is a btree file, named \fIfile_name\fB.db\fR. +-This is available on systems with support for \fBdb\fR databases. ++.IP \fBlmdb\fR ++The output is a lmdb file, named \fIfile_name\fB.lmdb\fR. ++This is available on systems with support for \fBlmdb\fR databases. + .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. +-.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 "\fBconfig_directory (see 'postconf -d' output)\fR" + The default location of the Postfix main.cf and master.cf + configuration files. +-.IP "\fBberkeley_db_create_buffer_size (16777216)\fR" +-The per\-table I/O buffer size for programs that create Berkeley DB +-hash or btree tables. +-.IP "\fBberkeley_db_read_buffer_size (131072)\fR" +-The per\-table I/O buffer size for programs that read Berkeley DB +-hash or btree tables. + .IP "\fBdefault_database_type (see 'postconf -d' output)\fR" + The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1) + and \fBpostmap\fR(1) commands.