|
|
@@ -31,7 +31,7 @@
|
|
|
Summary: Postfix Mail Transport Agent
|
|
|
Summary(ja): Postfix メールトランスポートエージェント
|
|
|
Name: postfix
|
|
|
-Version: 3.6.4
|
|
|
+Version: 3.7.0
|
|
|
Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: servers
|
|
|
Vendor: Project Vine
|
|
|
@@ -64,7 +64,7 @@ Conflicts: sendmail
|
|
|
BuildRequires: pam-devel
|
|
|
BuildRequires: cyrus-sasl-devel >= 2
|
|
|
BuildRequires: openldap-devel, openssl-devel
|
|
|
-BuildRequires: libicu-devel, pcre-devel
|
|
|
+BuildRequires: libicu-devel, pcre2-devel
|
|
|
BuildRequires: libnsl2-devel
|
|
|
|
|
|
%if %{with systemd}
|
|
|
@@ -215,18 +215,18 @@ src/global/mail_params.h
|
|
|
%build
|
|
|
unset AUXLIBS_MYSQL AUXLIBS_PGSQL
|
|
|
CCARGS="-DMAX_DYNAMIC_MAPS \
|
|
|
- -DUSE_SASL_AUTH -I/usr/include/sasl \
|
|
|
- -DUSE_CYRUS_SASL \
|
|
|
+ -DUSE_SASL_AUTH -I/usr/include/sasl \
|
|
|
+ -DUSE_CYRUS_SASL \
|
|
|
-DHAS_LDAP \
|
|
|
-DLDAP_DEPRECATED=1 -DUSE_LDAP_SASL \
|
|
|
-DHAS_SSL -I/usr/include/openssl \
|
|
|
- -DHAS_PCRE -I/usr/include/pcre \
|
|
|
+ -DHAS_PCRE=2 `pcre2-config --cflags` \
|
|
|
-DHAS_SQLITE \
|
|
|
`pkg-config --cflags sqlite3` \
|
|
|
-DUSE_TLS"
|
|
|
AUXLIBS="-lsasl2 -lssl -lcrypto"
|
|
|
AUXLIBS_LDAP="-lldap -llber"
|
|
|
-AUXLIBS_PCRE="-lpcre"
|
|
|
+AUXLIBS_PCRE="`pcre2-config --libs8`"
|
|
|
AUXLIBS_SQLITE="`pkg-config --libs sqlite3`"
|
|
|
|
|
|
%if %build_mysql
|
|
|
@@ -425,22 +425,22 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_postun_with_restart %{name}.service
|
|
|
%else
|
|
|
-if [ -f %{_var}/lock/subsys/postfix ]; then
|
|
|
- if [ $1 -eq 0 ]; then
|
|
|
+if [ $1 -eq 0 ]; then
|
|
|
+ if [ -f %{_var}/lock/subsys/postfix ]; then
|
|
|
rm -rf %{_var}/lock/subsys/postfix
|
|
|
- else
|
|
|
- if [ -f /tmp/postfix.restart ]; then
|
|
|
- if [ -f %{_sysconfdir}/rc.d/init.d/postfix ]; then
|
|
|
- %{_sysconfdir}/rc.d/init.d/postfix start
|
|
|
- fi
|
|
|
- rm -f /tmp/postfix.restart
|
|
|
+ fi
|
|
|
+else
|
|
|
+ if [ -f /tmp/postfix.restart ]; then
|
|
|
+ if [ -f %{_sysconfdir}/rc.d/init.d/postfix ]; then
|
|
|
+ %{_sysconfdir}/rc.d/init.d/postfix start
|
|
|
fi
|
|
|
+ rm -f /tmp/postfix.restart
|
|
|
fi
|
|
|
fi
|
|
|
%endif
|
|
|
|
|
|
%if !%{with systemd}
|
|
|
-%triggerpostun -- postfix < 3.6.4
|
|
|
+%triggerpostun -- postfix < 3.7.1
|
|
|
if [ $2 -gt 0 ]; then
|
|
|
if [ -f /tmp/postfix.restart ]; then
|
|
|
if [ -f %{_sysconfdir}/rc.d/init.d/postfix ]; then
|
|
|
@@ -582,6 +582,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Feb 07 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.0-1
|
|
|
+- new upstream release.
|
|
|
+- built with pcre2.
|
|
|
+
|
|
|
* Wed Jan 19 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.4-1
|
|
|
- new upstream release.
|
|
|
|
