[Midnightbsd-cvs] mports [16415] trunk/security/clamav: clamav 0.98.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 27 18:49:32 EDT 2014
Revision: 16415
http://svnweb.midnightbsd.org/mports/?rev=16415
Author: laffer1
Date: 2014-07-27 18:49:31 -0400 (Sun, 27 Jul 2014)
Log Message:
-----------
clamav 0.98.4
Modified Paths:
--------------
trunk/security/clamav/Makefile
trunk/security/clamav/distinfo
trunk/security/clamav/files/clamav-clamd.in
trunk/security/clamav/files/clamav-freshclam.in
trunk/security/clamav/files/clamav-milter.in
trunk/security/clamav/files/patch-configure
trunk/security/clamav/files/pkg-deinstall.in
trunk/security/clamav/pkg-plist
Removed Paths:
-------------
trunk/security/clamav/files/patch-libclamav__bignum_fast.h
trunk/security/clamav/files/pkg-install.in
Modified: trunk/security/clamav/Makefile
===================================================================
--- trunk/security/clamav/Makefile 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/Makefile 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= clamav
-PORTVERSION= 0.98
+PORTVERSION= 0.98.4
CATEGORIES= security
MASTER_SITES= SF
@@ -10,8 +10,10 @@
LICENSE= gpl2
+LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
+
OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
- EXPERIMENTAL DOCS IPV6
+ EXPERIMENTAL DOCS IPV6 DMG_XAR
ARC_DESC= Enable arch archives support
ARJ_DESC= Enable arj archives support
@@ -23,8 +25,9 @@
MILTER_DESC= Compile the milter interface
STDERR_DESC= Print logs to stderr instead of stdout
EXPERIMENTAL_DESC= Build experimental code
+DMG_XAR_DESC= Enable DMG and XAR archives support
-OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6
+OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6 DMG_XAR
ARC_RUN_DEPENDS= arc:${PORTSDIR}/archivers/arc
ARJ_RUN_DEPENDS= arj:${PORTSDIR}/archivers/arj
@@ -39,11 +42,13 @@
ICONV_USES= iconv
EXPERIMENTAL_CONFIGURE_ENABLE= experimental
IPV6_CONFIGURE_ENABLE= ipv6
+DMG_XAR_CONFIGURE_ENABLE= xml
+DMG_XAR_USE= GNOME=libxml2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_GCC= any
-USES= gmake
+USES= gmake libtool
+INSTALL_TARGET= install-strip
USE_RC_SUBR= clamav-clamd clamav-freshclam
PORTDOCS= *
@@ -51,7 +56,12 @@
DBDIR= /var/db/clamav
LOGDIR= /var/log/clamav
RUNDIR= /var/run/clamav
-PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
+PLIST_SUB+= DBDIR=${DBDIR:S/^\///} \
+ LOGDIR=${LOGDIR:S/^\///} \
+ RUNDIR=${RUNDIR:S/^\///} \
+ CLAMAVUSER=${CLAMAVUSER} \
+ CLAMAVGROUP=${CLAMAVGROUP} \
+ RESETPREFIX=${PREFIX}
PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads
USE_AUTOTOOLS= libltdl
OPTIONS_SUB= yes
@@ -75,7 +85,7 @@
# force to use -lthr until it's not fixed.
PTHREAD_LIBS= -lthr
-CONFLICTS?= clamav-devel-[0-9]* clamav-milter-[0-9]*
+CONFLICTS?= clamav-milter-[0-9]*
CLAMAVUSER?= clamav
CLAMAVGROUP?= clamav
@@ -83,16 +93,16 @@
CLAMAV_CLAMD_SOCKET?= ${RUNDIR}/clamd.sock
CLAMAV_MILTER_SOCKET?= ${RUNDIR}/clmilter.sock
-SUB_FILES= pkg-install pkg-deinstall
+SUB_FILES= pkg-deinstall
SUB_LIST+= DBDIR=${DBDIR} \
LOGDIR=${LOGDIR} \
RUNDIR=${RUNDIR} \
+ CHMOD=${CHMOD} \
+ CHOWN=${CHOWN} \
CLAMAVUSER=${CLAMAVUSER} \
CLAMAVGROUP=${CLAMAVGROUP} \
CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
- CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} \
- CHMOD=${CHMOD} \
- CHOWN=${CHOWN}
+ CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET}
SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \
-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
@@ -113,9 +123,17 @@
.include <bsd.mport.options.mk>
+.if ${CLAMAVUSER} == "clamav"
+USERS= clamav
+.endif
+
+.if ${CLAMAVGROUP} == "clamav"
+GROUPS= clamav mail
+.endif
+
.if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
CONFIGURE_ARGS+=--enable-llvm
-. if defined(WITH_TESTS)
+. if ${PORT_OPTIONS:MTESTS}
USE_PYTHON_BUILD= yes
. endif
.else
@@ -175,13 +193,16 @@
.if ${PORT_OPTIONS:MTESTS} && ${OSVERSION} >= 3000
post-build:
@if [ ! -f "${PY_NO_THREAD}" ]; then \
- ${GMAKE} -C ${WRKSRC} check; \
+ ${MAKE_CMD} -C ${WRKSRC} check; \
fi
.endif
post-install:
${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
- @${MKDIR} ${DOCSDIR}/html
+ @${MKDIR} ${DOCSDIR}/html \
+ ${DBDIR} \
+ ${LOGDIR} \
+ ${RUNDIR}
${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
Modified: trunk/security/clamav/distinfo
===================================================================
--- trunk/security/clamav/distinfo 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/distinfo 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.98.tar.gz) = 113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6
-SIZE (clamav-0.98.tar.gz) = 37075245
+SHA256 (clamav-0.98.4.tar.gz) = d3006747abcf750f395a8bfa8267ab314c7b63196c4b41e7717948aaaafa3e1c
+SIZE (clamav-0.98.4.tar.gz) = 15537593
Modified: trunk/security/clamav/files/clamav-clamd.in
===================================================================
--- trunk/security/clamav/files/clamav-clamd.in 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/clamav-clamd.in 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,9 +1,9 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/security/clamav/files/clamav-clamd.in 353008 2014-05-05 14:38:17Z feld $
#
-# PROVIDE: clamd
+# PROVIDE: clamav_clamd
# REQUIRE: LOGIN
# BEFORE: mail
# KEYWORD: shutdown
@@ -22,19 +22,23 @@
name=clamav_clamd
rcvar=clamav_clamd_enable
+# read settings, set default values
+load_rc_config "$name"
+
+: ${clamav_clamd_enable:=NO}
+: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
+
command=%%PREFIX%%/sbin/clamd
required_dirs=%%DBDIR%%
required_files=%%PREFIX%%/etc/clamd.conf
-# read settings, set default values
-load_rc_config "$name"
-: ${clamav_clamd_enable="NO"}
-: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
-
start_precmd=clamav_clamd_precmd
+extra_commands=reload
+reload_cmd="%%PREFIX%%/bin/clamdscan --reload"
#clamav .93 won't start without a valid main.c[vl]d file
-clamav_clamd_precmd() {
+clamav_clamd_precmd()
+{
if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
echo "Missing %%DBDIR%%/*.cvd or *.cld files. You must run freshclam first"
exit 1
@@ -41,12 +45,4 @@
fi
}
-extra_commands="reload"
-reload_cmd=clamd_reload
-
-clamd_reload()
-{
- %%PREFIX%%/bin/clamdscan --reload
-}
-
run_rc_command "$1"
Modified: trunk/security/clamav/files/clamav-freshclam.in
===================================================================
--- trunk/security/clamav/files/clamav-freshclam.in 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/clamav-freshclam.in 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/security/clamav/files/clamav-freshclam.in 354141 2014-05-15 15:40:25Z garga $
#
-# PROVIDE: freshclam
-# REQUIRE: LOGIN clamd
+# PROVIDE: clamav_freshclam
+# REQUIRE: LOGIN clamav_clamd
# BEFORE: mail
# KEYWORD: shutdown
@@ -22,6 +22,10 @@
name=clamav_freshclam
rcvar=clamav_freshclam_enable
+load_rc_config ${name}
+
+: ${clamav_freshclam_enable:=NO}
+
command=%%PREFIX%%/bin/freshclam
pidfile=%%RUNDIR%%/freshclam.pid
command_args="--daemon -p ${pidfile}"
@@ -28,8 +32,4 @@
required_dirs=%%DBDIR%%
required_files=%%PREFIX%%/etc/freshclam.conf
-# read settings, set default values
-load_rc_config "$name"
-: ${clamav_freshclam_enable="NO"}
-
run_rc_command "$1"
Modified: trunk/security/clamav/files/clamav-milter.in
===================================================================
--- trunk/security/clamav/files/clamav-milter.in 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/clamav-milter.in 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $MidnightBSD$
+# $FreeBSD: head/security/clamav/files/clamav-milter.in 354141 2014-05-15 15:40:25Z garga $
#
-# PROVIDE: clamav-milter
-# REQUIRE: LOGIN clamd
+# PROVIDE: clamav_milter
+# REQUIRE: LOGIN clamav_clamd
# BEFORE: mail
# KEYWORD: shutdown
@@ -11,7 +11,7 @@
#
# Add the following lines to /etc/rc.conf to enable clamav-milter:
#
-#clamav_milter_enable="YES"
+# clamav_milter_enable="YES"
#
# See clamav-milter(1) for flags
#
@@ -21,10 +21,22 @@
name=clamav_milter
rcvar=clamav_milter_enable
-conf_file=%%PREFIX%%/etc/clamav-milter.conf
+load_rc_config $name
+
+: ${clamav_milter_enable:=NO}
+: ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
+: ${clamav_milter_conf="%%PREFIX%%/etc/clamav-milter.conf"}
+: ${clamav_milter_flags="-c ${clamav_milter_conf}"}
+: ${clamav_milter_socktimeout=60}
+: ${clamav_milter_socket_mode=777}
+: ${clamav_milter_socket_user=%%CLAMAVUSER%%}
+: ${clamav_milter_socket_group=%%CLAMAVGROUP%%}
+: ${clamav_clamd_enable:=NO}
+: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
+
command=%%PREFIX%%/sbin/clamav-milter
required_dirs=%%DBDIR%%
-required_files=${conf_file}
+required_files=${clamav_milter_conf}
start_precmd=start_precmd
start_postcmd=start_postcmd
@@ -89,17 +101,4 @@
fi
}
-# read settings, set default values
-load_rc_config $name
-: ${clamav_milter_enable="NO"}
-: ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
-: ${clamav_milter_flags="-c ${conf_file}"}
-: ${clamav_milter_socktimeout="60"}
-: ${clamav_milter_socket_mode="777"}
-: ${clamav_milter_socket_user="%%CLAMAVUSER%%"}
-: ${clamav_milter_socket_group="%%CLAMAVGROUP%%"}
-
-: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
-: ${clamav_clamd_enable="NO"}
-
run_rc_command "$1"
Modified: trunk/security/clamav/files/patch-configure
===================================================================
--- trunk/security/clamav/files/patch-configure 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/patch-configure 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,6 +1,6 @@
---- configure.orig 2008-10-15 07:41:31.000000000 -0300
-+++ configure 2008-10-15 08:55:58.000000000 -0300
-@@ -17909,7 +17909,7 @@
+--- configure.orig 2014-06-25 04:04:20.000000000 -0300
++++ configure 2014-06-25 04:04:05.000000000 -0300
+@@ -18682,7 +18682,7 @@
;;
freebsd*)
if test "$have_pthreads" = "yes"; then
@@ -7,9 +7,9 @@
- THREAD_LIBS="-lthr"
+ THREAD_LIBS="%%PTHREAD_LIBS%%"
TH_SAFE="-thread-safe"
+ fi
- cat >>confdefs.h <<\_ACEOF
-@@ -18269,7 +18269,7 @@
+@@ -18858,7 +18858,7 @@
if test "$have_milter" = "yes"; then
save_LIBS="$LIBS"
Deleted: trunk/security/clamav/files/patch-libclamav__bignum_fast.h
===================================================================
--- trunk/security/clamav/files/patch-libclamav__bignum_fast.h 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/patch-libclamav__bignum_fast.h 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,32 +0,0 @@
---- libclamav/bignum_fast.h
-+++ libclamav/bignum_fast.h
-@@ -7,6 +7,14 @@
- *
- * Tom St Denis, tomstdenis at gmail.com
- */
-+
-+/* Oct 1, 2013
-+ * Adding clamav-config.h include here for size-checking on fall-through case
-+ */
-+#if HAVE_CONFIG_H
-+#include "clamav-config.h"
-+#endif
-+
- #ifndef TFM_H_
- #define TFM_H_
-
-@@ -249,7 +257,13 @@
- typedef signed long long long64;
- #endif
- #endif
-- typedef unsigned long fp_digit;
-+ /* The code requires that fp_word be twice the size of fp_digit.
-+ * Add size-checking for special case (both long and long long are 64) */
-+ #if (SIZEOF_LONG == 8) && (SIZEOF_LONG_LONG == 8)
-+ typedef unsigned int fp_digit;
-+ #else
-+ typedef unsigned long fp_digit;
-+ #endif
- typedef ulong64 fp_word;
- #endif
-
Modified: trunk/security/clamav/files/pkg-deinstall.in
===================================================================
--- trunk/security/clamav/files/pkg-deinstall.in 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/pkg-deinstall.in 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $MidnightBSD$
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-deinstall.in,v 1.2 2007-02-16 00:19:32 garga Exp $
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
Deleted: trunk/security/clamav/files/pkg-install.in
===================================================================
--- trunk/security/clamav/files/pkg-install.in 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/files/pkg-install.in 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,48 +0,0 @@
-#!/bin/sh
-# $MidnightBSD$
-
-PREFIX=${PKG_PREFIX:-%%PREFIX%%}
-
-CLAMAVUSER=%%CLAMAVUSER%%
-CLAMAVGROUP=%%CLAMAVGROUP%%
-UID=106
-GID=$UID
-
-DBDIR=%%DBDIR%%
-LOGDIR=%%LOGDIR%%
-RUNDIR=%%RUNDIR%%
-
-PW="pw"
-CHOWN="chown"
-INSTALL_DIR="install -d -o ${CLAMAVUSER} -g ${CLAMAVGROUP} -m 0755"
-
-if [ "$2" = "PRE-INSTALL" ]; then
-
- if ! ${PW} groupshow ${CLAMAVGROUP} 2>/dev/null 1>&2; then
- if ${PW} groupadd ${CLAMAVGROUP} -g $GID; then
- echo "=> Added group \"${CLAMAVGROUP}\"."
- else
- echo "=> Adding group \"${CLAMAVGROUP}\" failed..."
- exit 1
- fi
- fi
-
- if ! ${PW} usershow ${CLAMAVUSER} 2>/dev/null 1>&2; then
- if ${PW} useradd ${CLAMAVUSER} -u $UID -g ${CLAMAVGROUP} -h - \
- -s "/sbin/nologin" -d "/nonexistent" \
- -c "Clam Antivirus"; \
- then
- ${PW} groupmod mail -m ${CLAMAVUSER}
- echo "=> Added user \"${CLAMAVUSER}\"."
- else
- echo "=> Adding user \"${CLAMAVUSER}\" failed..."
- exit 1
- fi
- fi
-
-elif [ "$2" = "POST-INSTALL" ]; then
- ${INSTALL_DIR} ${DBDIR} ${LOGDIR} ${RUNDIR}
- ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} ${LOGDIR} ${RUNDIR}
-fi
-
-exit 0
Modified: trunk/security/clamav/pkg-plist
===================================================================
--- trunk/security/clamav/pkg-plist 2014-07-11 01:51:13 UTC (rev 16414)
+++ trunk/security/clamav/pkg-plist 2014-07-27 22:49:31 UTC (rev 16415)
@@ -1,4 +1,3 @@
- at comment $FreeBSD: head/security/clamav/pkg-plist 328486 2013-09-27 14:49:28Z garga $
bin/clamav-config
bin/clambc
bin/clamconf
@@ -21,18 +20,18 @@
%%UNRAR%%lib/libclamunrar_iface.so
%%UNRAR%%lib/libclamunrar_iface.so.7
libdata/pkgconfig/libclamav.pc
-man/man1/clambc.1
-man/man1/clamconf.1
-man/man1/clamdscan.1
-man/man1/clamdtop.1
-man/man1/clamscan.1
-man/man1/freshclam.1
-man/man1/sigtool.1
-man/man5/clamav-milter.conf.5
-man/man5/clamd.conf.5
-man/man5/freshclam.conf.5
-man/man8/clamav-milter.8
-man/man8/clamd.8
+man/man1/clambc.1.gz
+man/man1/clamconf.1.gz
+man/man1/clamdscan.1.gz
+man/man1/clamdtop.1.gz
+man/man1/clamscan.1.gz
+man/man1/freshclam.1.gz
+man/man1/sigtool.1.gz
+man/man5/clamav-milter.conf.5.gz
+man/man5/clamd.conf.5.gz
+man/man5/freshclam.conf.5.gz
+man/man8/clamav-milter.8.gz
+man/man8/clamd.8.gz
@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.sample; then rm -f %D/etc/clamd.conf; fi
etc/clamd.conf.sample
@exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
More information about the Midnightbsd-cvs
mailing list