--- rpms/smeserver-qpsmtpd/sme7/smeserver-qpsmtpd.spec 2007/06/12 17:33:48 1.1 +++ rpms/smeserver-qpsmtpd/sme7/smeserver-qpsmtpd.spec 2008/07/24 18:18:07 1.19 @@ -2,7 +2,7 @@ Summary: SME Server qpsmtpd module %define name smeserver-qpsmtpd Name: %{name} %define version 1.2.1 -%define release 39 +%define release 55 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -37,11 +37,25 @@ Patch25: smeserver-qpsmtpd-1.2.1-logters Patch26: smeserver-qpsmtpd-1.2.1-logterse_stats.patch Patch27: smeserver-qpsmtpd-1.2.1-qplogsumm.patch Patch28: smeserver-qpsmtpd-1.2.1-logterse.patch2 +Patch29: smeserver-qpsmtpd-1.2.1-qpsmtpd40.patch +Patch30: smeserver-qpsmtpd-1.2.1-qpsmtpd40.patch2 +Patch31: smeserver-qpsmtpd-1.2.1-disclaimer.patch +Patch32: smeserver-qpsmtpd-1.2.1-disclaimer.patch2 +Patch33: smeserver-qpsmtpd-1.2.1-rblsbl.patch2 +Patch34: smeserver-qpsmtpd-1.2.1-hosts_allow.patch +Patch35: smeserver-qpsmtpd-1.2.1-dnsbl_disconnect.patch +Patch36: smeserver-qpsmtpd-1.2.1-timeouts.patch +Patch37: smeserver-qpsmtpd-1.2.1-badrcptto_empty_local.patch +Patch38: smeserver-qpsmtpd-1.2.1-templatebegin.patch +Patch39: smeserver-qpsmtpd-1.2.1-qplogsummStatus.patch +Patch40: smeserver-qpsmtpd-1.2.1-logdebug.patch +Patch41: smeserver-qpsmtpd-1.2.1-dividezerofix.patch +Patch42: smeserver-qpsmtpd-1.2.1-rblsbl.patch3 +Patch43: smeserver-qpsmtpd-1.2.1-FixDisclaimerEmptyLines.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot -Requires: qpsmtpd >= 0.32-4.el4.sme +Requires: qpsmtpd >= 0.40 Requires: perl(Mail::DKIM) Requires: perl(Mail::DKIM::DkSignature) -Conflicts: qpsmtpd >= 0.33 Requires: daemontools Requires: qpsmtpd-plugins >= 0.0.1-sme04 Requires: ipsvd @@ -68,6 +82,60 @@ AutoReqProv: no SME Server qpsmtpd smtpd module %changelog +* Wed Jul 23 2008 Gavin Weight 1.2.1-55 +- Fix empty lines and add feature to specify disclaimer directory. + (thanks, Federico Simoncelli). [SME: 3244] + +* Thu Apr 17 2008 Gavin Weight 1.2.1-54 +- Migrate ordb.net entries away. [SME: 4214] + +* Tue Jan 29 2008 Filippo Carletti 1.2.1-53 +- Enable auth plugin for local connections. [SME: 2631] + +* Thu Jan 10 2008 Gavin Weight 1.2.1-52 +- Fix divide by zero error on log rotate. [SME: 3620] + +* Wed Jan 09 2008 Stephen Noble 1.2.1-51 +- check_smtp_forward changed from loginfo to logdebug [SME: 3471] + +* Mon Jan 7 2008 Stephen Noble 1.2.1-50 +- disable qplogsumm by deafult [SME: 3727] + +* Mon Jan 7 2008 Stephen Noble 1.2.1-49 +- rename template-begin fragments [SME: 2333] + +* Mon Oct 29 2007 Charlie Brady 1.2.1-48 +- Add badrcptto_pattern rule to block "null" recipient addresses. + [SME: 3476] + +* Thu Sep 6 2007 Charlie Brady 1.2.1-47 +- Add configurable timeouts during SMTP command parsing and message + body receipt. [SME: 3377] + +* Thu Sep 6 2007 Charlie Brady 1.2.1-46 +- Disconnect immediately if dnsbl plugin rejects recipient addresses + (and therefore would never accept the message). [SME: 3352] + +* Thu Sep 6 2007 Charlie Brady 1.2.1-45 +- Configure hosts_allow plugin, which use the pre_connection hook + and therefore needs to be done before the 'peers' plugin. + [SME: 3352] + +* Fri Aug 03 2007 Charlie Brady 1.2.1-44 +- Fix rbl migrate fragment (thanks, Mike McCarn). [SME: 3229] + +* Sun Jun 17 2007 Shad L. Lords 1.2.1-43 +- Updates for disclaimer plugin [SME: 2648] + +* Sat Jun 16 2007 Shad L. Lords 1.2.1-42 +- Add disclaimer plugin disabled by default [SME: 2648] + +* Thu Jun 14 2007 Shad L. Lords 1.2.1-41 +- Update for new features in qpsmtpd v0.40 + +* Thu Jun 14 2007 Shad L. Lords 1.2.1-40 +- Remove conflicts qpsmtpd >= 0.33 + * Sat Jun 9 2007 Shad L. Lords 1.2.1-39 - Update to correct version of qplogsumm.pl [SME: 2971] @@ -625,6 +693,21 @@ SME Server qpsmtpd smtpd module %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 %build perl createlinks @@ -658,7 +741,6 @@ mkdir -p $PEERS_CONFIG/0 mkdir -p $PEERS_CONFIG/local DISABLE_LOCAL=" -05auth_cvm_unix_local 10check_earlytalker 12count_unrecognized_commands 16require_resolvable_fromhost @@ -672,6 +754,15 @@ do echo "# $file disabled for local connections" > $PEERS_CONFIG/local/$file done +DISABLE_EXTERNAL=" +65disclaimer +" + +for file in $DISABLE_EXTERNAL +do + echo "# $file disabled for external connections" > $PEERS_CONFIG/0/$file +done + ( cd root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins for file in *