diff --git a/spamassassin-3.4.1-pname-remove-space.patch b/spamassassin-3.4.1-pname-remove-space.patch new file mode 100644 index 0000000..0849e10 --- /dev/null +++ b/spamassassin-3.4.1-pname-remove-space.patch @@ -0,0 +1,19 @@ +commit f6bbb55c24888e97a59bc762f9dab8ec4627d933 +Author: Tomas Korbar +Date: Mon Jul 9 15:58:16 2018 +0200 + + Fix https://bugzilla.redhat.com/show_bug.cgi?id=950627 + +diff --git a/spamd/spamd.raw b/spamd/spamd.raw +index 821f658..b9104bb 100755 +--- a/spamd/spamd.raw ++++ b/spamd/spamd.raw +@@ -2958,8 +2958,6 @@ sub serverstarted { + } + + sub daemonize { +- # Pretty command line in ps +- $0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg"); + + # be a nice daemon and chdir to the root so we don't block any + # unmount attempts diff --git a/spamassassin.spec b/spamassassin.spec index f23a681..6132d92 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -63,7 +63,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.4.1 #Release: 0.8.%{prerev}%{?dist} -Release: 22%{?dist} +Release: 23%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -95,6 +95,7 @@ Source17: sa-update.timer # Switch to using gnupg2 instead of gnupg1 Patch0: spamassassin-3.3.2-gnupg2.patch Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch +Patch2: spamassassin-3.4.1-pname-remove-space.patch # Patches 100+ are SVN backports (DO NOT REUSE!) Patch100: spamassassin-3.4.1-netdns.patch # Openssl 1.1.x support @@ -192,6 +193,7 @@ To filter spam for all users, add that line to /etc/procmailrc # Patches 0-99 are RH specific %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Patches 100+ are SVN backports (DO NOT REUSE!) %patch100 -p1 %patch101 -p1 @@ -374,6 +376,10 @@ exit 0 %endif %changelog +* Tue Jul 10 2018 Tomas Korbar - 3.4.1-23 +- Fix daemonize subroutine +- See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7594 + * Fri Jun 29 2018 Jitka Plesnikova - 3.4.1-22 - Perl 5.28 rebuild