--- rpms/qpsmtpd/sme8/qpsmtpd.spec 2009/11/03 21:53:04 1.21 +++ rpms/qpsmtpd/sme8/qpsmtpd.spec 2013/04/30 02:36:21 1.35 @@ -1,15 +1,15 @@ -# $Id: qpsmtpd.spec,v 1.20 2009/10/31 16:50:52 slords Exp $ +# $Id: qpsmtpd.spec,v 1.34 2013/04/25 02:16:34 burnat Exp $ Name: qpsmtpd -Version: 0.83 -Release: 0.5%{?dist} +Version: 0.84 +Release: 5%{?dist} Summary: qpsmtpd + qpsmtpd-apache + qpsmtpd-async -License: distributable +License: MIT Group: System Environment/Daemons URL: http://smtpd.develooper.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl >= 0:5.00503 -BuildArchitectures: noarch +BuildArch: noarch Requires: perl(Mail::Header), perl(Net::DNS) perl(Net::IP) Requires(pre): coreutils, shadow-utils, perl @@ -22,12 +22,51 @@ Source5: in.qpsmtpd Source6: qpsmtpd.conf Source7: README.selinux -Patch10: qpsmtpd-0.83-loginit.patch +Patch1: 0001-Misc-documentation-updates.patch +Patch2: 0002-added-ClamAV-version-to-the-X-Virus-Checked-header.patch +Patch3: 0003-new-plugin-check_bogus_bounce.patch +Patch4: 0004-microoptimizations-replace-regex-with-lc-eq.patch +Patch5: 0005-remove-vestiges-of-a-bygone-RCS.patch +Patch6: 0006-added-definedness-test-to-local_port-as-it-was-emitt.patch +Patch7: 0007-Add-guidelines-for-commit-messages.patch +Patch8: 0008-added-auth_checkpassword-plugin.patch +Patch9: 0009-updates-to-auth_vpopmail_sql-module.patch +Patch10: 0010-new-plugin-auth_vpopmaild.patch +Patch11: 0011-start-working-on-Changes-file-for-0.84-next.patch +Patch12: 0012-fix-copy-paste-error-in-auth_flat_file.patch +Patch13: 0013-added-auth_vpopmail-plugin.patch +Patch14: 0014-rewrote-sender_permitted_from.patch +Patch15: 0015-add-TCPLOCAL-variables-to-qp-connection.patch +Patch16: 0016-added-local_ip-option-to-p0f-plugin.patch +Patch17: 0017-added-p0f-support-to-greylist-plugin.patch +Patch18: 0018-packaging-updates.patch +Patch19: 0019-Check-for-the-exact-string-resonses-from-vpopmaild-r.patch +Patch20: 0020-new-plugin-check_badmailfrom_patterns.patch +Patch21: 0021-ignore-search-path-in-DNS-lookups.patch +Patch22: 0022-don-t-create-homedir-in-RPM.patch +Patch23: 0023-corrected-email-address.patch +Patch24: 0024-increased-default-TLS-security-setting.patch +Patch25: 0025-give-badrcptto-a-reasonable-name.patch +Patch26: 0026-add-test-name-to-test-output.patch +Patch27: 0027-renamed-test-from-foo-to-rcpt_ok.patch +Patch28: 0028-Shorten-clarify-Connection-and-Transaction-notes.patch +Patch29: 0029-Run-hook_reset_transaction-after-all-connections.patch +Patch30: 0030-Add-support-for-multiple-postfix-cleanup-sockets.patch +Patch31: 0031-Adds-the-ability-to-have-multiple-instances-each-wit.patch +Patch32: 0032-I-forgot-to-sync-the-code-that-calls-the-original-co.patch +Patch33: 0033-new-plugin-rcpt_map.patch +Patch34: 0034-plugins-rcpt_map-cleanup.patch +Patch35: 0035-Fix-for-plugins-returning-DONE-from-HELO-EHLO.patch +Patch36: 0036-prefork-use-new-instance-instead-of-cloning.patch +Patch37: 0037-Revert-Spool-body-when-transaction-body_fh-is-called.patch +Patch38: 0038-Patch-FATAL-PLUGIN-ERROR-check_basicheaders.patch +Patch39: 0039-qpsmtpd-0.84-spamassassin_size_limit.patch +Patch40: 0040-qpsmtpd-forkserver_fix_Net_DNS_update_breaks_qpsmtpd.patch Patch100: qpsmtpd-0.40-badrcptto_allowrelay.patch Patch101: qpsmtpd-0.83-peer_hooks.patch -Patch102: qpsmtpd-0.83-clamd_conf.patch -Patch103: qpsmtpd-0.83-clamav-headers.patch +Patch102: qpsmtpd-0.83-loginit.patch +Patch103: qpsmtpd-forkserver-keepalive.patch %description qpsmtpd is a flexible smtpd daemon written in Perl. Apart from the core @@ -58,12 +97,51 @@ qpsmpd-async which uses it. %prep %setup -q +%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 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 + %patch100 -p1 %patch101 -p1 %patch102 -p1 -%patch103 -p1 - +%patch103 -p0 %build CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLSITELIB=%{_prefix}/lib/perl5/site_perl @@ -78,14 +156,14 @@ eval `perl '-V:installarchlib'` mkdir -p $RPM_BUILD_ROOT/$installarchlib if grep -q DESTDIR Makefile then - make DESTDIR=$RPM_BUILD_ROOT - find blib/lib -name '*.pm.*' -exec rm -f {} \; - make DESTDIR=$RPM_BUILD_ROOT install + make DESTDIR=$RPM_BUILD_ROOT + find blib/lib -name '*.pm.*' -exec rm -f {} \; + make DESTDIR=$RPM_BUILD_ROOT install else - make PREFIX=$RPM_BUILD_ROOT/usr - find blib/lib -name '*.pm.*' -exec rm -f {} \; - make PREFIX=$RPM_BUILD_ROOT/usr install + make PREFIX=$RPM_BUILD_ROOT/usr + find blib/lib -name '*.pm.*' -exec rm -f {} \; + make PREFIX=$RPM_BUILD_ROOT/usr install fi mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name} rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/plugins/*.* @@ -111,20 +189,19 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir} cp %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-apache-%{version} cp %{SOURCE7} $RPM_BUILD_ROOT%{_docdir}/%{name}-apache-%{version} -rm -f ${RPM_BUILD_ROOT}%{_bindir}/%{name}-prefork [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress find ${RPM_BUILD_ROOT}%{_prefix} \( -name perllocal.pod -o -name .packlist \) -exec rm {} \; find ${RPM_BUILD_ROOT}%{_prefix} -type f -print | \ - sed "s@^$RPM_BUILD_ROOT@@g" | \ - grep -v [Aa]sync | \ - grep -v packaging | \ - grep -v README.selinux | \ - grep -v /Apache | \ - grep -v /Danga | \ - grep -v Qpsmtpd/ConfigServer.pm | \ - grep -v Qpsmtpd/PollServer.pm > %{name}-%{version}-%{release}-filelist + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v [Aa]sync | \ + grep -v packaging | \ + grep -v README.selinux | \ + grep -v /Apache | \ + grep -v /Danga | \ + grep -v Qpsmtpd/ConfigServer.pm | \ + grep -v Qpsmtpd/PollServer.pm > %{name}-%{version}-%{release}-filelist if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then echo "ERROR: EMPTY FILE LIST" exit -1 @@ -137,8 +214,6 @@ fi %config(noreplace) %{_sysconfdir}/qpsmtpd/* %config(noreplace) %{_sysconfdir}/xinetd.d/smtp %config(noreplace) %{_sysconfdir}/sysconfig/qpsmtpd-forkserver -%attr(2750,qpsmtpd,clamav) %dir %{_localstatedir}/spool/qpsmtpd -%attr(2750,smelog,smelog) %dir %{_localstatedir}/log/qpsmtpd %files apache %defattr(-,root,root) @@ -159,37 +234,57 @@ fi %{_datadir}/%{name}/plugins/async/* %pre -if ! id smtpd >/dev/null 2>&1 -then - # need to create smtpd user. - if perl -e 'exit ! defined(getgrnam("postdrop"))' - then - # if postfix is installed, we will probably use - # queue/postfix, which will need this: - supp="-G postdrop" - fi - useradd -r -m $supp smtpd -fi %changelog -* Tue Nov 3 2009 0.83-0.5.sme +* Thu Apr 25 2013 chris burnat 0.84-5.sme +- Fix Net::DNS update breaks qpsmtpd, codes suggested by Ian [SME: 7194] + +* Tue Apr 23 2013 chris burnat 0.84-4.sme +- qpsmtpd allows the spamassassin plugin to read the size limit + from its arguments, patch by Daniel [SME: 7541] + +* Fri May 04 2012 Charlie Brady 0.84-3.sme +- Set SO_KEEPALIVE option on client socket - to detect dead + connections. [SME: 6924] + +* Sun Nov 14 2010 0.84-2.sme +- Sync with upstream git repo. +- Fix require_resolvable_fromhost doesn't work [SME: 6369] +- Fix TLS security defaults [SME: 6241] +- Fix fatal errors when mail has no headers [SME: 6345] + +* Wed Apr 14 2010 0.84-0.1.sme +- Update to 0.84 +- add sme specific patches + +* Wed Mar 3 2010 0.83-0.7.sme +- Remove spool and log dir from package (in smeserver-qpsmtpd) +- Don't create smtpd user (unused in sme) [SME: 5815] + +* Thu Nov 5 2009 0.83-0.6.sme +- Apply qpsmtpd git changesets to implement custom SPAM + subject prefix [SME: 5031] + +* Tue Nov 3 2009 0.83-0.5.sme - Update pre requires so scripts don't fail on install [SME: 5558] -* Sat Oct 31 2009 0.83-0.4.sme +* Sat Oct 31 2009 0.83-0.4.sme - Rebase bad_rcptto patch to remove orig file [SME: 5548] - Change logging in tls init to prevent warnings [SME: 5551] -* Thu Oct 29 2009 0.83-0.3.sme +* Thu Oct 29 2009 0.83-0.3.sme - Only run/initialize plugins once [SME: 5533] * Mon Oct 26 2009 0.83-0.2.sme - Change spool dir permissions and owner to qpsmtpd:clamav - Change log dir permissions and owner to smelog:smelog -* Fri Sep 18 2009 0.83-0.1.sme -- Update to 0.83 +* Tue Sep 22 2009 0.83-0.1.sme - add sme specific patches +* Fri Sep 18 2009 0.83-0.1 +- Update to 0.83 + * Sun Jul 12 2009 0.82-0.1 - Update to latest release - don't add qpsmtpd to start-up by default