From a7a7925bf66c45ff4e61b94f66aa79321ceddf87 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 17 Sep 2007 21:13:13 +0000
Subject: [PATCH] - use "_clamav" user as default in the config files (not
 "clamav")

"of course" mbalmer@
---
 security/clamav/Makefile                         |  3 ++-
 security/clamav/patches/patch-etc-clamd_conf     | 13 +++++++++++--
 security/clamav/patches/patch-etc-freshclam_conf | 10 ++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 214e84accd7..1faf23ff7a3 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.32 2007/08/25 10:08:28 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.33 2007/09/17 21:13:13 ajacoutot Exp $
 
 COMMENT=		virus scanner
 DISTNAME=		clamav-0.91.2
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		security
 SHARED_LIBS=		clamav 5.0
 
diff --git a/security/clamav/patches/patch-etc-clamd_conf b/security/clamav/patches/patch-etc-clamd_conf
index 1edcf6c38ab..4658f122f24 100644
--- a/security/clamav/patches/patch-etc-clamd_conf
+++ b/security/clamav/patches/patch-etc-clamd_conf
@@ -1,5 +1,5 @@
---- etc/clamd.conf.orig	Mon Feb 12 19:18:42 2007
-+++ etc/clamd.conf	Wed Feb 14 08:26:32 2007
+--- etc/clamd.conf.orig	Tue Aug 21 00:56:19 2007
++++ etc/clamd.conf	Mon Sep 17 23:09:29 2007
 @@ -11,7 +11,7 @@ Example
  # LogFile must be writable for the user running daemon.
  # A full path is required.
@@ -18,3 +18,12 @@
  
  # The daemon works in a local OR a network mode. Due to security reasons we
  # recommend the local mode.
+@@ -141,7 +141,7 @@ LocalSocket /tmp/clamd.socket
+ 
+ # Run as another user (clamd must be started by root for this option to work)
+ # Default: don't drop privileges
+-#User clamav
++#User _clamav
+ 
+ # Initialize supplementary group access (clamd must be started by root).
+ # Default: no
diff --git a/security/clamav/patches/patch-etc-freshclam_conf b/security/clamav/patches/patch-etc-freshclam_conf
index 5b80398939c..123a331e1bd 100644
--- a/security/clamav/patches/patch-etc-freshclam_conf
+++ b/security/clamav/patches/patch-etc-freshclam_conf
@@ -1,5 +1,5 @@
---- etc/freshclam.conf.orig	Sun Feb 11 10:54:46 2007
-+++ etc/freshclam.conf	Wed Feb 14 08:26:32 2007
+--- etc/freshclam.conf.orig	Sat Feb 17 20:13:49 2007
++++ etc/freshclam.conf	Mon Sep 17 23:08:52 2007
 @@ -10,7 +10,7 @@ Example
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
@@ -9,11 +9,13 @@
  
  # Path to the log file (make sure it has proper permissions)
  # Default: disabled
-@@ -36,7 +36,7 @@ Example
+@@ -35,8 +35,8 @@ Example
+ 
  # By default when started freshclam drops privileges and switches to the
  # "clamav" user. This directive allows you to change the database owner.
- # Default: clamav (may depend on installation options)
+-# Default: clamav (may depend on installation options)
 -#DatabaseOwner clamav
++# Default: _clamav (may depend on installation options)
 +#DatabaseOwner _clamav
  
  # Initialize supplementary group access (freshclam must be started by root).