mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
- Update to 0.90.3
- Remove unzoo support (clam doesn't support it anymore) PR: ports/113174 Submitted by: Michael Scheidell <scheidell@secnap.net>
This commit is contained in:
parent
f544ad6e1a
commit
0744663c92
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192544
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= clamav
|
||||
PORTVERSION= 0.90.2
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.90.3
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= SF
|
||||
|
||||
@ -19,7 +18,6 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
|
||||
OPTIONS= ARC "Enable arch archives support" On \
|
||||
ARJ "Enable arj archives support" On \
|
||||
LHA "Enable lha archives support" On \
|
||||
UNZOO "Enavle zoo archives support" On \
|
||||
MILTER "Compile the milter interface" Off \
|
||||
LDAP "libmilter was built with LDAP" Off \
|
||||
CURL "Support URL downloading" Off \
|
||||
@ -125,9 +123,6 @@ RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj
|
||||
.if !defined(WITHOUT_LHA)
|
||||
RUN_DEPENDS+= lha:${PORTSDIR}/archivers/lha
|
||||
.endif
|
||||
.if !defined(WITHOUT_UNZOO)
|
||||
RUN_DEPENDS+= unzoo:${PORTSDIR}/archivers/unzoo
|
||||
.endif
|
||||
|
||||
.if defined(WITH_MILTER)
|
||||
USE_RC_SUBR+= clamav-milter
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (clamav-0.90.2.tar.gz) = 39d1f07a399b551b55096b6ec7325c33
|
||||
SHA256 (clamav-0.90.2.tar.gz) = 30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa
|
||||
SIZE (clamav-0.90.2.tar.gz) = 12062886
|
||||
MD5 (clamav-0.90.3.tar.gz) = d42ccf7a32daeb7c7cc3c8c23a7793ea
|
||||
SHA256 (clamav-0.90.3.tar.gz) = 939913d15ad0dc583ba609274ae61a948f4fa18b848bd503d958feacdaab54a4
|
||||
SIZE (clamav-0.90.3.tar.gz) = 12496857
|
||||
|
@ -1,65 +0,0 @@
|
||||
--- libclamav/matcher-ac.c.orig Mon Apr 9 19:16:01 2007
|
||||
+++ libclamav/matcher-ac.c Mon Apr 9 19:25:18 2007
|
||||
@@ -301,7 +301,7 @@
|
||||
|
||||
int cli_ac_initdata(struct cli_ac_data *data, unsigned int partsigs, unsigned int tracklen)
|
||||
{
|
||||
- unsigned int i, j;
|
||||
+ unsigned int i;
|
||||
|
||||
|
||||
if(!data) {
|
||||
@@ -366,30 +366,26 @@
|
||||
* allocation in cli_ac_scanbuff()
|
||||
*/
|
||||
|
||||
- for(i = 0; i < partsigs; i++) {
|
||||
- data->partoff[i] = (unsigned int *) cli_calloc(tracklen, sizeof(unsigned int));
|
||||
+ data->partoff[0] = (unsigned int *) cli_calloc(partsigs * tracklen, sizeof(unsigned int));
|
||||
|
||||
- if(!data->partoff[i]) {
|
||||
- for(j = 0; j < i; j++)
|
||||
- free(data->partoff[j]);
|
||||
-
|
||||
- free(data->partoff);
|
||||
- free(data->partcnt);
|
||||
- free(data->offcnt);
|
||||
- free(data->offidx);
|
||||
- free(data->maxshift);
|
||||
- cli_errmsg("cli_ac_init(): unable to cli_calloc(%u, %u)\n", tracklen, sizeof(unsigned int));
|
||||
- return CL_EMEM;
|
||||
- }
|
||||
+ if(!data->partoff[0]) {
|
||||
+ free(data->partoff);
|
||||
+ free(data->partcnt);
|
||||
+ free(data->offcnt);
|
||||
+ free(data->offidx);
|
||||
+ free(data->maxshift);
|
||||
+ cli_errmsg("cli_ac_init(): unable to cli_calloc(%u, %u)\n", partsigs * tracklen, sizeof(unsigned int));
|
||||
+ return CL_EMEM;
|
||||
}
|
||||
|
||||
+ for(i = 0; i < partsigs; i++)
|
||||
+ data->partoff[i] = data->partoff[0] + tracklen * i;
|
||||
+
|
||||
return CL_SUCCESS;
|
||||
}
|
||||
|
||||
void cli_ac_freedata(struct cli_ac_data *data)
|
||||
{
|
||||
- unsigned int i;
|
||||
-
|
||||
|
||||
if(data && data->partsigs) {
|
||||
free(data->partcnt);
|
||||
@@ -397,9 +393,7 @@
|
||||
free(data->offidx);
|
||||
free(data->maxshift);
|
||||
|
||||
- for(i = 0; i < data->partsigs; i++)
|
||||
- free(data->partoff[i]);
|
||||
-
|
||||
+ free(data->partoff[0]);
|
||||
free(data->partoff);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user