--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec 2016/05/16 10:19:41 1.23 +++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec 2021/03/30 17:04:58 1.46 @@ -1,43 +1,20 @@ -# $Id: smeserver-qpsmtpd.spec,v 1.22 2016/05/07 06:56:27 vip-ire Exp $ +# $Id: smeserver-qpsmtpd.spec,v 1.45 2021/02/13 04:54:03 jpp Exp $ Summary: SME Server qpsmtpd module %define name smeserver-qpsmtpd Name: %{name} -%define version 2.6.0 -%define release 22 +%define version 2.7.0 +%define release 3 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 +Patch0: smeserver-qpsmtpd-2.7.0-bz10958-preset.patch +Patch1: smeserver-qpsmtpd-2.7.0-bz11492-reject_threshold-deprecated.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot -Requires: qpsmtpd >= 0.96 +Requires: qpsmtpd >= 0.96-19 Requires: perl(Mail::DKIM) Requires: perl(Mail::DKIM::DkSignature) Requires: perl(ClamAV::Client) @@ -47,6 +24,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 @@ -69,6 +47,74 @@ AutoReqProv: no SME Server qpsmtpd smtpd module %changelog +* 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-Philipe 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-Philipe 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-Philipe 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 +- minimum Protocol TLSv1.0 [SME: 10460] + better ciphers order. + +* Sun Mar 11 2018 Jean-Philipe Pialasse 2.6.0-32.sme +- add forcespamcheck support for fetchmail [SME: 10290] + +* Thu Aug 3 2017 Daniel Berteaud 2.6.0-31.sme +- Log DMARC reporting in syslog instead of sending email to the admin. + Also suppress SSL connection failed warnings [SME: 10298] + +* 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 +- 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 +- 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, + by assuming the date is correct and changing the weekday. + Thu May 11 2005 --> Thu May 05 2005 or Wed May 11 2005 or Thu May 12 2005 or .... + Sun Sep 25 2010 --> Sun Sep 19 2010 or Sat Sep 25 2010 or Sun Sep 26 2010 or .... + +* Tue Jul 12 2016 Daniel Berteaud 2.6.0-27.sme +- Turn SPF and DMARC rejects off by default [SME: 9664] + +* Fri Jun 17 2016 Daniel Berteaud 2.6.0-26.sme +- Fix disabling DMARC reporting [SME: 9206] + +* Tue Jun 7 2016 Daniel Berteaud 2.6.0-25.sme +- Add missing tnef2mime and MaximumDateOffset to qpsmtpd [SME: 9560] + +* Fri May 27 2016 Daniel Berteaud 2.6.0-24.sme +- Create missing directories for DKIM keys [SME: 9496] +- Create missing directory for the DMARC report database [SME: 9206] + +* Tue May 24 2016 Daniel Berteaud 2.6.0-23.sme +- Remove o and r DKIM fields as they are not standard [SME: 9496] + * Mon May 16 2016 Daniel Berteaud 2.6.0-22.sme - In qpsmtpd-print-dns set DKIM options after the public key so the string will still be splitted correctly [SME: 9496] @@ -209,10 +255,12 @@ SME Server qpsmtpd smtpd module * Fri Oct 1 2010 Daniel Berteaud 2.2.0-10.sme - Fix RelayRequiresAuth for local network [SME: 5575] -* Sun Sep 25 2010 Shad L. Lords 2.2.0-9.sme +* Sat Sep 25 2010 Shad L. Lords 2.2.0-9.sme + Sun Sep 25 2010 --> Sun Sep 19 2010 or Sat Sep 25 2010 or Sun Sep 26 2010 or .... - Make tls ciphers configurable [SME: 6241] -* Sun Sep 25 2010 Shad L. Lords 2.2.0-8.sme +* Sat Sep 25 2010 Shad L. Lords 2.2.0-8.sme + Sun Sep 25 2010 --> Sun Sep 19 2010 or Sat Sep 25 2010 or Sun Sep 26 2010 or .... - Require auth for all relays (local too) [SME: 5575] * Sat Jun 5 2010 Ian Wells 2.2.0-7.sme @@ -716,16 +764,19 @@ SME Server qpsmtpd smtpd module - Make sure that empty templates-begin files exist in peers/{0,local} templates directories. -* Thu May 11 2005 Gordon Rowell +* Wed May 11 2005 Gordon Rowell + Thu May 11 2005 --> Thu May 05 2005 or Wed May 11 2005 or Thu May 12 2005 or .... - [0.0.4-12] - Fix up config/relayclients - need a dot after network blocks -* Thu May 11 2005 Gordon Rowell +* Wed May 11 2005 Gordon Rowell + Thu May 11 2005 --> Thu May 05 2005 or Wed May 11 2005 or Thu May 12 2005 or .... - [0.0.4-11] - Also regenerate goodrcptto in {user,pseudonym}-modify, since details about the account may have changed -* Thu May 11 2005 Gordon Rowell +* Wed May 11 2005 Gordon Rowell + Thu May 11 2005 --> Thu May 05 2005 or Wed May 11 2005 or Thu May 12 2005 or .... - [0.0.4-10] - Actually regenerate goodrcptto in the events mentioned in 0.0.3-01 (typo in createlinks) @@ -828,35 +879,15 @@ SME Server qpsmtpd smtpd module %prep %setup %patch0 -p1 +rm -rf root/usr/lib/systemd/system-preset %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%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 %build perl createlinks mkdir -p root/var/lib/qpsmtpd/karma +mkdir -p root/var/lib/qpsmtpd/dmarc +mkdir -p root/home/e-smith/dkim_keys/default +mkdir -p root/var/service/qpsmtpd/config/dkim PEERS_CONFIG=root/etc/e-smith/templates/var/service/qpsmtpd/config/peers mkdir -p $PEERS_CONFIG/0 @@ -933,7 +964,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)" \ @@ -955,6 +986,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