From 70ec1e0cb9adb829aceaf1501aa58e9148fb5027 Mon Sep 17 00:00:00 2001
From: Oliver Eikemeier <eik@FreeBSD.org>
Date: Thu, 14 Oct 2004 09:30:47 +0000
Subject: - update to 0.80rc4   + JPEG comment exploit (MS04-028) detection

  *** IMPORTANT ***
  The configruration file for the clamd daemon has changed from
  /usr/local/etc/clamav.conf to /usr/local/etc/clamd.conf.

PR:		72203
Approved by:	Rob Evers <revers@infraqon.nl> (maintainer)
---
 security/clamav/Makefile                     | 69 +++++++++++++++++-----------
 security/clamav/distinfo                     |  4 +-
 security/clamav/files/clamav-clamd.sh        | 20 +++-----
 security/clamav/files/clamav-freshclam.sh    | 16 +++----
 security/clamav/files/clamav-milter.sh       | 15 +++---
 security/clamav/files/patch-Makefile.in      | 11 +++++
 security/clamav/files/patch-configure        | 38 +++++++--------
 security/clamav/files/patch-etc::Makefile.in | 12 +++--
 security/clamav/files/patch-ltmain.sh        | 56 ----------------------
 security/clamav/pkg-install                  | 21 +++++++--
 security/clamav/pkg-plist                    |  6 +--
 11 files changed, 121 insertions(+), 147 deletions(-)
 create mode 100644 security/clamav/files/patch-Makefile.in
 delete mode 100644 security/clamav/files/patch-ltmain.sh

(limited to 'security/clamav')

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 82b3b047e44a..e1a32d50a99a 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	${DISTVERSION:S/-rc//g:S/-/./g}
+PORTVERSION=	${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	clamav
@@ -23,11 +23,12 @@ RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 		arc:${PORTSDIR}/archivers/arc \
 		unzip:${PORTSDIR}/archivers/unzip
 
-DISTVERSION=	0.75.1
+DISTVERSION=	0.80rc4
 
-OPTIONS=	MILTER "Compile the milter interface" off
+OPTIONS=	MILTER "Compile the milter interface" Off \
+		CURL "Support URL downloading" Off
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_RC_SUBR=	yes
@@ -41,6 +42,8 @@ CONFIGURE_ARGS=	--with-dbdir=${DATADIR} \
 		--disable-clamuko \
 		--disable-clamav \
 		--enable-bigstack \
+		--disable-gethostbyname_r \
+		--enable-readdir_r \
 		--disable-dependency-tracking
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}
@@ -49,7 +52,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib \
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1
-MAN5=		clamav.conf.5 freshclam.conf.5
+MAN5=		clamd.conf.5 freshclam.conf.5
 MAN8=		clamd.8 clamav-milter.8
 
 CONFLICTS=	clamav-devel-[0-9]*
@@ -67,16 +70,15 @@ SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%CLAMAV_MILTER_SOCKET%%|${CLAMAV_MILTER_SOCKET}|g'
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
-		-e 's|^\#?(LogFile) .*$$|\1 /var/log/clamav/clamd.log|' \
-		-e 's|^\#?(PidFile) .*$$|\1 /var/run/clamav/clamd.pid|' \
+		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 /var/log/clamav/\3|' \
+		-e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 /var/run/clamav/\2|' \
 		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
 		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \
 		-e 's|^\#?(ScanMail)$$|\1|' \
-		-e 's|^\#?(Checks)$$|\#\1|' \
+		-e 's|^\#?(NotifyClamd)$$|\1|' \
 		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \
 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
-		-e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \
 		-e 's|^\#?(FixStaleSocket)$$|\1|'
 
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
@@ -95,6 +97,9 @@ PLIST_SUB+=	RC_DIR=${RC_DIR} \
 .if defined(WITH_MILTER)
 .if !exists(/usr/lib/libmilter.a)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
+CONFIGURE_ENV+=	SENDMAIL="${LOCALBASE}/sbin/sendmail"
+.else
+CONFIGURE_ENV+=	SENDMAIL="/usr/sbin/sendmail"
 .endif
 CONFIGURE_ARGS+=	--enable-milter
 PLIST_SUB+=	CLAMAV-MILTER=""
@@ -102,16 +107,26 @@ PLIST_SUB+=	CLAMAV-MILTER=""
 PLIST_SUB+=	CLAMAV-MILTER="@comment "
 .endif
 
+.if defined(WITH_CURL)
+LIB_DEPENDS+=		curl.3:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+=	--with-libcurl
+.else
+CONFIGURE_ARGS+=	--without-libcurl
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread -lc_r|${PTHREAD_LIBS}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
-		${WRKSRC}/clamav-milter/clamav-milter.c
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
+
+pre-build:
+	@if ${LDCONFIG} -r | ${GREP} -qw -e -lclamav; then \
+		${ECHO_MSG} "===>  *** WARNING ***"; \
+		${ECHO_MSG} "      Installed version of libclamav found."; \
+		${ECHO_MSG} "      This might cause build problems."; \
+	fi
 
 post-build:
-	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf
+	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamd.conf
 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/freshclam.conf
 	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
 	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
@@ -125,32 +140,32 @@ post-build:
 .endif
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
+	@${SETENV} PKG_PREFIX=${PREFIX} PKG_DESTDIR=${DESTDIR} \
 		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
-		${RC_DIR}/clamav-clamd${RC_SUFX}
+		${DESTDIR}${RC_DIR}/clamav-clamd${RC_SUFX}
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
-		${RC_DIR}/clamav-freshclam${RC_SUFX}
-	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
-.for c in clamav freshclam
-	@[ -f ${PREFIX}/etc/${c}.conf ] || \
-		${CP} ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
+		${DESTDIR}${RC_DIR}/clamav-freshclam${RC_SUFX}
+	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DESTDIR}${DATADIR}
+.for c in clamd freshclam
+	@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] || \
+		${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default ${DESTDIR}${PREFIX}/etc/${c}.conf
 .endfor
 .if defined(WITH_MILTER)
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
-		${RC_DIR}/clamav-milter${RC_SUFX}
+		${DESTDIR}${RC_DIR}/clamav-milter${RC_SUFX}
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DESTDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \
-		${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/html
+		${DESTDIR}${DOCSDIR}
+	@${MKDIR} ${DESTDIR}${DOCSDIR}/html
 	@${INSTALL_DATA} ${INSTALL_WRKSRC}/docs/html/*.* \
-		${DOCSDIR}/html
+		${DESTDIR}${DOCSDIR}/html
 .endif
-	@${SETENV} PKG_PREFIX=${PREFIX} \
+	@${SETENV} PKG_PREFIX=${PREFIX} PKG_DESTDIR=${DESTDIR} \
 		${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index a1fe8b7a2766..70edbb10d9e3 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,2 +1,2 @@
-MD5 (clamav-0.75.1.tar.gz) = 2c85b7957eba9fd9e9ff8c2537ae006f
-SIZE (clamav-0.75.1.tar.gz) = 2777319
+MD5 (clamav-0.80rc4.tar.gz) = 5c02d52c361f04098a9956478f8654a0
+SIZE (clamav-0.80rc4.tar.gz) = 2668125
diff --git a/security/clamav/files/clamav-clamd.sh b/security/clamav/files/clamav-clamd.sh
index 243a3fba871b..453212555e2f 100644
--- a/security/clamav/files/clamav-clamd.sh
+++ b/security/clamav/files/clamav-clamd.sh
@@ -24,20 +24,12 @@ rcvar=`set_rcvar`
 command=%%PREFIX%%/sbin/clamd
 pidfile=/var/run/clamav/clamd.pid
 required_dirs=%%DATADIR%%
-required_files=%%PREFIX%%/etc/clamav.conf
+required_files=%%PREFIX%%/etc/clamd.conf
 
-stop_postcmd=stop_postcmd
+# read settings, set default values
+load_rc_config "$name"
+: ${clamav_clamd_enable="NO"}
+: ${clamav_clamd_flags=""}
+: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
 
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-# set defaults
-
-clamav_clamd_enable=${clamav_clamd_enable:-"NO"}
-clamav_clamd_flags=${clamav_clamd_flags:-""}
-clamav_clamd_socket=${clamav_clamd_socket:-"%%CLAMAV_CLAMD_SOCKET%%"}
-
-load_rc_config $name
 run_rc_command "$1"
diff --git a/security/clamav/files/clamav-freshclam.sh b/security/clamav/files/clamav-freshclam.sh
index 8e723f6eb844..0018f202c22d 100644
--- a/security/clamav/files/clamav-freshclam.sh
+++ b/security/clamav/files/clamav-freshclam.sh
@@ -9,7 +9,7 @@
 # KEYWORD: FreeBSD shutdown
 
 #
-# Add the following lines to /etc/rc.conf to enable freshclam daemon:
+# Add the following lines to /etc/rc.conf to enable the freshclam daemon:
 #
 #clamav_freshclam_enable="YES"
 #
@@ -22,16 +22,14 @@ name=clamav_freshclam
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/freshclam
+pidfile=/var/run/clamav/freshclam.pid
+command_args="--daemon"
 required_dirs=%%DATADIR%%
 required_files=%%PREFIX%%/etc/freshclam.conf
 
-# set defaults
+# read settings, set default values
+load_rc_config "$name"
+: ${clamav_freshclam_enable="NO"}
+: ${clamav_freshclam_flags=""}
 
-clamav_freshclam_enable=${clamav_freshclam_enable:-"NO"}
-clamav_freshclam_flags=${clamav_freshclam_flags:-"--pid=/var/run/clamav/freshclam.pid --daemon-notify=%%PREFIX%%/etc/clamav.conf"}
-
-load_rc_config $name
-
-# add --daemon to any given arguments
-clamav_freshclam_flags="${clamav_freshclam_flags} --daemon"
 run_rc_command "$1"
diff --git a/security/clamav/files/clamav-milter.sh b/security/clamav/files/clamav-milter.sh
index 98f33717d2cb..8af6441c6454 100644
--- a/security/clamav/files/clamav-milter.sh
+++ b/security/clamav/files/clamav-milter.sh
@@ -23,7 +23,7 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamav-milter
 required_dirs=%%DATADIR%%
-required_files=%%PREFIX%%/etc/clamav.conf
+required_files=%%PREFIX%%/etc/clamd.conf
 
 start_precmd=start_precmd
 
@@ -33,16 +33,13 @@ start_precmd()
 		warn "Stale socket $clamav_milter_socket removed."
 		rm "$clamav_milter_socket"
 	fi
+	rc_flags="${flags:-$clamav_milter_flags} $clamav_milter_socket"
 }
 
-# set defaults
-
-clamav_milter_enable=${clamav_milter_enable:-"NO"}
-clamav_milter_socket=${clamav_milter_socket:-"%%CLAMAV_MILTER_SOCKET%%"}
-clamav_milter_flags=${clamav_milter_flags:-"--postmaster-only --local --outgoing --max-children=50"}
-
+# read settings, set default values
 load_rc_config $name
+: ${clamav_milter_enable="NO"}
+: ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
+: ${clamav_milter_flags="--postmaster-only --local --outgoing --max-children=50"}
 
-# add socket to any given argument
-clamav_milter_flags="${clamav_milter_flags} ${clamav_milter_socket}"
 run_rc_command "$1"
diff --git a/security/clamav/files/patch-Makefile.in b/security/clamav/files/patch-Makefile.in
new file mode 100644
index 000000000000..393ab6a012a5
--- /dev/null
+++ b/security/clamav/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Oct 13 15:26:26 2004
++++ Makefile.in	Wed Oct 13 15:26:43 2004
+@@ -210,7 +210,7 @@
+ SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool database docs etc clamav-milter
+ EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in
+ bin_SCRIPTS = clamav-config
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libclamav.pc
+ all: clamav-config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
index 91f768e7b971..7b51d37436e2 100644
--- a/security/clamav/files/patch-configure
+++ b/security/clamav/files/patch-configure
@@ -1,20 +1,22 @@
 --- configure.orig	Mon Mar 15 21:04:49 2004
 +++ configure	Thu Apr  1 14:56:36 2004
-@@ -9329,7 +9329,7 @@
- 
- 
- 
--if test ! -r "$cfg_dir/clamav.conf"; then
-+if true; then
-   INSTALL_CLAMAV_CONF_TRUE=
-   INSTALL_CLAMAV_CONF_FALSE='#'
- else
-@@ -9339,7 +9339,7 @@
- 
- 
- 
--if test ! -r "$cfg_dir/freshclam.conf"; then
-+if true; then
-   INSTALL_FRESHCLAM_CONF_TRUE=
-   INSTALL_FRESHCLAM_CONF_FALSE='#'
- else
+@@ -10635,6 +10635,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -10678,6 +10681,9 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/security/clamav/files/patch-etc::Makefile.in b/security/clamav/files/patch-etc::Makefile.in
index 8b4e289f92b5..e47b65443c8e 100644
--- a/security/clamav/files/patch-etc::Makefile.in
+++ b/security/clamav/files/patch-etc::Makefile.in
@@ -1,13 +1,15 @@
 --- etc/Makefile.in.orig	Thu Feb 19 14:17:02 2004
 +++ etc/Makefile.in	Thu Feb 19 14:17:36 2004
-@@ -248,8 +248,8 @@
+@@ -333,10 +333,8 @@
  
  install:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
--@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamav.conf $(DESTDIR)$(CFGINST)
--@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
-+@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamav.conf $(DESTDIR)$(CFGINST)/clamav.conf.default
-+@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
+-	@test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
+-	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
+-	@test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
+-	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
++	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
++	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/security/clamav/files/patch-ltmain.sh b/security/clamav/files/patch-ltmain.sh
deleted file mode 100644
index 261f3f868cad..000000000000
--- a/security/clamav/files/patch-ltmain.sh
+++ /dev/null
@@ -1,56 +0,0 @@
---- ltmain.sh.orig	Sun Feb 15 12:44:09 2004
-+++ ltmain.sh	Thu Mar 25 02:15:25 2004
-@@ -1050,25 +1050,18 @@
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
--	 # This change is required for -lc_r under FreeBSD / Tomasz Kojm
--	 #elif test "X$arg" = "X-lc_r"; then
--	 # case $host in
--	 #*-*-openbsd* | *-*-freebsd*)
--	 #   # Do not include libc_r directly, use -pthread flag.
--	 #   continue
--	 #   ;;
--	 # esac
-+	 elif test "X$arg" = "X-lc_r"; then
-+	  case $host in
-+	 *-*-openbsd* | *-*-freebsd4*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
-+	  esac
- 	fi
- 	deplibs="$deplibs $arg"
- 	continue
- 	;;
- 
--      # We need this change for old -pthread *BSD style / Tomasz Kojm
--      -pthread)
--      	deplibs="$deplibs -pthread"
--      	continue
--      	;;
--
-       -module)
- 	module=yes
- 	continue
-@@ -4259,10 +4252,16 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/clamav/pkg-install b/security/clamav/pkg-install
index ebb8f9a77d69..47b6f7c7fc5d 100644
--- a/security/clamav/pkg-install
+++ b/security/clamav/pkg-install
@@ -2,15 +2,16 @@
 # $FreeBSD$
 
 PREFIX=${PKG_PREFIX:-%%PREFIX%%}
+DESTDIR=${PKG_DESTDIR:-}
 
 CLAMAVUSER=%%CLAMAVUSER%%
 CLAMAVGROUP=%%CLAMAVGROUP%%
 UID=106
 GID=$UID
 
-CLAMRUN=/var/run/clamav
-CLAMLOG=/var/log/clamav
-DATADIR=%%DATADIR%%
+CLAMRUN=$DESTDIR/var/run/clamav
+CLAMLOG=$DESTDIR/var/log/clamav
+DATADIR=$DESTDIR%%DATADIR%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
@@ -48,11 +49,23 @@ elif [ "$2" = "POST-INSTALL" ]; then
 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1
 	fi
 
-	if [ ! -d "${DATADIR}" ]; then
+	if [ ! -d "$DATADIR" ]; then
 		mkdir -p "$DATADIR" || exit 1
 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DATADIR" || exit 1
 	fi
 
+	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then
+		echo
+		echo "**************** WARNING ****************"
+		echo "*                                       *"
+		echo "*  The configuration file has changed:  *"
+		echo "* Please edit $PREFIX/etc/clamd.conf *"
+		echo "* and remove $PREFIX/etc/clamav.conf *"
+		echo "*                                       *"
+		echo "**************** WARNING ****************"
+		echo
+	fi
+
 fi
 
 exit 0
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index 0a555cf27020..c2d7de5977c4 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -16,9 +16,9 @@ lib/libclamav.so.1
 lib/libclamav.so
 lib/libclamav.a
 libdata/pkgconfig/libclamav.pc
-@unexec if cmp -s %D/etc/clamav.conf %D/etc/clamav.conf.default; then rm -f %D/etc/clamav.conf; fi
-etc/clamav.conf.default
-@exec [ -f %B/clamav.conf ] || cp %B/%f %B/clamav.conf
+@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
+etc/clamd.conf.default
+@exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
 @unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
 etc/freshclam.conf.default
 @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
-- 
cgit v1.2.3