--- rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec 2007/06/16 17:48:11 1.6 +++ rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec 2009/11/07 12:38:09 1.28 @@ -1,47 +1,20 @@ +# $Id: smeserver-qpsmtpd.spec,v 1.27 2009/11/06 08:11:11 snetram Exp $ + Summary: SME Server qpsmtpd module %define name smeserver-qpsmtpd Name: %{name} -%define version 1.2.1 -%define release 42 +%define version 2.2.0 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch0: smeserver-qpsmtpd-1.2.1-LiteralIP.patch -Patch1: smeserver-qpsmtpd-1.2.1-badrcptto-hosts.patch -Patch2: smeserver-qpsmtpd-1.2.1-check_smtp_forward.patch -Patch3: smeserver-qpsmtpd-1.2.1-enable_check_smtp_forward.patch -Patch4: smeserver-qpsmtpd-1.2.1-bcc_mode.patch -Patch5: smeserver-qpsmtpd-1.2.1-peers_plugin.patch -Patch6: smeserver-qpsmtpd-1.2.1-peers_plugin.patch2 -Patch7: smeserver-qpsmtpd-1.2.1-usepeers.patch -Patch8: smeserver-qpsmtpd-1.2.1-usepeers.patch2 -Patch9: smeserver-qpsmtpd-1.2.1-rcpthosts_regenerated.patch -Patch10: smeserver-qpsmtpd-1.2.1-mergetnef2mime.patch -Patch11: smeserver-qpsmtpd-1.2.1-usepeers.patch3 -Patch12: smeserver-qpsmtpd-1.2.1-usepeers.patch4 -Patch13: smeserver-qpsmtpd-1.2.1-control1.patch -Patch14: smeserver-qpsmtpd-1.2.1-control1.patch3 -Patch15: smeserver-qpsmtpd-1.2.1-peersinit.patch -Patch16: smeserver-qpsmtpd-1.2.1-rblsbl.patch -Patch17: smeserver-qpsmtpd-1.2.1-peersauth.patch -Patch18: smeserver-qpsmtpd-1.2.1-peersauth.patch2 -Patch19: smeserver-qpsmtpd-1.2.1-badmailfrom.patch -Patch20: smeserver-qpsmtpd-1.2.1-nowhitelist.patch -Patch21: smeserver-qpsmtpd-1.2.1-dkim.patch -Patch22: smeserver-qpsmtpd-1.2.1-keeptnef.patch -Patch23: smeserver-qpsmtpd-1.2.1-softlimit.patch -Patch24: smeserver-qpsmtpd-1.2.1-rcpthost.patch -Patch25: smeserver-qpsmtpd-1.2.1-logterse.patch -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 +Patch1: smeserver-qpsmtpd-2.2.0-qpsmtpd83.patch +Patch2: smeserver-qpsmtpd-2.2.0-spamsubject.patch +Patch3: smeserver-qpsmtpd-2.2.0-expand-template.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot -Requires: qpsmtpd >= 0.40 +Requires: qpsmtpd >= 0.83 Requires: perl(Mail::DKIM) Requires: perl(Mail::DKIM::DkSignature) Requires: daemontools @@ -70,6 +43,74 @@ AutoReqProv: no SME Server qpsmtpd smtpd module %changelog +* Sat Nov 7 2009 Jonathan Martens 2.2.0-5.sme +- Tie template fragment into event system to have it expanded [SME: 5031] + +* Fri Nov 6 2009 Jonathan Martens 2.2.0-4.sme +- Add qpsmtpd template fragment for custom SPAM subject prefix [SME: 5031] + +* Thu Oct 29 2009 Shad L. Lords 2.0.0-3.sme +- Add hooks cleanout back in in so auth works. + +* Thu Oct 29 2009 Shad L. Lords 2.2.0-2.sme +- Add compatibility with qpsmtpd 0.83 [SME: 5543] +- Add tls to base config [SME: 1076] + +* Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Sun Oct 5 2008 Shad L. Lords 1.2.1-57 +- Fix migrate fragment for zen.spamhaus.org [SME: 2116] + +* Sun Oct 5 2008 Shad L. Lords 1.2.1-56 +- Migrate sbl-xbl.spamhaus.org to zen.spamhaus.org [SME: 2116] +- Remove blackhole.securitysage.com [SME: 4623] + +* 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] @@ -607,38 +648,9 @@ SME Server qpsmtpd smtpd module %prep %setup -%patch0 -p1 %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 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 %build perl createlinks @@ -662,6 +674,7 @@ do done ln -s ../qpsmtpd/config root/var/service/sqpsmtpd/config +ln -s ../qpsmtpd/ssl root/var/service/sqpsmtpd/ssl mkdir -p root/etc/e-smith/templates/var/service/qpsmtpd/peers/{0,local} touch root/etc/e-smith/templates/var/service/qpsmtpd/peers/{0,local}/template-begin @@ -672,7 +685,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