robert pushed to clamav (el5). "Merge remote branch 'origin/el6' into el5"

[notifications at fedoraproject.org]

>From 865529f4ffc69c765e572d951f1407c414c458c1 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Fri, 10 Apr 2015 18:44:47 +0200
Subject: Make init script source /etc/sysconfig/clamd if present (#1195864)


diff --git a/clamav.init b/clamav.init
index dacb403..633c301 100755
--- a/clamav.init
+++ b/clamav.init
@@ -17,6 +17,9 @@
 
 [ -x /usr/sbin/clamd ] || exit 0
 
+# Local clamd config
+test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd
+
 # See how we were called.
 case "$1" in
   start)
diff --git a/clamav.spec b/clamav.spec
index b70ab17..8b41064 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -5,7 +5,7 @@
 Summary: Anti-virus software
 Name: clamav
 Version: 0.98.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://www.clamav.net/
@@ -397,6 +397,9 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/libclamav.la
 
 %changelog
+* Tue Feb 24 2015 Joel Smith <joelsmith at fedoraproject.org> - 0.98.6-2
+- Make init script source /etc/sysconfig/clamd if present (#1195864)
+
 * Thu Jan 29 2015 Robert Scheck <robert at fedoraproject.org> - 0.98.6-1
 - Upgrade to 0.98.6 and updated daily.cvd (#1187050)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/clamav.git/commit/?h=el5&id=1a9ed4eec0c0e8881425751b279e1b6d960b3ad9