commit f998cb36933bec4f5985d2494831fba02b04c5f3
Author: Marcela MaÅlÃÅovà <mmaslano@xxxxxxxxxx>
Date: Tue Nov 9 09:36:11 2010 +0100
561389 patch from Sandro Janke - change stderr to stdout
amavisd-new-2.6.4-stdout.patch | 21 +++++++++++++++++++++
amavisd-new.spec | 7 ++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/amavisd-new-2.6.4-stdout.patch b/amavisd-new-2.6.4-stdout.patch
new file mode 100644
index 0000000..f623d55
--- /dev/null
+++ b/amavisd-new-2.6.4-stdout.patch
@@ -0,0 +1,21 @@
+diff -up amavisd-new-2.6.4/amavisd.err amavisd-new-2.6.4/amavisd
+--- amavisd-new-2.6.4/amavisd.err 2010-11-09 09:24:54.065896574 +0100
++++ amavisd-new-2.6.4/amavisd 2010-11-09 09:25:59.192229627 +0100
+@@ -14014,14 +14014,14 @@ eval {
+ my($msg) = !defined($killed_amavisd_pid) ? undef :
+ "Daemon [$killed_amavisd_pid] terminated by SIG$kill_sig_used";
+ if ($cmd eq 'stop') {
+- if (defined $msg) { do_log(2,"%s",$msg); print STDERR "$msg\n" }
++ if (defined $msg) { do_log(2,"%s",$msg); print STDOUT "$msg\n" }
+ exit(0);
+ }
+ if (defined $killed_amavisd_pid) {
+- print STDERR "$msg, waiting for dust to settle...\n";
++ print STDOUT "$msg, waiting for dust to settle...\n";
+ sleep 5; # wait for the TCP socket to be released
+ }
+- print STDERR "becoming a new daemon...\n";
++ print STDOUT "becoming a new daemon...\n";
+ }
+ 1;
+ } or do {
diff --git a/amavisd-new.spec b/amavisd-new.spec
index e25a52c..030c4c0 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.6.4
-Release: 1%{?prerelease:.%{prerelease}}%{?dist}
+Release: 2%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -19,6 +19,7 @@ Source7: amavisd-snmp.init
Patch0: amavisd-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
+Patch3: amavisd-new-2.6.4-stdout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root/
Requires: /usr/sbin/clamd, /etc/clamd.d
Requires: /usr/sbin/tmpwatch, /etc/cron.daily
@@ -113,6 +114,7 @@ alerting purposes.
%patch0 -p1
%patch1 -p1
%patch2 -p0
+%patch3 -p1
install -m644 %{SOURCE4} %{SOURCE5} README_FILES/
sed -i -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' \
@@ -210,6 +212,9 @@ fi
%{_sbindir}/amavisd-snmp-subagent
%changelog
+* Tue Nov 9 2010 Marcela MaÅlÃÅovà <mmaslano@xxxxxxxxxx> 2.6.4-2
+- 561389 patch from Sandro Janke - change stderr to stdout
+
* Mon Aug 10 2009 Steven Pritchard <steve@xxxxxxxxx> 2.6.4-1
- Update to 2.6.4.
- Make a snmp sub-package for amavisd-snmp-subagent.
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
