cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update ClamAV to 0.96.2; earlier version ok pea@ (with some port

Browse Source 
Makefile cleanup since then), feedback giovanni@

- better performance and reduced memory use
- various other fixes and minor enhancements
- new pdf parser
This commit is contained in:
sthen 2010-08-19 09:17:41 +00:00
parent 5241bbc352
commit dfc04c81ae
7 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
security/clamav/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.50 2010/05/27 09:54:09 sthen Exp $
# $OpenBSD: Makefile,v 1.51 2010/08/19 09:17:41 sthen Exp $
COMMENT= virus scanner
DISTNAME= clamav-0.96.1
PKGNAME= ${DISTNAME}p0
DISTNAME= clamav-0.96.2
CATEGORIES= security
SHARED_LIBS= clamav 13.0 \
SHARED_LIBS= clamav 14.0 \
clamunrar 2.0 \
clamunrar_iface 2.0
@ -18,18 +18,18 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m milter ncurses pthread stdc++ z
WANTLIB= bz2 c ltdl m milter ncurses pthread stdc++ z
BUILD_DEPENDS= ::devel/check
LIB_DEPENDS= bz2.>=10::archivers/bzip2 \
iconv.>=4::converters/libiconv \
ltdl:libltdl-*:devel/libtool,-ltdl
# XXX can this use llvm from ports rather than bundled?
LIB_DEPENDS= ::archivers/bzip2 \
::devel/libtool,-ltdl
RUN_DEPENDS= :lha-*:archivers/lha \
:zoo-*:archivers/zoo \
:arc-*:archivers/arc \
:unzip-*:archivers/unzip
RUN_DEPENDS= ::archivers/lha \
::archivers/zoo \
::archivers/arc \
::archivers/unzip
USE_LIBTOOL= Yes
@ -50,19 +50,20 @@ CONFIGURE_ARGS+= --disable-clamav \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib
REGRESS_TARGET= check
MODULES= lang/python
MODPY_RUNDEP= no
REGRESS_TARGET= check
MODULES= lang/python converters/libiconv
MODPY_RUNDEP= no
CONFIGURE_ENV+= LDFLAGS="-pthread -L/usr/lib -L${WRKSRC}/libclamav/.libs -L${LOCALBASE}/lib" \
CPPFLAGS="-I/usr/include -I${LOCALBASE}/include"
DOCS= clamav-mirror-howto.pdf clamdoc.pdf signatures.pdf
CPPFLAGS+= -I/usr/include -I${LOCALBASE}/include
LDFLAGS+= -pthread -L/usr/lib -L${WRKSRC}/libclamav/.libs \
-L${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
CPPFLAGS="${CPPFLAGS}"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/clamav \
${PREFIX}/share/examples/clamav
cd ${WRKSRC}/docs; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/clamav
cd ${WRKSRC}/docs; ${INSTALL_DATA} *.pdf ${PREFIX}/share/doc/clamav
cd ${WRKSRC}/etc; ${INSTALL_DATA} clamd.conf freshclam.conf \
clamav-milter.conf ${PREFIX}/share/examples/clamav
cd ${WRKSRC}/examples; ${INSTALL_DATA} ex1.c \

10
security/clamav/distinfo
View File

@ -1,5 +1,5 @@
MD5 (clamav-0.96.1.tar.gz) = OOeHDbbprQ5WlRhJmm82UQ==
RMD160 (clamav-0.96.1.tar.gz) = 8HCLkhyLAaQwn+dB7BQauMvfI1E=
SHA1 (clamav-0.96.1.tar.gz) = zbJEkPQCdIy/tXzIdZL+d7Rw4KU=
SHA256 (clamav-0.96.1.tar.gz) = QT3SWQcFkGjaKjZ9KzMPvDfV0nZOs7BHIUznVKnKdOo=
SIZE (clamav-0.96.1.tar.gz) = 40568982
MD5 (clamav-0.96.2.tar.gz) = osJVXYaGj5GgHQ4sJAO77A==
RMD160 (clamav-0.96.2.tar.gz) = 0tn8nHdZxbdgcgMrDVE+7eGbl4s=
SHA1 (clamav-0.96.2.tar.gz) = G3YhqYKfHwAgkBzjUNDmESdFw00=
SHA256 (clamav-0.96.2.tar.gz) = aqCw2W7SX/tLWspT9jSJeMlHcVA8KZ+G5ID+9HWrzvo=
SIZE (clamav-0.96.2.tar.gz) = 59109021

8
security/clamav/patches/patch-clamd_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clamd_Makefile_in,v 1.12 2010/04/01 13:18:54 sthen Exp $
--- clamd/Makefile.in.orig Tue Jan 26 12:53:27 2010
+++ clamd/Makefile.in Wed Mar 10 21:28:41 2010
@@ -179,7 +179,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
$OpenBSD: patch-clamd_Makefile_in,v 1.13 2010/08/19 09:17:41 sthen Exp $
--- clamd/Makefile.in.orig Thu Aug 12 17:42:27 2010
+++ clamd/Makefile.in Thu Aug 12 21:54:06 2010
@@ -182,7 +182,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LCOV = @LCOV@
LD = @LD@

8
security/clamav/patches/patch-database_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-database_Makefile_in,v 1.7 2010/04/01 13:18:54 sthen Exp $
--- database/Makefile.in.orig Tue Jan 26 12:53:27 2010
+++ database/Makefile.in Wed Mar 10 21:28:41 2010
@@ -428,6 +428,8 @@ uninstall-am:
$OpenBSD: patch-database_Makefile_in,v 1.8 2010/08/19 09:17:41 sthen Exp $
--- database/Makefile.in.orig Thu Aug 12 17:42:27 2010
+++ database/Makefile.in Thu Aug 12 21:54:06 2010
@@ -431,6 +431,8 @@ uninstall-am:
install-data-local:

8
security/clamav/patches/patch-etc-clamd_conf
View File

@ -1,5 +1,5 @@
--- etc/clamd.conf.orig Wed Mar 10 14:27:30 2010
+++ etc/clamd.conf Wed Mar 10 21:28:41 2010
--- etc/clamd.conf.orig Fri Jul 30 13:25:16 2010
+++ etc/clamd.conf Thu Aug 12 21:54:06 2010
@@ -11,7 +11,7 @@ Example
# LogFile must be writable for the user running daemon.
# A full path is required.
@ -9,7 +9,7 @@
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
@@ -62,7 +62,7 @@ Example
@@ -67,7 +67,7 @@ Example
# Path to the database directory.
# Default: hardcoded (depends on installation options)
@ -18,7 +18,7 @@
# Only load the official signatures published by the ClamAV project.
# Default: no
@@ -183,7 +183,7 @@ Example
@@ -188,7 +188,7 @@ Example
# Run as another user (clamd must be started by root for this option to work)
# Default: don't drop privileges

8
security/clamav/patches/patch-etc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-etc_Makefile_in,v 1.7 2010/04/01 13:18:54 sthen Exp $
--- etc/Makefile.in.orig Tue Jan 26 12:53:27 2010
+++ etc/Makefile.in Wed Mar 10 21:28:42 2010
@@ -427,6 +427,8 @@ uninstall-am:
$OpenBSD: patch-etc_Makefile_in,v 1.8 2010/08/19 09:17:41 sthen Exp $
--- etc/Makefile.in.orig Thu Aug 12 17:42:27 2010
+++ etc/Makefile.in Thu Aug 12 21:54:06 2010
@@ -430,6 +430,8 @@ uninstall-am:
install-data-local:

14
security/clamav/patches/patch-libclamav_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libclamav_Makefile_in,v 1.13 2010/04/01 13:18:54 sthen Exp $
--- libclamav/Makefile.in.orig Tue Feb 16 14:44:25 2010
+++ libclamav/Makefile.in Wed Mar 10 21:30:41 2010
@@ -527,7 +527,7 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) re
$OpenBSD: patch-libclamav_Makefile_in,v 1.14 2010/08/19 09:17:41 sthen Exp $
--- libclamav/Makefile.in.orig Thu Aug 12 17:42:28 2010
+++ libclamav/Makefile.in Thu Aug 12 21:54:06 2010
@@ -534,7 +534,7 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) re
jsparse/generated/keywords.h \
jsparse/future_reserved_words.list jsparse/keywords.list \
jsparse/special_keywords.list jsparse/operators.gperf
@ -10,7 +10,7 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.13 2010/04/01 13:18:54 sthen Exp $
@ENABLE_UNRAR_TRUE@ @LIBCLAMAV_VERSION@ -no-undefined \
@ENABLE_UNRAR_TRUE@ $(am__append_2)
@ENABLE_UNRAR_TRUE@libclamunrar_la_SOURCES = \
@@ -551,7 +551,7 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) re
@@ -558,7 +558,7 @@ EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) re
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LIBADD = libclamunrar.la
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LDFLAGS = -module @TH_SAFE@ \
@ -19,7 +19,7 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.13 2010/04/01 13:18:54 sthen Exp $
@ENABLE_UNRAR_TRUE@ -no-undefined $(am__append_5)
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_SOURCES = \
@ENABLE_UNRAR_TRUE@ ../libclamunrar_iface/unrar_iface.c \
@@ -608,7 +608,7 @@ libclamav_nocxx_la_SOURCES = bytecode_nojit.c
@@ -615,7 +615,7 @@ libclamav_nocxx_la_SOURCES = bytecode_nojit.c
libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@ @LIBM@
libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
libclamav_la_CFLAGS = -DSEARCH_LIBDIR=\"$(libdir)\"
@ -28,7 +28,7 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.13 2010/04/01 13:18:54 sthen Exp $
-no-undefined $(am__append_6)
include_HEADERS = clamav.h
libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \
@@ -2267,6 +2267,9 @@ version.h: version.h.tmp
@@ -2303,6 +2303,9 @@ version.h: version.h.tmp
fi
version.h.tmp: