Accepting request 830871 from server:mail
Update to 3.5.7 OBS-URL: https://build.opensuse.org/request/show/830871 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=190
This commit is contained in:
commit
d0a7ad25b8
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8ec0aa671582adce157675e15da1dfa7ac2b5ff653571addba643735d0ec1e6a
|
||||
size 4613310
|
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (FreeBSD)
|
||||
|
||||
iFcDBQBfHc4XDAtZDoDKFacRCiw2AP9m1yhRThx0RH5l+k4OPsDbq/nfw26pwc1I
|
||||
ZRwjaNdF6wD/V1adfIZielz+McnWesIrG/51T4CFZkk2EwG2e4pZ1fI=
|
||||
=OX/E
|
||||
-----END PGP SIGNATURE-----
|
3
postfix-3.5.7.tar.gz
Normal file
3
postfix-3.5.7.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b7a474f14e153dc7cbf6af38419729bc5af5c3c37aecf6b327a8f962158f0961
|
||||
size 4613756
|
7
postfix-3.5.7.tar.gz.asc
Normal file
7
postfix-3.5.7.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (FreeBSD)
|
||||
|
||||
iFcDBQBfS7U6DAtZDoDKFacRCs55AP9IvDZ4H/sJe9X8AwkJ3txEev8pTGB7cttu
|
||||
6cxW23f0iQD/aNUSfJ5jVXAXDyx0jLzUfh8Iv7SNm+DrVTCZELWwbrg=
|
||||
=VHGi
|
||||
-----END PGP SIGNATURE-----
|
6
postfix-user.conf
Normal file
6
postfix-user.conf
Normal file
@ -0,0 +1,6 @@
|
||||
# Type Name ID GECOS [HOME]
|
||||
g maildrop 59 - -
|
||||
g postfix 51 - -
|
||||
u postfix 51 "Postfix Daemon" /var/spool/postfix
|
||||
m postfix maildrop
|
||||
m postfix mail
|
3
postfix-vmail-user.conf
Normal file
3
postfix-vmail-user.conf
Normal file
@ -0,0 +1,3 @@
|
||||
# Type Name ID GECOS [HOME]
|
||||
g vmail - - -
|
||||
u vmail - "Virtual Mail User" /srv/maildirs
|
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 31 13:38:04 UTC 2020 - Michael Ströder <michael@stroeder.com>
|
||||
|
||||
- Update to 3.5.7
|
||||
* Fixed random certificate verification failures with
|
||||
"smtp_tls_connection_reuse = yes", because tlsproxy(8) was using
|
||||
the wrong global TLS context for connections that use DANE or
|
||||
non-DANE trust anchors.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 25 13:54:40 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Move ldap into an own sub-package like all other databases
|
||||
- Move manual pages to correct sub-package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 21 08:44:22 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Use sysusers.d to create system accounts
|
||||
- Remove wrong %config for systemd directory content
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 9 06:55:01 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
|
||||
|
||||
|
97
postfix.spec
97
postfix.spec
@ -31,15 +31,17 @@
|
||||
%define pf_html_directory %{_docdir}/%{name}-doc/html
|
||||
%define pf_sample_directory %{_docdir}/%{name}-doc/samples
|
||||
%define pf_data_directory %{_localstatedir}/lib/%{name}
|
||||
%if 0%{?suse_version} < 1330
|
||||
%define pf_uid 51
|
||||
%define pf_gid 51
|
||||
%define maildrop_gid 59
|
||||
%define mail_group mail
|
||||
%define vmusr vmail
|
||||
%define vmgid 303
|
||||
%define vmid 303
|
||||
%define vmdir /srv/maildirs
|
||||
%endif
|
||||
%define mail_group mail
|
||||
%define conf_backup_dir %{_localstatedir}/adm/backup/%{name}
|
||||
%define vmusr vmail
|
||||
%define vmgid 303
|
||||
%define vmid 303
|
||||
%define vmdir /srv/maildirs
|
||||
%define unitdir %{_prefix}/lib/systemd
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
@ -52,8 +54,9 @@
|
||||
%bcond_with lmdb
|
||||
%bcond_with libnsl
|
||||
%endif
|
||||
%bcond_without ldap
|
||||
Name: postfix
|
||||
Version: 3.5.6
|
||||
Version: 3.5.7
|
||||
Release: 0
|
||||
Summary: A fast, secure, and flexible mailer
|
||||
License: IPL-1.0 OR EPL-2.0
|
||||
@ -67,6 +70,8 @@ Source3: %{name}-mysql.tar.bz2
|
||||
Source4: postfix.keyring
|
||||
Source10: %{name}-rpmlintrc
|
||||
Source11: check_mail_queue
|
||||
Source12: postfix-user.conf
|
||||
Source13: postfix-vmail-user.conf
|
||||
Patch1: %{name}-no-md5.patch
|
||||
Patch2: pointer_to_literals.patch
|
||||
Patch3: ipv6_disabled.patch
|
||||
@ -86,7 +91,9 @@ BuildRequires: libicu-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: m4
|
||||
BuildRequires: mysql-devel
|
||||
%if %{with ldap}
|
||||
BuildRequires: openldap2-devel
|
||||
%endif
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: postgresql-devel
|
||||
@ -97,7 +104,6 @@ Requires: iproute2
|
||||
Requires(post): permissions
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): permissions
|
||||
Requires(pre): shadow
|
||||
Conflicts: exim
|
||||
Conflicts: sendmail
|
||||
Provides: smtp_daemon
|
||||
@ -109,9 +115,13 @@ BuildRequires: lmdb-devel
|
||||
BuildRequires: libnsl-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1330
|
||||
BuildRequires: sysuser-tools
|
||||
Requires: system-user-nobody
|
||||
Requires: group(%{mail_group})
|
||||
Requires(pre): group(%{mail_group})
|
||||
%sysusers_requires
|
||||
%else
|
||||
Requires(pre): shadow
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -138,7 +148,11 @@ This package contains the documentation for %{name}
|
||||
Summary: Postfix plugin to support MySQL maps
|
||||
Group: Productivity/Networking/Email/Servers
|
||||
Requires(pre): %{name} = %{version}
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%sysusers_requires
|
||||
%else
|
||||
Requires(pre): shadow
|
||||
%endif
|
||||
|
||||
%description mysql
|
||||
Postfix plugin to support MySQL maps. This library will be loaded by
|
||||
@ -154,6 +168,18 @@ Postfix plugin to support PostgreSQL maps. This library will be loaded
|
||||
by starting %{name} if you'll access a postmap which is stored in
|
||||
PostgreSQL.
|
||||
|
||||
%if %{with ldap}
|
||||
%package ldap
|
||||
Summary: Postfix LDAP map support
|
||||
Group: Productivity/Networking/Email/Servers
|
||||
Requires: %{name} = %{version}
|
||||
Provides: postfix:/usr/lib/postfix/postfix-ldap.so
|
||||
|
||||
%description ldap
|
||||
This provides support for LDAP maps in Postfix. If you plan to use LDAP
|
||||
maps with Postfix, you need this.
|
||||
%endif
|
||||
|
||||
%if %{with lmdb}
|
||||
%package lmdb
|
||||
Summary: Postfix plugin to support LMDB maps
|
||||
@ -197,8 +223,10 @@ else
|
||||
export AUXLIBS="${AUXLIBS} -lssl -lcrypto"
|
||||
fi
|
||||
#
|
||||
%if %{with ldap}
|
||||
export CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 -DUSE_LDAP_SASL"
|
||||
export AUXLIBS_LDAP="-lldap -llber"
|
||||
%endif
|
||||
#
|
||||
export CCARGS="${CCARGS} -DHAS_PCRE"
|
||||
export AUXLIBS_PCRE="-lpcre"
|
||||
@ -240,13 +268,14 @@ make makefiles pie=yes shared=yes dynamicmaps=yes \
|
||||
config_directory=%{_sysconfdir}/%{name} \
|
||||
SHLIB_RPATH="-Wl,-rpath,%{pf_shlib_directory} -Wl,-z,relro,-z,now"
|
||||
make %{?_smp_mflags}
|
||||
%if 0%{?suse_version} >= 1330
|
||||
# Create postfix user
|
||||
%sysusers_generate_pre %{SOURCE12} postfix
|
||||
%sysusers_generate_pre %{SOURCE13} vmail
|
||||
%endif
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
%install
|
||||
groupadd -g %{pf_gid} -o -r %{name} 2> /dev/null || :
|
||||
groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || :
|
||||
useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name} 2> /dev/null || :
|
||||
usermod -a -G %{maildrop_gid},%{mail_group} %{name} 2> /dev/null || :
|
||||
mkdir -p %{buildroot}/%{_libdir}
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
|
||||
cp conf/* %{buildroot}%{_sysconfdir}/%{name}
|
||||
@ -378,8 +407,22 @@ do
|
||||
done
|
||||
# ---------------------------------------------------------------------------
|
||||
install -m 755 %{SOURCE11} %{buildroot}%{_sbindir}/
|
||||
%if 0%{?suse_version} >= 1330
|
||||
mkdir -p %{buildroot}%{_sysusersdir}
|
||||
install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
|
||||
install -m 644 %{SOURCE13} %{buildroot}%{_sysusersdir}/
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%pre -f postfix.pre
|
||||
%else
|
||||
%pre
|
||||
getent group %{name} >/dev/null || groupadd -g %{pf_gid} -o -r %{name}
|
||||
getent group maildrop >/dev/null || groupadd -g %{maildrop_gid} -o -r maildrop
|
||||
getent passwd %{name} >/dev/null || useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name}
|
||||
usermod -a -G %{maildrop_gid},%{mail_group} %{name}
|
||||
%endif
|
||||
|
||||
%service_add_pre %{name}.service
|
||||
|
||||
VERSIONTEST=$(test -x usr/sbin/postconf && usr/sbin/postconf proxy_read_maps 2>/dev/null || :)
|
||||
@ -390,12 +433,11 @@ if [ -z "$VERSIONTEST" -a -f %{pf_queue_directory}/pid/master.pid ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
getent group %{name} >/dev/null || groupadd -g %{pf_gid} -o -r %{name}
|
||||
getent group maildrop >/dev/null || groupadd -g %{maildrop_gid} -o -r maildrop
|
||||
getent passwd %{name} >/dev/null || useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name}
|
||||
usermod -a -G %{maildrop_gid},%{mail_group} %{name}
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%pre mysql -f vmail.pre
|
||||
%else
|
||||
%pre mysql
|
||||
#echo "PARAM_pre: "$1
|
||||
# on `rpm -ivh` PARAM is 1
|
||||
@ -409,6 +451,7 @@ if [ "$1" = "1" ]; then
|
||||
useradd -c "maildirs chef" -d %{vmdir} -g %{vmusr} -u %{vmid} -r -s /bin/false %{vmusr}
|
||||
fi
|
||||
fi
|
||||
%endif
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
%preun
|
||||
@ -516,7 +559,6 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/canonical
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/header_checks
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/helo_access
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/ldap_aliases.cf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/main.cf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/master.cf
|
||||
%attr(0750,root,root) %config %{_sysconfdir}/%{name}/post-install
|
||||
@ -543,7 +585,7 @@ fi
|
||||
%dir %{_sysconfdir}/%{name}/ssl/certs
|
||||
%{_sysconfdir}/%{name}/ssl/cacerts
|
||||
%dir %{pf_shlib_directory}/systemd
|
||||
%config %attr(0755,root,root) %{pf_shlib_directory}/systemd/*
|
||||
%attr(0755,root,root) %{pf_shlib_directory}/systemd/*
|
||||
%{_unitdir}/%{name}.service
|
||||
%verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postdrop
|
||||
%verify(not mode) %attr(2755,root,%{pf_setgid_group}) %{_sbindir}/postqueue
|
||||
@ -571,7 +613,6 @@ fi
|
||||
%{_libexecdir}/sendmail
|
||||
%dir %{pf_shlib_directory}
|
||||
%{pf_shlib_directory}/*[^.so]
|
||||
%{pf_shlib_directory}/%{name}-ldap.so
|
||||
%{pf_shlib_directory}/%{name}-pcre.so
|
||||
%{pf_shlib_directory}/lib%{name}-dns.so
|
||||
%{pf_shlib_directory}/lib%{name}-global.so
|
||||
@ -583,6 +624,10 @@ fi
|
||||
|
||||
%{conf_backup_dir}
|
||||
%dir %attr(0700,%{name},root) %{pf_data_directory}
|
||||
%exclude %{_mandir}/man5/ldap_table.5*
|
||||
%exclude %{_mandir}/man5/lmdb_table.5*
|
||||
%exclude %{_mandir}/man5/mysql_table.5*
|
||||
%exclude %{_mandir}/man5/pgsql_table.5*
|
||||
%{_mandir}/man?/*%{?ext_man}
|
||||
%dir %attr(0755,root,root) /%{pf_queue_directory}
|
||||
%dir %attr(0700,%{name},root) /%{pf_queue_directory}/active
|
||||
@ -598,6 +643,9 @@ fi
|
||||
%dir %attr(0700,%{name},root) /%{pf_queue_directory}/trace
|
||||
%dir %attr(0730,%{name},maildrop) /%{pf_queue_directory}/maildrop
|
||||
%dir %attr(0710,%{name},maildrop) /%{pf_queue_directory}/public
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%{_sysusersdir}/postfix-user.conf
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}/
|
||||
@ -611,13 +659,26 @@ fi
|
||||
%config(noreplace) %attr(640, root, %{name}) %{_sysconfdir}/%{name}/*_maps.cf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/main.cf-mysql
|
||||
%{pf_shlib_directory}/%{name}-mysql.so
|
||||
%{_mandir}/man5/mysql_table.5%{?ext_man}
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%{_sysusersdir}/postfix-vmail-user.conf
|
||||
%endif
|
||||
|
||||
%files postgresql
|
||||
%{pf_shlib_directory}/%{name}-pgsql.so
|
||||
%{_mandir}/man5/pgsql_table.5%{?ext_man}
|
||||
|
||||
%if %{with ldap}
|
||||
%files ldap
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/ldap_aliases.cf
|
||||
%{pf_shlib_directory}/%{name}-ldap.so
|
||||
%{_mandir}/man5/ldap_table.5%{?ext_man}
|
||||
%endif
|
||||
|
||||
%if %{with lmdb}
|
||||
%files lmdb
|
||||
%{pf_shlib_directory}/%{name}-lmdb.so
|
||||
%{_mandir}/man5/lmdb_table.5%{?ext_man}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user