rpms/dansguardian/devel dansguardian-clamd.conf, NONE, 1.1 dansguardian-clamd.init, NONE, 1.1 dansguardian-clamd.sysconfig, NONE, 1.1 dansguardian.spec, 1.3, 1.4

[Steven Pritchard]

Author: steve

Update of /cvs/pkgs/rpms/dansguardian/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28987

Modified Files:
	dansguardian.spec 
Added Files:
	dansguardian-clamd.conf dansguardian-clamd.init 
	dansguardian-clamd.sysconfig 
Log Message:
Add Fedora clamav package bits to properly integrate.


--- NEW FILE dansguardian-clamd.conf ---
# Use system logger.
LogSyslog yes

# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
LogFacility LOG_DAEMON

# This option allows you to save a process identifier of the listening
# daemon (main thread).
PidFile /var/run/dansguardian/clamd.pid

# Remove stale socket after unclean shutdown.
# Default: disabled
FixStaleSocket yes

# Run as a selected user (clamd must be started by root).
User dansguardian

# Path to a local socket file the daemon will listen on.
LocalSocket /var/run/dansguardian/clamd.sock


--- NEW FILE dansguardian-clamd.init ---
#!/bin/bash
#
# chkconfig: - 91 9
# description: The clamd server running for dansguardian

CLAMD_SERVICE=dansguardian
. /usr/share/clamav/clamd-wrapper


--- NEW FILE dansguardian-clamd.sysconfig ---
CLAMD_CONFIGFILE=/etc/clamd.d/dansguardian.conf
CLAMD_SOCKET=/var/run/dansguardian/clamd.sock
CLAMD_OPTIONS=


Index: dansguardian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dansguardian/devel/dansguardian.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dansguardian.spec	23 Sep 2009 18:28:57 -0000	1.3
+++ dansguardian.spec	1 Oct 2009 18:04:26 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dansguardian
 Version:        2.10.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Content filtering web proxy
 Summary(de):    Contentfilter-Proxy
 
@@ -16,6 +16,10 @@ Source0:        http://dansguardian.org/
 Source1:        dansguardian.init
 Source2:        dansguardian.httpd
 Source3:        dansguardian.logrotate
+# ClamAV integration
+Source4:        dansguardian-clamd.conf
+Source5:        dansguardian-clamd.init
+Source6:        dansguardian-clamd.sysconfig
 # This patch removes the upstream restrictions on the GPLv2+ source
 Patch0:         dansguardian-copyright-notice.patch
 # Fixes some compilation errors with gcc 4.4
@@ -32,6 +36,7 @@ Requires(pre):   shadow-utils
 Requires(post):  chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
+Requires:       clamav-server
 
 
 %description
@@ -106,6 +111,15 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{
 # create the log dir
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 
+# for clamav integration
+install -dm 700 $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
+touch $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}/clamd.sock
+( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.%{name} )
+install -m755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/clamd.%{name}
+install -dm755 $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/%{name}.conf
+install -dm755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,6 +142,7 @@ if [ "$1" -gt 1 ] ; then
 fi
 
 %post
+/sbin/chkconfig --add clamd.%{name}
 /sbin/chkconfig --add %{name}
 
 
@@ -135,11 +150,14 @@ fi
 if [ $1 = 0 ] ; then
     /sbin/service %{name} stop >/dev/null 2>&1
     /sbin/chkconfig --del %{name}
+    /sbin/service clamd.%{name} stop >/dev/null 2>&1
+    /sbin/chkconfig --del clamd.%{name}
 fi
 
 
 %postun
 if [ "$1" -ge "1" ] ; then
+    /sbin/service clamd.%{name} condrestart >/dev/null 2>&1 || :
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
 
@@ -166,9 +184,18 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %attr(755,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
+%attr(700,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
+%{_sbindir}/clamd.%{name}
+%{_initrddir}/clamd.%{name}
+%ghost %{_localstatedir}/run/%{name}/clamd.sock
+%config(noreplace) %{_sysconfdir}/clamd.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/clamd.%{name}
 
 
 %changelog
+* Wed Sep 30 2009 Steven Pritchard <steve at kspei.com> - 2.10.1.1-4
+- Add Fedora clamav package bits to properly integrate
+
 * Thu Sep 10 2009 Felix Kaechele <heffer at fedoraproject.org> - 2.10.1.1-3
 - fixes for Bugzilla 515159, 515160, 515161, 515363, 519642, 519976, 520440
 - lists now reside in /etc/dansguardian/lists