pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/clamav Update clamav to 0.102.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/426cbe53d6c2
branches: trunk
changeset: 415634:426cbe53d6c2
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Thu Oct 10 15:41:29 2019 +0000
description:
Update clamav to 0.102.0
* The On-Access Scanning feature has been migrated out of clamd and
into a brand new utility named clamonacc, which is disabled in this
package as it is for Linux only.
* The freshclam database update utility has undergone a significant
update. This includes:
+ Added support for HTTPS.
+ Support for database mirrors hosted on ports other than 80.
+ Removal of the mirror management feature (mirrors.dat).
+ An all new libfreshclam library API.
* Added support for extracting ESTsoft .egg archives. This feature is
new code developed from scratch using ESTsoft's Egg-archive
specification and without referencing the UnEgg library provided by
ESTsoft. This was necessary because the UnEgg library's license
includes restrictions limiting the commercial use of the UnEgg library.
Full release notes available at:
https://github.com/Cisco-Talos/clamav-devel/blob/rel/0.102/NEWS.md
diffstat:
security/clamav/Makefile | 8 +--
security/clamav/Makefile.common | 4 +-
security/clamav/PLIST | 5 ++-
security/clamav/distinfo | 18 ++++----
security/clamav/patches/patch-Makefile.in | 18 ++++----
security/clamav/patches/patch-configure | 48 ++++++++++++++++++++++++-
security/clamav/patches/patch-libclamav_fmap.c | 30 ++++++++--------
security/clamav/patches/patch-libclamav_fmap.h | 24 ++++++------
8 files changed, 99 insertions(+), 56 deletions(-)
diffs (262 lines):
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/Makefile
--- a/security/clamav/Makefile Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/Makefile Thu Oct 10 15:41:29 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/10/05 20:52:52 nros Exp $
+# $NetBSD: Makefile,v 1.55 2019/10/10 15:41:29 prlw1 Exp $
PKGREVISION= 1
.include "Makefile.common"
@@ -24,10 +24,8 @@
CONFIGURE_ARGS+= --with-system-libmspack=${BUILDLINK_PREFIX.libmspack}
CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+= --enable-readdir_r
-# pkgsrc enforces a "secure" version of zlib, so don't let this check
-# bomb the build
-CONFIGURE_ARGS+= --disable-zlib-vcheck
+# Linux only:
+CONFIGURE_ARGS+= --disable-clamonacc
# Work around build failure PR pkg/54420
CONFIGURE_ARGS+= --disable-unrar
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/Makefile.common
--- a/security/clamav/Makefile.common Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/Makefile.common Thu Oct 10 15:41:29 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2019/08/05 14:44:20 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/10/10 15:41:29 prlw1 Exp $
#
# used by security/clamav/Makefile
# used by security/clamav-doc/Makefile
-DISTNAME= clamav-0.101.2
+DISTNAME= clamav-0.102.0
CATEGORIES= security
MASTER_SITES= http://www.clamav.net/downloads/production/
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/PLIST
--- a/security/clamav/PLIST Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/PLIST Thu Oct 10 15:41:29 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2019/08/05 14:44:20 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/10/10 15:41:29 prlw1 Exp $
bin/clamav-config
bin/clambc
bin/clamconf
@@ -9,9 +9,12 @@
bin/freshclam
bin/sigtool
include/clamav-types.h
+include/clamav-version.h
include/clamav.h
+include/libfreshclam.h
lib/libclamav.la
lib/libclammspack.la
+lib/libfreshclam.la
lib/pkgconfig/libclamav.pc
man/man1/clambc.1
man/man1/clamconf.1
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/distinfo
--- a/security/clamav/distinfo Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/distinfo Thu Oct 10 15:41:29 2019 +0000
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.28 2019/08/05 14:44:20 prlw1 Exp $
+$NetBSD: distinfo,v 1.29 2019/10/10 15:41:29 prlw1 Exp $
-SHA1 (clamav-0.101.2.tar.gz) = 6545fc72fbc4e3e8b7e845e08edd0a36142d033e
-RMD160 (clamav-0.101.2.tar.gz) = 53fddb9858c49c8b11654b204cf2e5938e193a7c
-SHA512 (clamav-0.101.2.tar.gz) = f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
-Size (clamav-0.101.2.tar.gz) = 21722932 bytes
-SHA1 (patch-Makefile.in) = c3bdefe7f7d0fee58ce3a1f16c00b3739ab8586a
+SHA1 (clamav-0.102.0.tar.gz) = 42413ff5eaed69f20a3756fa3b06cbbb63ee7766
+RMD160 (clamav-0.102.0.tar.gz) = ef57b3c3d09ba2441251e13ea8963e7b905500e7
+SHA512 (clamav-0.102.0.tar.gz) = 7228f5f572e5ca32a458c262a5d297694059de04cb4a64364dd92e1d2e4560d58263d05bfb2053641ea7521c4040bef5a49b3cea27e77b907c95195cf4a54d84
+Size (clamav-0.102.0.tar.gz) = 13211357 bytes
+SHA1 (patch-Makefile.in) = a11766ea353d81fb281a07c8120e8a1f5c8dc60f
SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf
SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336
-SHA1 (patch-configure) = d3a0a77c522b8abb4a5144e29aacc8b110f31c5a
+SHA1 (patch-configure) = 6f05e6ee90ce96e56e0f427b14d729c79a255067
SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46
SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6
SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676
-SHA1 (patch-libclamav_fmap.c) = a4c08f96e3d3aae57533e8e8294358fcb26a6db4
-SHA1 (patch-libclamav_fmap.h) = c486e4fd957f2cc9811c5a0422db69c85f0f9e0f
+SHA1 (patch-libclamav_fmap.c) = 9b37b4edf19b36557b8ea3666ff21854582ab2e1
+SHA1 (patch-libclamav_fmap.h) = b9d19b872bc7946da4a321d3d84b7e916f84d31c
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/patches/patch-Makefile.in
--- a/security/clamav/patches/patch-Makefile.in Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/patches/patch-Makefile.in Thu Oct 10 15:41:29 2019 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.5 2019/08/05 14:44:20 prlw1 Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2019/10/10 15:41:30 prlw1 Exp $
Install etc files manually.
---- Makefile.in.orig 2018-09-19 19:29:07.000000000 +0000
+--- Makefile.in.orig 2019-10-01 17:24:08.000000000 +0000
+++ Makefile.in
-@@ -303,7 +303,7 @@ ETAGS = etags
+@@ -300,7 +300,7 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
- DIST_SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam \
-- sigtool clamconf database docs etc clamav-milter test clamdtop \
-+ sigtool clamconf database docs clamav-milter test clamdtop \
- clambc unit_tests clamsubmit libfreshclam fuzz
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
+ DIST_SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \
+- freshclam sigtool clamconf database docs etc clamav-milter \
++ freshclam sigtool clamconf database docs clamav-milter \
+ test clamdtop clambc unit_tests clamonacc clamsubmit fuzz
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
+ $(srcdir)/clamav-config.in $(srcdir)/clamav-types.h.in \
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/patches/patch-configure
--- a/security/clamav/patches/patch-configure Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/patches/patch-configure Thu Oct 10 15:41:29 2019 +0000
@@ -1,10 +1,30 @@
-$NetBSD: patch-configure,v 1.4 2016/06/12 16:06:01 taca Exp $
+$NetBSD: patch-configure,v 1.5 2019/10/10 15:41:30 prlw1 Exp $
Portability fixes.
---- configure.orig 2016-04-22 16:19:50.000000000 +0000
+--- configure.orig 2019-10-01 17:24:08.000000000 +0000
+++ configure
-@@ -16835,7 +16835,7 @@ $as_echo "yes" >&6; }
+@@ -18269,7 +18269,7 @@ else
+ fi
+
+
+- if test x$enable_libclamav_only == xyes; then
++ if test x$enable_libclamav_only = xyes; then
+ BUILD_LIBCLAMAV_ONLY_TRUE=
+ BUILD_LIBCLAMAV_ONLY_FALSE='#'
+ else
+@@ -18278,8 +18278,8 @@ else
+ fi
+
+
+-if test "$enable_libclamav_only" == "yes"; then
+- if test x$enable_libclamav_only == xno; then
++if test "$enable_libclamav_only" = "yes"; then
++ if test x$enable_libclamav_only = xno; then
+ BUILD_CLAMONACC_TRUE=
+ BUILD_CLAMONACC_FALSE='#'
+ else
+@@ -21224,7 +21224,7 @@ $as_echo "yes" >&6; }
HAVE_LIBCHECK=yes
fi
@@ -13,3 +33,25 @@
CHECK_CPPFLAGS=$CHECK_CFLAGS
else
+@@ -29013,10 +29013,10 @@ fi
+
+ ;;
+ *)
+- if test "$enable_clamonacc" == "yes"; then
++ if test "$enable_clamonacc" = "yes"; then
+ as_fn_error $? "Clamonacc was explicitly requested, but the platform ($host_os) you are trying to build on is not currently supported for this tool." "$LINENO" 5
+ fi
+- if test x$enable_clamonacc == xno; then
++ if test x$enable_clamonacc = xno; then
+ BUILD_CLAMONACC_TRUE=
+ BUILD_CLAMONACC_FALSE='#'
+ else
+@@ -29027,7 +29027,7 @@ fi
+ ;;
+ esac
+ else
+- if test x$enable_clamonacc == xyes; then
++ if test x$enable_clamonacc = xyes; then
+ BUILD_CLAMONACC_TRUE=
+ BUILD_CLAMONACC_FALSE='#'
+ else
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/patches/patch-libclamav_fmap.c
--- a/security/clamav/patches/patch-libclamav_fmap.c Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/patches/patch-libclamav_fmap.c Thu Oct 10 15:41:29 2019 +0000
@@ -1,25 +1,25 @@
-$NetBSD: patch-libclamav_fmap.c,v 1.1 2017/07/24 09:39:42 maya Exp $
+$NetBSD: patch-libclamav_fmap.c,v 1.2 2019/10/10 15:41:30 prlw1 Exp $
rename gets to my_gets to avoid conflict with fortify/ssp - they use
macros to override libc functions
---- libclamav/fmap.c.orig 2016-04-22 15:02:19.000000000 +0000
+--- libclamav/fmap.c.orig 2019-10-01 17:24:09.000000000 +0000
+++ libclamav/fmap.c
-@@ -274,7 +274,7 @@ extern cl_fmap_t *cl_fmap_open_handle(vo
- m->unmap = use_aging ? unmap_mmap : unmap_malloc;
- m->need = handle_need;
- m->need_offstr = handle_need_offstr;
-- m->gets = handle_gets;
-+ m->my_gets = handle_gets;
- m->unneed_off = handle_unneed_off;
+@@ -278,7 +278,7 @@ extern cl_fmap_t *cl_fmap_open_handle(vo
+ m->unmap = use_aging ? unmap_mmap : unmap_malloc;
+ m->need = handle_need;
+ m->need_offstr = handle_need_offstr;
+- m->gets = handle_gets;
++ m->my_gets = handle_gets;
+ m->unneed_off = handle_unneed_off;
return m;
}
-@@ -664,7 +664,7 @@ extern cl_fmap_t *cl_fmap_open_memory(co
- m->unmap = unmap_malloc;
- m->need = mem_need;
+@@ -674,7 +674,7 @@ extern cl_fmap_t *cl_fmap_open_memory(co
+ m->unmap = unmap_malloc;
+ m->need = mem_need;
m->need_offstr = mem_need_offstr;
-- m->gets = mem_gets;
-+ m->my_gets = mem_gets;
- m->unneed_off = mem_unneed_off;
+- m->gets = mem_gets;
++ m->my_gets = mem_gets;
+ m->unneed_off = mem_unneed_off;
return m;
}
diff -r a65420b28930 -r 426cbe53d6c2 security/clamav/patches/patch-libclamav_fmap.h
--- a/security/clamav/patches/patch-libclamav_fmap.h Thu Oct 10 14:27:39 2019 +0000
+++ b/security/clamav/patches/patch-libclamav_fmap.h Thu Oct 10 15:41:29 2019 +0000
@@ -1,23 +1,23 @@
-$NetBSD: patch-libclamav_fmap.h,v 1.1 2017/07/24 09:39:42 maya Exp $
+$NetBSD: patch-libclamav_fmap.h,v 1.2 2019/10/10 15:41:30 prlw1 Exp $
rename gets to my_gets to avoid conflict with fortify/ssp - they use
macros to override libc functions
---- libclamav/fmap.h.orig 2016-04-22 15:02:19.000000000 +0000
+--- libclamav/fmap.h.orig 2019-10-01 17:24:09.000000000 +0000
+++ libclamav/fmap.h
-@@ -74,7 +74,7 @@ struct cl_fmap {
- void (*unmap)(fmap_t*);
- const void* (*need)(fmap_t*, size_t at, size_t len, int lock);
- const void* (*need_offstr)(fmap_t*, size_t at, size_t len_hint);
-- const void* (*gets)(fmap_t*, char *dst, size_t *at, size_t max_len);
-+ const void* (*my_gets)(fmap_t*, char *dst, size_t *at, size_t max_len);
- void (*unneed_off)(fmap_t*, size_t at, size_t len);
+@@ -75,7 +75,7 @@ struct cl_fmap {
+ void (*unmap)(fmap_t *);
+ const void *(*need)(fmap_t *, size_t at, size_t len, int lock);
+ const void *(*need_offstr)(fmap_t *, size_t at, size_t len_hint);
+- const void *(*gets)(fmap_t *, char *dst, size_t *at, size_t max_len);
++ const void *(*my_gets)(fmap_t *, char *dst, size_t *at, size_t max_len);
+ void (*unneed_off)(fmap_t *, size_t at, size_t len);
#ifdef _WIN32
HANDLE fh;
-@@ -156,7 +156,7 @@ static inline const void *fmap_need_offs
- }
+@@ -169,7 +169,7 @@ static inline const void *fmap_need_offs
- static inline const void *fmap_gets(fmap_t *m, char *dst, size_t *at, size_t max_len) {
+ static inline const void *fmap_gets(fmap_t *m, char *dst, size_t *at, size_t max_len)
+ {
- return m->gets(m, dst, at, max_len);
+ return m->my_gets(m, dst, at, max_len);
}
Home |
Main Index |
Thread Index |
Old Index