X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexim.git;a=blobdiff_plain;f=exim.spec;h=9475b6f204566cefd6f9c36dace0bfce7e5d77d9;hp=996f1998af26e4b0639360f3e0a9c80ab7b8ece9;hb=b643027;hpb=5f63926a62096788f9dabb0a4bf2d5d891a3dce3 diff --git a/exim.spec b/exim.spec index 996f199..9475b6f 100644 --- a/exim.spec +++ b/exim.spec @@ -7,8 +7,7 @@ %bcond_without sasl # without SASL %bcond_without ldap # without LDAP support %bcond_without spf # without spf support -%bcond_without srs # without srs support -%bcond_without dynamic # dynamic modules +%bcond_with dynamic # dynamic modules %bcond_without hiredis # without redis # opendmarc.spec not ready, so off by default %bcond_with dmarc # DMARC support @@ -19,20 +18,19 @@ %undefine with_hiredis %endif -%include /usr/lib/rpm/macros.perl Summary: University of Cambridge Mail Transfer Agent Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim Name: exim -Version: 4.92.2 -Release: 2 +Version: 4.96 +Release: 8 Epoch: 2 -License: GPL +License: GPL v2+ Group: Networking/Daemons/SMTP Source0: ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2 -# Source0-md5: 217c2c00a2bfdde13f83abd95cb44d2d +# Source0-md5: e04a7a2a3456facba0b86dcec0ef4865 Source1: ftp://ftp.exim.org/pub/exim/exim4/%{name}-html-%{version}.tar.bz2 -# Source1-md5: 09c31a03fc36a6428fe6e943763c938b +# Source1-md5: 786f30ba262d34dfd47a10387f845d60 Source2: %{name}.init Source3: %{name}.cron.db Source4: %{name}4.conf @@ -51,34 +49,34 @@ Source15: %{name}4-smtp.pamd Source16: %{name}on.png # sh branch.sh Patch100: %{name}-git.patch -# Patch100-md5: 82ebf93c48068b7205953c65b7b028db +# Patch100-md5: 218d045f1dcefd945f10adc254bffa31 Patch0: %{name}4-EDITME.patch Patch1: %{name}4-monitor-EDITME.patch Patch2: %{name}4-cflags.patch Patch3: exim-defs.patch Patch4: %{name}4-Makefile-Default.patch -# http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch -Patch5: localscan_dlopen_%{name}_4.20_or_better.patch -Patch6: exim-bug-1891.patch - +# dlopen patch from debian +Patch5: 90_localscan_dlopen.dpatch +# local fixes for debian patch +Patch6: 90_localscan_dlopen-fixes.dpatch +Patch7: linelength-show.patch Patch8: %{name}-spam-timeout.patch Patch20: %{name}4-disableSSLv3.patch URL: http://www.exim.org/ %{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0} BuildRequires: db-devel -%{?with_dmarc:BuildRequires: opendmarc-devel} %{?with_hiredis:BuildRequires: hiredis-devel} BuildRequires: libidn-devel BuildRequires: libidn2-devel %{?with_spf:BuildRequires: libspf2-devel >= 1.2.5-2} -%{?with_srs:BuildRequires: libsrs_alt-devel >= 1.0} %{?with_lmdb:BuildRequires: lmdb-devel} %{?with_mysql:BuildRequires: mysql-devel} +%{?with_dmarc:BuildRequires: opendmarc-devel} %{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} BuildRequires: openssl-devel >= 0.9.7d BuildRequires: pam-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-8-devel BuildRequires: perl-devel >= 1:5.6.0 %{?with_pgsql:BuildRequires: postgresql-devel} BuildRequires: readline-devel @@ -178,15 +176,14 @@ Pliki nagłówkowe dla Exima. %prep %setup -q -a1 -a7 %patch100 -p2 - %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p2 - +%patch6 -p1 +%patch7 -p1 %patch8 -p1 install %{SOURCE4} exim4.conf @@ -212,17 +209,13 @@ SUPPORT_I18N_2008=yes LDFLAGS+= -lidn -lidn2 SUPPORT_PROXY=yes %if %{with dmarc} -EXPERIMENTAL_DMARC=yes +SUPPORT_DMARC=yes LOOKUP_LIBS+=-lopendmarc %endif %if %{with spf} SUPPORT_SPF=yes LOOKUP_LIBS+=-lspf2 %endif -%if %{with srs} -EXPERIMENTAL_SRS=yes -LOOKUP_LIBS+=-lsrs_alt -%endif %if %{with hiredis} LOOKUP_REDIS=yes LOOKUP_LIBS+=-lhiredis @@ -275,6 +268,7 @@ LOOKUP_LIBS+=-lldap -llber EXPERIMENTAL_LMDB=yes LOOKUP_LIBS+=-llmdb %endif +DLOPEN_LOCAL_SCAN=yes EOF # have to be after Local/Makefile-Linux creation @@ -282,7 +276,7 @@ cp -f src/EDITME Local/Makefile cp -f exim_monitor/EDITME Local/eximon.conf %build -%{__make} -e -j1 \ +%{__make} -e \ FULLECHO='' %install @@ -367,14 +361,13 @@ fi %dir %{_sysconfdir}/mail %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim +%attr(754,root,root) /etc/cron.daily/exim.cron.db %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/exim +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp %attr(754,root,root) /etc/rc.d/init.d/exim +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim %attr(4755,root,root) %{_bindir}/exim -%attr(770,root,exim) %dir %{_var}/spool/exim -%attr(750,exim,exim) %dir %{_var}/spool/exim/db -%attr(700,exim,root) %dir %{_var}/spool/exim/input -%attr(750,exim,root) %dir %{_var}/spool/exim/msglog %attr(755,root,root) %{_bindir}/exim_* %attr(755,root,root) %{_bindir}/exinext %attr(755,root,root) %{_bindir}/exiwhat @@ -393,12 +386,13 @@ fi %attr(755,root,root) %{_sbindir}/runq %attr(755,root,root) %{_sbindir}/sendmail %attr(755,root,root) /usr/lib/sendmail -%attr(754,root,root) /etc/cron.daily/exim.cron.db %attr(750,exim,root) %dir %{_var}/log/exim %attr(750,exim,root) %dir %{_var}/log/archive/exim %attr(640,exim,root) %ghost %{_var}/log/exim/* -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.smtp +%attr(770,root,exim) %dir %{_var}/spool/exim +%attr(750,exim,exim) %dir %{_var}/spool/exim/db +%attr(700,exim,root) %dir %{_var}/spool/exim/input +%attr(750,exim,root) %dir %{_var}/spool/exim/msglog %if %{with dynamic} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/modules @@ -407,7 +401,14 @@ fi %{?with_sqlite:%attr(755,root,root) %{_libdir}/%{name}/modules/sqlite.so} %{?with_whoson:%attr(755,root,root) %{_libdir}/%{name}/modules/whoson.so} %endif -%{_mandir}/man8/* +%{_mandir}/man8/exicyclog.8* +%{_mandir}/man8/exigrep.8* +%{_mandir}/man8/exim.8* +%{_mandir}/man8/exim_*.8* +%{_mandir}/man8/eximstats.8* +%{_mandir}/man8/exinext.8* +%{_mandir}/man8/exiqsumm.8* +%{_mandir}/man8/exiwhat.8* %files X11 %defattr(644,root,root,755) @@ -415,6 +416,7 @@ fi %attr(755,root,root) %{_bindir}/eximon.bin %{_desktopdir}/eximon.desktop %{_pixmapsdir}/eximon.png +%{_mandir}/man8/eximon.8* %files devel %defattr(644,root,root,755)