From a40aba4c46f4cb78a2308f24b3b522f1af8721a0503cec75f9c1ad175cd9308c Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 11 Jul 2008 20:41:26 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/clamav?expand=0&rev=15

---
 clamav-0.93.1.tar.bz2   |  3 +++
 clamav-0.93.tar.bz2     |  3 ---
 clamav-milter-sysconfig | 11 +++++++++++
 clamav-rcmilter         |  8 ++++----
 clamav.changes          |  6 ++++++
 clamav.spec             | 10 +++++++---
 6 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 clamav-0.93.1.tar.bz2
 delete mode 100644 clamav-0.93.tar.bz2

diff --git a/clamav-0.93.1.tar.bz2 b/clamav-0.93.1.tar.bz2
new file mode 100644
index 0000000..55f3df8
--- /dev/null
+++ b/clamav-0.93.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b6ebb8083c0143837d695548e2b8c6a9b604744a177edbf3233d53ab49051bb
+size 17083052
diff --git a/clamav-0.93.tar.bz2 b/clamav-0.93.tar.bz2
deleted file mode 100644
index 12f7f8b..0000000
--- a/clamav-0.93.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28b86fee72b0b666f7fff497255f01c4fc6b914709491a5d081775274d0c4387
-size 15862333
diff --git a/clamav-milter-sysconfig b/clamav-milter-sysconfig
index a9e5535..e6b8fe8 100644
--- a/clamav-milter-sysconfig
+++ b/clamav-milter-sysconfig
@@ -1 +1,12 @@
+## Path:            Applications/ClamAV
+## Description:     Command line options for clamav-milter
+## Type:            string
+## Service-Restart: clamav-milter
 CLAMAV_MILTER_OPTIONS=""
+
+## Path:            Applications/ClamAV
+## Description:     Socket address for clamav-milter
+## Type:            string
+## Default:         /var/lib/clamav/clamav-milter-socket
+## Service-Restart: clamav-milter
+CLAMAV_MILTER_SOCKET="/var/lib/clamav/clamav-milter-socket"
diff --git a/clamav-rcmilter b/clamav-rcmilter
index 8977dfa..2fada6c 100644
--- a/clamav-rcmilter
+++ b/clamav-rcmilter
@@ -80,7 +80,7 @@ case "$1" in
 	echo -n "Starting clamav-milter "
 	## Start daemon with startproc(8). If this fails
 	## the return value is set appropriately by startproc.
-	/sbin/startproc -p $PIDFILE $CLAMAV_MILTER_BIN -i $PIDFILE
+	/sbin/startproc -q $CLAMAV_MILTER_BIN $CLAMAV_MILTER_OPTIONS $CLAMAV_MILTER_SOCKET
 
 	# Remember status and be verbose
 	rc_status -v
@@ -90,7 +90,7 @@ case "$1" in
 	## Stop daemon with killproc(8) and if this fails
 	## killproc sets the return value according to LSB.
 
-	/sbin/killproc -TERM -p $PIDFILE $CLAMAV_MILTER_BIN
+	/sbin/killproc -TERM -G $CLAMAV_MILTER_BIN
 
 	# Remember status and be verbose
 	rc_status -v
@@ -149,7 +149,7 @@ case "$1" in
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
 	
 	# NOTE: checkproc returns LSB compliant status values.
-	/sbin/checkproc -p $PIDFILE $CLAMAV_MILTER_BIN
+	/sbin/checkproc $CLAMAV_MILTER_BIN
 	# NOTE: rc_status knows that we called this init script with
 	# "status" option and adapts its messages accordingly.
 	rc_status -v
@@ -161,7 +161,7 @@ case "$1" in
 
 	test /etc/clamd.conf -nt $PIDFILE -o \
 	    /etc/sysconfig/clamav-milter -nt $PIDFILE \
-	    && echo reload
+	    && echo restart
 	;;
     *)
 	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
diff --git a/clamav.changes b/clamav.changes
index e896e0e..3ba14ce 100644
--- a/clamav.changes
+++ b/clamav.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 16 15:57:42 CEST 2008 - max@suse.de
+
+- Security update 0.93.1 (bnc#399302, CVE-2008-2713)
+- Improved clamav-milter configuration and init script (bnc#382907)
+
 -------------------------------------------------------------------
 Fri Apr 18 19:04:35 CEST 2008 - max@suse.de
 
diff --git a/clamav.spec b/clamav.spec
index 9010f6d..eb5b1a8 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package clamav (Version 0.93)
+# spec file for package clamav (Version 0.93.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -22,14 +22,15 @@ BuildRequires:  pwdutils
 BuildRequires:  sed sendmail sendmail-devel tcpd-devel
 %endif
 Summary:        Antivirus Toolkit
-Version:        0.93
+Version:        0.93.1
 Release:        1
 License:        GPL v2 or later
 Group:          Productivity/Security
 Url:            http://www.clamav.net
 Requires:       latex2html-pngicons
 Obsoletes:      clamav-db < 0.88.3
-PreReq:         %_sbindir/groupadd %_sbindir/useradd /usr/bin/awk /bin/sed /bin/tar
+PreReq:         %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
+PreReq:         /usr/bin/awk /bin/sed /bin/tar
 PreReq:         %insserv_prereq %fillup_prereq
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        clamav-rcclamd
@@ -259,6 +260,9 @@ for f in main daily; do
 done
 
 %changelog
+* Mon Jun 16 2008 max@suse.de
+- Security update 0.93.1 (bnc#399302, CVE-2008-2713)
+- Improved clamav-milter configuration and init script (bnc#382907)
 * Fri Apr 18 2008 max@suse.de
 - Convert the database to the new format instead of running
   freshclam to re-fetch it (bnc#380787).