--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec 2020/06/28 04:00:44 1.39 +++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec 2022/04/06 03:11:52 1.53 @@ -1,50 +1,23 @@ -# $Id: smeserver-qpsmtpd.spec,v 1.38 2020/06/28 03:27:16 jpp Exp $ +# $Id: smeserver-qpsmtpd.spec,v 1.52 2022/04/05 22:12:02 jpp Exp $ Summary: SME Server qpsmtpd module %define name smeserver-qpsmtpd Name: %{name} -%define version 2.6.0 -%define release 36 +%define version 2.7.0 +%define release 10 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz -Patch0: smeserver-qpsmtpd-2.6.0-PERMS.patch -Patch1: smeserver-qpsmtpd-2.6.0-compat_with_0.96.patch -Patch2: smeserver-qpsmtpd-2.6.0-remove_obsolete_badrcptto_pattern_conf.patch -Patch3: smeserver-qpsmtpd-2.6.0-dhparam.patch -Patch4: smeserver-qpsmtpd-2.6.0-karma.patch -Patch5: smeserver-qpsmtpd-2.6.0-loadcheck.patch -Patch6: smeserver-qpsmtpd-2.6.0-bogus_bounce.patch -Patch7: smeserver-qpsmtpd-2.6.0-use_clamdscan_plugin.patch -Patch8: smeserver-qpsmtpd-2.6.0-set_karma_negative.patch -Patch9: smeserver-qpsmtpd-2.6.0-change_rbl_sbl_list_separator.patch -Patch10: smeserver-qpsmtpd-2.6.0-add_uribl_support.patch -Patch11: smeserver-qpsmtpd-2.6.0-helo_default_to_rfc.patch -Patch12: smeserver-qpsmtpd-2.6.0-use_naughty_plugin.patch -Patch13: smeserver-qpsmtpd-2.6.0-karma_before_earlytalker.patch -Patch14: smeserver-qpsmtpd-2.6.0-external_badrcptto.patch -Patch15: smeserver-qpsmtpd-2.6.0-smtpd_to_qpsmtpd.patch -Patch16: smeserver-qpsmtpd-2.6.0-inbound_spf.patch -Patch17: smeserver-qpsmtpd-2.6.0-inbound_dkim.patch -Patch18: smeserver-qpsmtpd-2.6.0-inbound_dmarc.patch -Patch19: smeserver-qpsmtpd-2.6.0-dkim_signing.patch -Patch20: smeserver-qpsmtpd-2.6.0-init_dmarc_report_db.patch -Patch21: smeserver-qpsmtpd-2.6.0-dmarc_settings_bool.patch -Patch22: smeserver-qpsmtpd-2.6.0-dmarc_reporting.patch -Patch23: smeserver-qpsmtpd-2.6.0-spf_reject_policy.patch -Patch24: smeserver-qpsmtpd-2.6.0-fix_syntax_in_print_dns.patch -Patch25: smeserver-qpsmtpd-2.6.0-set_dkim_option_after_key.patch -Patch26: smeserver-qpsmtpd-2.6.0-remove_o_and_r_dkim_fields.patch -Patch27: smeserver-qpsmtpd-2.6.0-missing_default_props.patch -Patch28: smeserver-qpsmtpd-2.6.0-fix_disabling_dmarc_reports.patch -Patch29: smeserver-qpsmtpd-2.6.0-spf_and_dmarc_reject_off.patch -Patch30: smeserver-qpsmtpd-2.6.0-disable_dmarc_report.patch -Patch31: smeserver-qpsmtpd-2.6.0-log_dmarc_send_reports_output.patch -Patch32: smeserver-qpsmtpd-2.6.0-bz10290-forcespamcheck.patch -Patch33: smeserver-qpsmtpd-2.6.0-bz10460-better-Cipher-and-Protocol.patch -Patch34: smeserver-qpsmtpd-2.6.0-bz10368-expand-badrcptto_ext.patch +Patch0: smeserver-qpsmtpd-2.7.0-bz10958-preset.patch +Patch1: smeserver-qpsmtpd-2.7.0-bz11492-reject_threshold-deprecated.patch +Patch2: smeserver-qpsmtpd-2.7.0-bz11648-tnef2mime.patch +Patch3: smeserver-qpsmtpd-2.7.0-11759.patch +Patch4: smeserver-qpsmtpd-2.7.0-bz10289-spamcheck-fetchedmail.patch +Patch5: smeserver-qpsmtpd-2.7.0-bz11864.patch +Patch6: smeserver-qpsmtpd-2.7.0-bz11858-softlimit.patch +Patch7: smeserver-qpsmtpd-2.7.0-bz11933-pseudoemail.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: qpsmtpd >= 0.96-19 @@ -57,6 +30,7 @@ Requires: qpsmtpd-plugins >= 0.0.1-sme04 Requires: ipsvd Requires: e-smith-lib >= 1.16.0-08 Requires: e-smith-cvm-unix-local +Requires: smeserver-clamav >= 2.7.0 Obsoletes: e-smith-obtuse-smtpd Obsoletes: e-smith-qmail-smtpd Obsoletes: e-smith-mailfront @@ -79,16 +53,59 @@ AutoReqProv: no SME Server qpsmtpd smtpd module %changelog -* Sat Jun 27 2020 Jean-Philipe Pialasse 2.6.0-36.sme +* Tue Apr 05 2022 Jean-Philippe Pialasse 2.7.0-10.sme +- fix unable to set internal only pseudonym as full email [SME: 11933] + +* Tue Apr 05 2022 Jean-Philippe Pialasse 2.7.0-9.sme +- add softlimit template for qpsmtpd [SME: 11858] + increase softlimit to 50000000. + +* Thu Feb 10 2022 Jean-Philippe Pialasse 2.7.0-8.sme +- fix regression Set the default helo policy to lenient [SME: 11864] + +* Tue Nov 16 2021 Jean-Philippe Pialasse 2.7.0-7.sme +- mail sent on 127.0.0.200:25 should be spam checked [SME: 10289] + filtering again fetchmail originating mails + +* Mon Nov 15 2021 Jean-Philippe Pialasse 2.7.0-6.sme +- sighup on reload [SME: 11759] + +* Thu Sep 16 2021 Jean-Philippe Pialasse 2.7.0-5.sme +- fix tnef2mime FATAL PLUGIN ERROR [SME: 11648] + this will be a temp fix by redefining MIME::Parser::Filer::output_path + until it has been fixed upstream + +* Tue Mar 30 2021 Jean-Philippe Pialasse 2.7.0-3.sme +- update depreacted reject_threshold to reject [SME: 11492] + +* Fri Feb 12 2021 Jean-Philippe Pialasse 2.7.0-2.sme +- remove /usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset [SME: 10958] + +* Wed Dec 16 2020 John Crisp 2.7.0-1.sme +- modify for clamav 0.103.0 [SME: 11210] +- roll up patches + +* Thu Dec 10 2020 Michel Begue 2.6.0-40.sme +- add Requires=runit.service (qpsmtpd & sqpsmtpd) [SME: 11245] + +* Sun Dec 06 2020 Jean-Philippe Pialasse 2.6.0-39.sme +- fix service not enabled [SME: 11107] + remove reset-unsavedflag + +* Fri Nov 27 2020 Michel Begue 2.6.0-37.sme +- Move qpsmtpd & sqpsmtpd services to systemd [SME: 11107] +- Create smeserver-qpsmtpd-update event [SME: 11164] + +* Sat Jun 27 2020 Jean-Philippe Pialasse 2.6.0-36.sme - expand badrcptto_ext when needed [SME: 10638] this avoid user, group or pseudonyms for internal purpose to be reachable from outside -* Sat May 02 2020 Jean-Philipe Pialasse 2.6.0-34.sme +* Sat May 02 2020 Jean-Philippe Pialasse 2.6.0-34.sme - minimum Protocol TLSv1.0 [SME: 10460] better ciphers order. -* Sun Mar 11 2018 Jean-Philipe Pialasse 2.6.0-32.sme +* Sun Mar 11 2018 Jean-Philippe Pialasse 2.6.0-32.sme - add forcespamcheck support for fetchmail [SME: 10290] * Thu Aug 3 2017 Daniel Berteaud 2.6.0-31.sme @@ -98,11 +115,11 @@ SME Server qpsmtpd smtpd module * Sat May 20 2017 Daniel Berteaud 2.6.0-30.sme - Turn DMARC reporting off by default [SME: 10303] -* Wed Apr 12 2017 Jean-Philipe Pialasse 2.6.0-29.sme +* Wed Apr 12 2017 Jean-Philippe Pialasse 2.6.0-29.sme - update patch smeserver-qpsmtpd-2.6.0-smtpd_to_qpsmtpd.patch [SME: 9478] - Greeting property was still attached to smtpd in a template -* Mon Feb 27 2017 Jean-Philipe Pialasse 2.6.0-28.sme +* Mon Feb 27 2017 Jean-Philippe Pialasse 2.6.0-28.sme - updated regex for RBL and SBL in smeserver-qpsmtpd-2.6.0-change_rbl_sbl_list_separator.patch - to take into account list using a subdomain [SME: 10123] - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, @@ -195,7 +212,7 @@ SME Server qpsmtpd smtpd module * Sat Apr 16 2016 Daniel Berteaud 2.6.0-3.sme - Adapt for qpsmtpd-0.96 (mainly plugin renamed) [SME: 9460] -* Tue Mar 29 2016 Jean-Philipe Pialasse 2.6.0-2.sme +* Tue Mar 29 2016 Jean-Philippe Pialasse 2.6.0-2.sme - fix warning on spool_dir perms [SME: 9408] - smeserver-qpsmtpd-2.6.0-PERMS.patch @@ -890,6 +907,7 @@ SME Server qpsmtpd smtpd module %prep %setup %patch0 -p1 +rm -rf root/usr/lib/systemd/system-preset %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -897,33 +915,7 @@ SME Server qpsmtpd smtpd module %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 + %build perl createlinks @@ -1007,7 +999,7 @@ rm -f %{name}-%{version}-%{release}-file --dir /var/log/sqpsmtpd "attr(2750,smelog,smelog)" \ \ --file /var/service/sqpsmtpd/sqpsmtpd "attr(0755,root,root)" \ - --dir /var/spool/qpsmtpd "attr(2750,qpsmtpd,clamav)" \ + --dir /var/spool/qpsmtpd "attr(2750,qpsmtpd,clamscan)" \ --dir /var/lib/qpsmtpd/karma "attr(2750,qpsmtpd,qpsmtpd)" \ --dir /var/lib/qpsmtpd/dmarc "attr(2750,qpsmtpd,qpsmtpd)" \ --dir /home/e-smith/dkim_keys "attr(2750,root,qpsmtpd)" \ @@ -1029,6 +1021,11 @@ true %post +#Fix spool perms on clam upgrade +if [[ -d /var/spool/qpsmtpd ]]; then + chown qpsmtpd:clamscan /var/spool/qpsmtpd; +fi + %clean rm -rf $RPM_BUILD_ROOT