Added support for LMDB maps
This commit is contained in:
parent
fd691b0be0
commit
51e5039508
43
postfix.spec
43
postfix.spec
@ -6,6 +6,7 @@
|
|||||||
%bcond_without sqlite
|
%bcond_without sqlite
|
||||||
%bcond_without cdb
|
%bcond_without cdb
|
||||||
%bcond_without ldap
|
%bcond_without ldap
|
||||||
|
%bcond_without lmdb
|
||||||
%bcond_without pcre
|
%bcond_without pcre
|
||||||
%bcond_without sasl
|
%bcond_without sasl
|
||||||
%bcond_without tls
|
%bcond_without tls
|
||||||
@ -48,7 +49,7 @@
|
|||||||
Name: postfix
|
Name: postfix
|
||||||
Summary: Postfix Mail Transport Agent
|
Summary: Postfix Mail Transport Agent
|
||||||
Version: 3.5.4
|
Version: 3.5.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
URL: http://www.postfix.org
|
URL: http://www.postfix.org
|
||||||
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
|
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
|
||||||
@ -104,6 +105,7 @@ BuildRequires: systemd-units, libicu-devel, libnsl2-devel
|
|||||||
BuildRequires: gcc, m4, findutils
|
BuildRequires: gcc, m4, findutils
|
||||||
|
|
||||||
%{?with_ldap:BuildRequires: openldap-devel}
|
%{?with_ldap:BuildRequires: openldap-devel}
|
||||||
|
%{?with_lmdb:BuildRequires: lmdb-devel}
|
||||||
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
|
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
|
||||||
%{?with_pcre:BuildRequires: pcre-devel}
|
%{?with_pcre:BuildRequires: pcre-devel}
|
||||||
%{?with_mysql:BuildRequires: mariadb-connector-c-devel}
|
%{?with_mysql:BuildRequires: mariadb-connector-c-devel}
|
||||||
@ -197,6 +199,16 @@ This provides support for LDAP maps in Postfix. If you plan to use LDAP
|
|||||||
maps with Postfix, you need this.
|
maps with Postfix, you need this.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with lmdb}
|
||||||
|
%package lmdb
|
||||||
|
Summary: Postfix LDMB map support
|
||||||
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
%description lmdb
|
||||||
|
This provides support for LMDB maps in Postfix. If you plan to use LMDB
|
||||||
|
maps with Postfix, you need this.
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with pcre}
|
%if %{with pcre}
|
||||||
%package pcre
|
%package pcre
|
||||||
Summary: Postfix PCRE map support
|
Summary: Postfix PCRE map support
|
||||||
@ -235,7 +247,7 @@ for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
%build
|
%build
|
||||||
unset AUXLIBS AUXLIBS_LDAP AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB
|
unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB
|
||||||
CCARGS="-fPIC -fcommon"
|
CCARGS="-fPIC -fcommon"
|
||||||
AUXLIBS="-lnsl"
|
AUXLIBS="-lnsl"
|
||||||
|
|
||||||
@ -247,6 +259,10 @@ CCARGS="${CCARGS} -fsigned-char"
|
|||||||
CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 %{?with_sasl:-DUSE_LDAP_SASL}"
|
CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 %{?with_sasl:-DUSE_LDAP_SASL}"
|
||||||
AUXLIBS_LDAP="-lldap -llber"
|
AUXLIBS_LDAP="-lldap -llber"
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with lmdb}
|
||||||
|
CCARGS="${CCARGS} -DHAS_LMDB"
|
||||||
|
AUXLIBS_LMDB="-llmdb"
|
||||||
|
%endif
|
||||||
%if %{with pcre}
|
%if %{with pcre}
|
||||||
# -I option required for pcre 3.4 (and later?)
|
# -I option required for pcre 3.4 (and later?)
|
||||||
CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre"
|
CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre"
|
||||||
@ -297,9 +313,10 @@ LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}"
|
|||||||
# way how to get them in
|
# way how to get them in
|
||||||
make -f Makefile.init makefiles shared=yes dynamicmaps=yes \
|
make -f Makefile.init makefiles shared=yes dynamicmaps=yes \
|
||||||
%{?_hardened_build:pie=yes} CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
|
%{?_hardened_build:pie=yes} CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
|
||||||
AUXLIBS_LDAP="${AUXLIBS_LDAP}" AUXLIBS_PCRE="${AUXLIBS_PCRE}" \
|
AUXLIBS_LDAP="${AUXLIBS_LDAP}" AUXLIBS_LMDB="${AUXLIBS_LMDB}" \
|
||||||
AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
|
AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
|
||||||
AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" AUXLIBS_CDB="${AUXLIBS_CDB}"\
|
AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" \
|
||||||
|
AUXLIBS_CDB="${AUXLIBS_CDB}" \
|
||||||
DEBUG="" SHLIB_RPATH="-Wl,-rpath,%{postfix_shlib_dir} $LDFLAGS" \
|
DEBUG="" SHLIB_RPATH="-Wl,-rpath,%{postfix_shlib_dir} $LDFLAGS" \
|
||||||
OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment" \
|
OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment" \
|
||||||
POSTFIX_INSTALL_OPTS=-keep-build-mtime
|
POSTFIX_INSTALL_OPTS=-keep-build-mtime
|
||||||
@ -433,7 +450,7 @@ function split_file
|
|||||||
# split global dynamic maps configuration to individual sub-packages
|
# split global dynamic maps configuration to individual sub-packages
|
||||||
pushd $RPM_BUILD_ROOT%{postfix_config_dir}
|
pushd $RPM_BUILD_ROOT%{postfix_config_dir}
|
||||||
for map in %{?with_mysql:mysql} %{?with_pgsql:pgsql} %{?with_sqlite:sqlite} \
|
for map in %{?with_mysql:mysql} %{?with_pgsql:pgsql} %{?with_sqlite:sqlite} \
|
||||||
%{?with_cdb:cdb} %{?with_ldap:ldap} %{?with_pcre:pcre}; do
|
%{?with_cdb:cdb} %{?with_ldap:ldap} %{?with_lmdb:lmdb} %{?with_pcre:pcre}; do
|
||||||
rm -f dynamicmaps.cf.d/"$map" "postfix-files.d/$map"
|
rm -f dynamicmaps.cf.d/"$map" "postfix-files.d/$map"
|
||||||
split_file "^\s*$map\b" "$map" dynamicmaps.cf
|
split_file "^\s*$map\b" "$map" dynamicmaps.cf
|
||||||
sed -i "s|postfix-$map\\.so|%{postfix_shlib_dir}/\\0|" "dynamicmaps.cf.d/$map"
|
sed -i "s|postfix-$map\\.so|%{postfix_shlib_dir}/\\0|" "dynamicmaps.cf.d/$map"
|
||||||
@ -585,6 +602,8 @@ fi
|
|||||||
%exclude %{postfix_doc_dir}/README_FILES/CDB_README
|
%exclude %{postfix_doc_dir}/README_FILES/CDB_README
|
||||||
%exclude %{_mandir}/man5/ldap_table.5*
|
%exclude %{_mandir}/man5/ldap_table.5*
|
||||||
%exclude %{postfix_doc_dir}/README_FILES/LDAP_README
|
%exclude %{postfix_doc_dir}/README_FILES/LDAP_README
|
||||||
|
%exclude %{_mandir}/man5/lmdb_table.5*
|
||||||
|
%exclude %{postfix_doc_dir}/README_FILES/LMDB_README
|
||||||
%exclude %{_mandir}/man5/pcre_table.5*
|
%exclude %{_mandir}/man5/pcre_table.5*
|
||||||
%exclude %{postfix_doc_dir}/README_FILES/PCRE_README
|
%exclude %{postfix_doc_dir}/README_FILES/PCRE_README
|
||||||
|
|
||||||
@ -745,6 +764,15 @@ fi
|
|||||||
%attr(0644, root, root) %{postfix_doc_dir}/README_FILES/LDAP_README
|
%attr(0644, root, root) %{postfix_doc_dir}/README_FILES/LDAP_README
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with lmdb}
|
||||||
|
%files lmdb
|
||||||
|
%attr(0644, root, root) %{postfix_config_dir}/dynamicmaps.cf.d/lmdb
|
||||||
|
%attr(0644, root, root) %{postfix_config_dir}/postfix-files.d/lmdb
|
||||||
|
%attr(0755, root, root) %{postfix_shlib_dir}/postfix-lmdb.so
|
||||||
|
%attr(0644, root, root) %{_mandir}/man5/lmdb_table.5*
|
||||||
|
%attr(0644, root, root) %{postfix_doc_dir}/README_FILES/LMDB_README
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with pcre}
|
%if %{with pcre}
|
||||||
%files pcre
|
%files pcre
|
||||||
%attr(0644, root, root) %{postfix_config_dir}/dynamicmaps.cf.d/pcre
|
%attr(0644, root, root) %{postfix_config_dir}/dynamicmaps.cf.d/pcre
|
||||||
@ -755,6 +783,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 8 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.4-2
|
||||||
|
- Added support for LMDB maps
|
||||||
|
|
||||||
* Mon Jun 29 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.4-1
|
* Mon Jun 29 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.4-1
|
||||||
- New version
|
- New version
|
||||||
Resolves: rhbz#1851650
|
Resolves: rhbz#1851650
|
||||||
|
Loading…
Reference in New Issue
Block a user