pool/postfix
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 535461 from server:mail

Browse Source 
- bnc#1059512 L3: Postfix Problem
  The applied changes breaks existing postfix configurations because
  daemon_directory was not adapted to the new value.
 

- fix build for SLE
  * nothing provides libnsl-devel
  * add bcond_with libnsl

- bnc#1059512 L3: Postfix Problem 
  To manage multiple Postfix instances on a single host requires
  that daemon_directory and shlib_directory is different to
  avoid use of the shared directories also as per-instance directories.
  For this reason daemon_directory was set to /usr/lib/postfix/bin/.
  shlib_directory stands /usr/lib/postfix/.

OBS-URL: https://build.opensuse.org/request/show/535461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=148
This commit is contained in:
Dominique Leuenberger 2017-10-21 18:21:05 +00:00 committed by Git OBS Bridge
commit 638f242ed9
2 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
postfix.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Oct 20 12:27:12 UTC 2017 - varkoly@suse.com
- bnc#1059512 L3: Postfix Problem
The applied changes breaks existing postfix configurations because
daemon_directory was not adapted to the new value.
-------------------------------------------------------------------
Sun Oct 15 22:47:29 UTC 2017 - chris@computersalat.de
- fix build for SLE
* nothing provides libnsl-devel
* add bcond_with libnsl
-------------------------------------------------------------------
Wed Oct 4 10:58:28 UTC 2017 - varkoly@suse.com
- bnc#1059512 L3: Postfix Problem
To manage multiple Postfix instances on a single host requires
that daemon_directory and shlib_directory is different to
avoid use of the shared directories also as per-instance directories.
For this reason daemon_directory was set to /usr/lib/postfix/bin/.
shlib_directory stands /usr/lib/postfix/.
-------------------------------------------------------------------
Thu Sep 28 08:44:41 UTC 2017 - varkoly@suse.com

48
postfix.spec
View File

@ -18,8 +18,10 @@
%if 0%{?suse_version} >= 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
%bcond_without lmdb
%bcond_without libnsl
%else
%bcond_with lmdb
%bcond_with libnsl
%endif
#
@ -27,8 +29,9 @@
#
%define pf_docdir %{_docdir}/%{name}-doc
%define pf_config_directory %{_sysconfdir}/%{name}
%define pf_daemon_directory /usr/lib/%{name}
%define pf_daemon_directory /usr/lib/%{name}/bin/
%define _libexecdir /usr/lib
%define pf_shlib_directory /usr/lib/%{name}
%define pf_command_directory %{_prefix}/sbin
%define pf_queue_directory var/spool/%{name}
%define pf_sendmail_path %{_sbindir}/sendmail
@ -90,7 +93,9 @@ BuildRequires: libopenssl-devel
BuildRequires: lmdb-devel
%endif
BuildRequires: libicu-devel
%if %{with libnsl}
BuildRequires: libnsl-devel
%endif
BuildRequires: mysql-devel
BuildRequires: openldap2-devel
BuildRequires: pcre-devel
@ -357,7 +362,7 @@ cat conf/main.cf
"disable_vrfy_command = yes" \
'smtpd_banner = $myhostname ESMTP'
#Set Permissions
install -m 644 %{name}-SuSE/%{name}-files %{buildroot}%{_libexecdir}/postfix/postfix-files
install -m 644 %{name}-SuSE/%{name}-files %{buildroot}%{pf_shlib_directory}/postfix-files
# postfix-mysql
install -m 644 %{name}-mysql/main.cf-mysql %{buildroot}%{_sysconfdir}/%{name}/main.cf-mysql
install -m 640 %{name}-mysql/*_maps.cf %{buildroot}%{_sysconfdir}/%{name}/
@ -391,7 +396,7 @@ ln -s -f %{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
%fdupes %{buildroot}%{pf_docdir}
%fdupes %{buildroot}%{_mandir}
%endif
for path in %{buildroot}%{_libexecdir}/%{name}/libpostfix-*.so
for path in %{buildroot}%{pf_shlib_directory}/libpostfix-*.so
do
test -e "$path" || continue
name=${path##*/}
@ -501,6 +506,9 @@ if [ ${1:-0} -gt 1 ]; then
fi
echo "Executing upgrade-configuration."
%{_sbindir}/postfix set-permissions upgrade-configuration setgid_group=%{pf_setgid_group} || :
if [ "$(/usr/sbin/postconf -h daemon_directory)" != "%{pf_daemon_directory}" ]; then
/usr/sbin/postconf daemon_directory=%{pf_daemon_directory}
fi
if [ $MASTERCH -eq 0 ]; then
test -e %{_localstatedir}/adm/SuSEconfig/md5%{_sysconfdir}/postfix/master.cf && grep -v "^#" %{_sysconfdir}/postfix/master.cf | md5sum > %{_localstatedir}/adm/SuSEconfig/md5%{_sysconfdir}/postfix/master.cf
fi
@ -550,7 +558,7 @@ fi
FILE=etc/%{name}/dynamicmaps.cf
if ! grep -q "^pgsql[[:space:]]" ${FILE}; then
echo "Adding pgsql map entry to ${FILE}"
echo "pgsql %{_libexecdir}/%{name}/dict_pgsql.so dict_pgsql_open" >> ${FILE}
echo "pgsql %{pf_shlib_directory}/dict_pgsql.so dict_pgsql_open" >> ${FILE}
fi
# ---------------------------------------------------------------------------
@ -558,7 +566,7 @@ fi
FILE=etc/%{name}/dynamicmaps.cf
if ! grep -q "^mysql[[:space:]]" ${FILE}; then
echo "Adding mysql map entry to ${FILE}"
echo "mysql %{_libexecdir}/%{name}/dict_mysql.so dict_mysql_open" >> ${FILE}
echo "mysql %{pf_shlib_directory}/dict_mysql.so dict_mysql_open" >> ${FILE}
fi
# ---------------------------------------------------------------------------
@ -597,7 +605,7 @@ fi
%config %{_sysconfdir}/permissions.d/%{name}
%config %{_sysconfdir}/permissions.d/%{name}.paranoid
%attr(0644, root, root) %config %{_sysconfdir}/%{name}/makedefs.out
%{_libexecdir}/%{name}/%{name}-files
%{pf_shlib_directory}/%{name}-files
# create our default postfix ssl DIR (/etc/postfix/ssl)
%dir %{_sysconfdir}/postfix/ssl
%dir %{_sysconfdir}/postfix/ssl/certs
@ -633,17 +641,17 @@ fi
%{_sbindir}/rc%{name}
%{_libdir}/lib*
%{_libexecdir}/sendmail
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/*[^.so]
%{_libexecdir}/%{name}/postfix-ldap.so
%{_libexecdir}/%{name}/postfix-pcre.so
%{_libexecdir}/%{name}/libpostfix-dns.so
%{_libexecdir}/%{name}/libpostfix-global.so
%{_libexecdir}/%{name}/libpostfix-master.so
%{_libexecdir}/%{name}/libpostfix-tls.so
%{_libexecdir}/%{name}/libpostfix-util.so
%{_libexecdir}/%{name}/main.cf.proto
%{_libexecdir}/%{name}/master.cf.proto
%dir %{pf_shlib_directory}
%{pf_shlib_directory}/*[^.so]
%{pf_shlib_directory}/postfix-ldap.so
%{pf_shlib_directory}/postfix-pcre.so
%{pf_shlib_directory}/libpostfix-dns.so
%{pf_shlib_directory}/libpostfix-global.so
%{pf_shlib_directory}/libpostfix-master.so
%{pf_shlib_directory}/libpostfix-tls.so
%{pf_shlib_directory}/libpostfix-util.so
%{pf_shlib_directory}/main.cf.proto
%{pf_shlib_directory}/master.cf.proto
%{conf_backup_dir}
%dir %attr(0700,%{name},root) %{pf_data_directory}
@ -676,16 +684,16 @@ fi
%doc %{name}-mysql/%{name}-mysql.sql
%config(noreplace) %attr(640, root, %{name}) %{_sysconfdir}/%{name}/*_maps.cf
%config(noreplace) %{_sysconfdir}/%{name}/main.cf-mysql
%{_libexecdir}/%{name}/postfix-mysql.so
%{pf_shlib_directory}/postfix-mysql.so
%files postgresql
%defattr(-,root,root)
%{_libexecdir}/%{name}/postfix-pgsql.so
%{pf_shlib_directory}/postfix-pgsql.so
%if %{with lmdb}
%files lmdb
%defattr(-,root,root)
%{_libexecdir}/%{name}/postfix-lmdb.so
%{pf_shlib_directory}/postfix-lmdb.so
%endif
%changelog