--- rpms/qpsmtpd/sme10/qpsmtpd.spec 2016/03/25 20:24:53 1.3 +++ rpms/qpsmtpd/sme10/qpsmtpd.spec 2016/04/16 11:27:05 1.4 @@ -1,9 +1,9 @@ -# $Id: qpsmtpd.spec,v 1.2 2016/02/09 21:17:36 stephdl Exp $ +# $Id: qpsmtpd.spec,v 1.12 2015/02/15 16:25:57 vip-ire Exp $ Name: qpsmtpd -Version: 0.84 -Release: 20%{?dist} -Summary: qpsmtpd + qpsmtpd-apache + qpsmtpd-async +Version: 0.96 +Release: 1%{?dist} +Summary: qpsmtpd + qpsmtpd-apache License: MIT Group: System Environment/Daemons URL: http://smtpd.develooper.com/ @@ -12,73 +12,22 @@ BuildRequires: perl >= 0:5.00503 BuildRequires: perl(ExtUtils::MakeMaker) BuildArch: noarch Requires: perl(Mail::Header), perl(Net::DNS) perl(Net::IP) -Requires: perl(IO::Socket::SSL) >= 1.70 Requires(pre): coreutils, shadow-utils, perl Source0: %{name}-%{version}.tar.gz Source1: qpsmtpd-forkserver.rc Source2: qpsmtpd-forkserver.sysconfig -Source3: qpsmtpd-plugin-file_connection -Source4: qpsmtpd-xinetd -Source5: in.qpsmtpd -Source6: qpsmtpd.conf -Source7: README.selinux - -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-loginit.patch -Patch103: qpsmtpd-forkserver-keepalive.patch -Patch104: qpsmtpd-0.84-accept-empty-email.patch -Patch105: qpsmtpd-0.84-fix_eq_operator.patch -Patch106: qpsmtpd-0.84-remove_denysoft_on_spf_softfail.patch -Patch107: qpsmtpd-0.84-notls_conf.patch -Patch108: qpsmtpd-0.84-disable_sslv3.patch -Patch109: qpsmtpd-0.84-make-dnsbl-more-whitelist_soft-aware.patch -Patch110: qpsmtpd-0.84-disable_tlsv1.patch -Patch111: qpsmtpd-0.84-deny_login_with_null.patch -Patch112: qpsmtpd-0.84-allow_tls_proto_from_config.patch -Patch113: qpsmtpd-0.84-Socket6.patch +Source3: qpsmtpd-xinetd +Source4: in.qpsmtpd +Source5: qpsmtpd.conf +Source6: README.selinux + +Patch1: qpsmtpd-0.95-spamassassin_size_limit.patch +Patch2: qpsmtpd-0.95-qpsmtpd_forserver_keepalive.patch +Patch3: qpsmtpd-0.95-notls_conf.patch +Patch4: qpsmtpd-0.95-allow_tls_proto_from_conf.patch +Patch5: qpsmtpd-0.96-set_hooks.patch +Patch6: qpsmtpd-0.96-warn_implicit_split.patch %description qpsmtpd is a flexible smtpd daemon written in Perl. Apart from the core @@ -93,19 +42,11 @@ Requires: perl(mod_perl2) Summary: mod_perl-2 connection handler for qpsmtpd Group: System Environment/Daemons -%package async -Summary: qpsmtpd using async I/O in a single process -Group: System Environment/Daemons - %description apache This module implements a mod_perl/apache 2.0 connection handler that turns Apache into an SMTP server using Qpsmtpd. -%description async -This package contains the Qpsmtpd::PollServer module, which allows -qpsmtd to handle many connections in a single process and the -qpsmpd-async which uses it. %prep %setup -q @@ -115,55 +56,6 @@ qpsmpd-async which uses it. %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 -p0 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 %build CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}" @@ -190,17 +82,16 @@ mkdir -p %{buildroot}%{_initrddir} cp %{SOURCE1} %{buildroot}%{_initrddir}/qpsmtpd-forkserver mkdir -p %{buildroot}%{_sysconfdir}/sysconfig cp %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/qpsmtpd-forkserver -cp %{SOURCE3} %{buildroot}%{_datadir}/%{name}/plugins/logging/file_connection mkdir -p %{buildroot}%{_localstatedir}/spool/qpsmtpd mkdir -p %{buildroot}%{_localstatedir}/log/qpsmtpd mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d -cp %{SOURCE4} %{buildroot}%{_sysconfdir}/xinetd.d/smtp +cp %{SOURCE3} %{buildroot}%{_sysconfdir}/xinetd.d/smtp mkdir -p %{buildroot}%{_sbindir} -cp %{SOURCE5} %{buildroot}%{_sbindir}/in.smtp +cp %{SOURCE4} %{buildroot}%{_sbindir}/in.smtp mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -cp %{SOURCE6} %{buildroot}%{_sysconfdir}/httpd/conf.d +cp %{SOURCE5} %{buildroot}%{_sysconfdir}/httpd/conf.d mkdir -p %{buildroot}%{_docdir}/%{name}-apache-%{version} -cp %{SOURCE7} %{buildroot}%{_docdir}/%{name}-apache-%{version} +cp %{SOURCE6} %{buildroot}%{_docdir}/%{name}-apache-%{version} [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress @@ -212,7 +103,6 @@ find %{buildroot}%{_prefix} -type f -pri 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" @@ -221,7 +111,7 @@ fi %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) -%doc CREDITS Changes LICENSE README README.plugins STATUS +%doc CREDITS Changes LICENSE README.md README.plugins.md STATUS %{_initrddir}/qpsmtpd-forkserver %config(noreplace) %{_sysconfdir}/qpsmtpd/* %config(noreplace) %{_sysconfdir}/xinetd.d/smtp @@ -234,20 +124,23 @@ fi %config(noreplace) %{_sysconfdir}/httpd/conf.d/* %doc %{_docdir}/%{name}-apache-%{version}/README.selinux -%files async -%defattr(-,root,root) -%{_bindir}/qpsmtpd-async -%{_prefix}/share/perl5/vendor_perl/Danga/Client.pm -%{_prefix}/share/perl5/vendor_perl/Danga/TimeoutSocket.pm -%{_prefix}/share/perl5/vendor_perl/Qpsmtpd/ConfigServer.pm -%{_prefix}/share/perl5/vendor_perl/Qpsmtpd/Plugin/Async/DNSBLBase.pm -%{_prefix}/share/perl5/vendor_perl/Qpsmtpd/PollServer.pm -%{_mandir}/man1/qpsmtpd-async.1.gz -%{_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 -s /bin/false $supp smtpd +fi %changelog +* Sat Apr 16 2016 Daniel Berteaud 0.96-1.sme +- Update to 0.96 [SME: 9460] + * Fri Mar 25 2016 Charlie Brady 0.84-20.sme - Fix startup warnings due to Socket6 symbol import. [SME: 9386]