From nobody@FreeBSD.org  Fri Feb 13 09:32:58 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03B33106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Feb 2009 09:32:58 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id C9DED8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Feb 2009 09:32:57 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n1D9WvJ6007447
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Feb 2009 09:32:57 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n1D9WvMr007446;
	Fri, 13 Feb 2009 09:32:57 GMT
	(envelope-from nobody)
Message-Id: <200902130932.n1D9WvMr007446@www.freebsd.org>
Date: Fri, 13 Feb 2009 09:32:57 GMT
From: Tofig Suleymanov <tofig@freebsd.az>
To: freebsd-gnats-submit@FreeBSD.org
Subject: www/c-icap + latest clamav does not compile
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         131632
>Category:       ports
>Synopsis:       www/c-icap + latest clamav does not compile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 13 09:40:00 UTC 2009
>Closed-Date:    Sat Feb 21 10:37:46 UTC 2009
>Last-Modified:  Sat Feb 21 10:37:46 UTC 2009
>Originator:     Tofig Suleymanov
>Release:        FreeBSD 7.0-RELEASE-p4
>Organization:
BP
>Environment:
gw# uname -a
FreeBSD gw 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #1: Wed Sep 24 23:39:08 AZST 2008     root@gw:/usr/obj/usr/src/sys/GW  i386
gw# 

>Description:
www/c-icap is marked broken most probably because of problems compiling with latest versions of security/clamav.

According to the clamav changelog, the cl_load() function was introduced as a successor of cl_loaddb() and cl_loaddbdir() starting from Sat, Nov 12, 2005.
 
www/c-icap in its turn still tries to use cl_loaddbdir() which leads to compile-time errors.


>How-To-Repeat:
In order to repeat the problem just try to compile www/c-icap.
>Fix:
Patch file attached below utilizes cl_load() function instead old cl_loaddbdir() so that compilation finishes fine.

Place the patch to port's root directory: www/c-icap and do patch < c_icap.patch.txt



Patch attached with submission follows:

diff -ruN work/c_icap-030606rc1/services/clamav/srv_clamav.c work.patched/c_icap-030606rc1/services/clamav/srv_clamav.c
--- work/c_icap-030606rc1/services/clamav/srv_clamav.c	2006-06-06 22:08:13.000000000 +0500
+++ work.patched/c_icap-030606rc1/services/clamav/srv_clamav.c	2009-02-13 11:33:57.000000000 +0400
@@ -137,17 +137,18 @@
 
 
 int srvclamav_init_service(service_module_t *this,struct icap_server_conf *server_conf){
-     int ret,no=0,i;
+     int ret,i;
+     unsigned int no = 0;
+     unsigned int options = 0;
+     options = options & CL_DB_STDOPT;
      magic_db=server_conf->MAGIC_DB;
      scantypes=(int *)malloc(ci_magic_types_num(magic_db)*sizeof(int));
      scangroups=(int *)malloc(ci_magic_groups_num(magic_db)*sizeof(int));
 
      for(i=0;i<ci_magic_types_num(magic_db);i++)  scantypes[i]=0;
      for(i=0;i<ci_magic_groups_num(magic_db);i++)  scangroups[i]=0;
-
-
      ci_debug_printf(10,"Going to initialize srvclamav\n");;
-     if((ret = cl_loaddbdir(cl_retdbdir(), &root, &no))) {
+     if((ret = cl_load(cl_retdbdir(), &root, &no, options))) {
 	  ci_debug_printf(1,"cl_loaddbdir: %s\n", cl_perror(ret));
 	  return 0;
      }
@@ -161,7 +162,7 @@
      limits.maxfiles = 0/*1000*/; /* max files */
      limits.maxfilesize = 100 * 1048576; /* maximal archived file size == 100 Mb */
      limits.maxreclevel = 5; /* maximal recursion level */
-     limits.maxratio = 200; /* maximal compression ratio */
+     //limits.maxratio = 200; /* maximal compression ratio */
      limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */
      return 1;
 }


>Release-Note:
>Audit-Trail:

From: Tofig Suleymanov <tofig@freebsd.az>
To: bug-followup@FreeBSD.org, tofig@freebsd.az
Cc:  
Subject: Re: misc/131632: www/c-icap + latest clamav does not compile
Date: Fri, 13 Feb 2009 15:35:33 +0400

 --001636c5b0b32881a60462cb3cb8
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Folks,
 
 sorry for the previous patch which is broken. Please consider using
 this one enclosed.
 
 
 Thanks !
 
 --001636c5b0b32881a60462cb3cb8
 Content-Type: text/plain; charset=US-ASCII; name="c_icap.patch.txt"
 Content-Disposition: attachment; filename="c_icap.patch.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_fr4s8cwg0
 
 ZGlmZiAtcnVOIHdvcmsvY19pY2FwLTAzMDYwNnJjMS9zZXJ2aWNlcy9jbGFtYXYvc3J2X2NsYW1h
 di5jIHdvcmsucGF0Y2hlZC9jX2ljYXAtMDMwNjA2cmMxL3NlcnZpY2VzL2NsYW1hdi9zcnZfY2xh
 bWF2LmMKLS0tIHdvcmsvY19pY2FwLTAzMDYwNnJjMS9zZXJ2aWNlcy9jbGFtYXYvc3J2X2NsYW1h
 di5jCTIwMDYtMDYtMDYgMjI6MDg6MTMuMDAwMDAwMDAwICswNTAwCisrKyB3b3JrLnBhdGNoZWQv
 Y19pY2FwLTAzMDYwNnJjMS9zZXJ2aWNlcy9jbGFtYXYvc3J2X2NsYW1hdi5jCTIwMDktMDItMTMg
 MTE6MzM6NTcuMDAwMDAwMDAwICswNDAwCkBAIC0xMzcsMTcgKzEzNywxOCBAQAogCiAKIGludCBz
 cnZjbGFtYXZfaW5pdF9zZXJ2aWNlKHNlcnZpY2VfbW9kdWxlX3QgKnRoaXMsc3RydWN0IGljYXBf
 c2VydmVyX2NvbmYgKnNlcnZlcl9jb25mKXsKLSAgICAgaW50IHJldCxubz0wLGk7CisgICAgIGlu
 dCByZXQsaTsKKyAgICAgdW5zaWduZWQgaW50IG5vID0gMDsKKyAgICAgdW5zaWduZWQgaW50IG9w
 dGlvbnMgPSAwOworICAgICBvcHRpb25zID0gb3B0aW9ucyB8IENMX0RCX1NURE9QVDsKICAgICAg
 bWFnaWNfZGI9c2VydmVyX2NvbmYtPk1BR0lDX0RCOwogICAgICBzY2FudHlwZXM9KGludCAqKW1h
 bGxvYyhjaV9tYWdpY190eXBlc19udW0obWFnaWNfZGIpKnNpemVvZihpbnQpKTsKICAgICAgc2Nh
 bmdyb3Vwcz0oaW50ICopbWFsbG9jKGNpX21hZ2ljX2dyb3Vwc19udW0obWFnaWNfZGIpKnNpemVv
 ZihpbnQpKTsKIAogICAgICBmb3IoaT0wO2k8Y2lfbWFnaWNfdHlwZXNfbnVtKG1hZ2ljX2RiKTtp
 KyspICBzY2FudHlwZXNbaV09MDsKICAgICAgZm9yKGk9MDtpPGNpX21hZ2ljX2dyb3Vwc19udW0o
 bWFnaWNfZGIpO2krKykgIHNjYW5ncm91cHNbaV09MDsKLQotCiAgICAgIGNpX2RlYnVnX3ByaW50
 ZigxMCwiR29pbmcgdG8gaW5pdGlhbGl6ZSBzcnZjbGFtYXZcbiIpOzsKLSAgICAgaWYoKHJldCA9
 IGNsX2xvYWRkYmRpcihjbF9yZXRkYmRpcigpLCAmcm9vdCwgJm5vKSkpIHsKKyAgICAgaWYoKHJl
 dCA9IGNsX2xvYWQoY2xfcmV0ZGJkaXIoKSwgJnJvb3QsICZubywgb3B0aW9ucykpKSB7CiAJICBj
 aV9kZWJ1Z19wcmludGYoMSwiY2xfbG9hZGRiZGlyOiAlc1xuIiwgY2xfcGVycm9yKHJldCkpOwog
 CSAgcmV0dXJuIDA7CiAgICAgIH0KQEAgLTE2MSw3ICsxNjIsNyBAQAogICAgICBsaW1pdHMubWF4
 ZmlsZXMgPSAwLyoxMDAwKi87IC8qIG1heCBmaWxlcyAqLwogICAgICBsaW1pdHMubWF4ZmlsZXNp
 emUgPSAxMDAgKiAxMDQ4NTc2OyAvKiBtYXhpbWFsIGFyY2hpdmVkIGZpbGUgc2l6ZSA9PSAxMDAg
 TWIgKi8KICAgICAgbGltaXRzLm1heHJlY2xldmVsID0gNTsgLyogbWF4aW1hbCByZWN1cnNpb24g
 bGV2ZWwgKi8KLSAgICAgbGltaXRzLm1heHJhdGlvID0gMjAwOyAvKiBtYXhpbWFsIGNvbXByZXNz
 aW9uIHJhdGlvICovCisgICAgIC8vbGltaXRzLm1heHJhdGlvID0gMjAwOyAvKiBtYXhpbWFsIGNv
 bXByZXNzaW9uIHJhdGlvICovCiAgICAgIGxpbWl0cy5hcmNoaXZlbWVtbGltID0gMDsgLyogZGlz
 YWJsZSBtZW1vcnkgbGltaXQgZm9yIGJ6aXAyIHNjYW5uZXIgKi8KICAgICAgcmV0dXJuIDE7CiB9
 Cg==
 --001636c5b0b32881a60462cb3cb8--
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Feb 13 13:09:54 UTC 2009 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131632 
State-Changed-From-To: open->closed 
State-Changed-By: stas 
State-Changed-When: Sat Feb 21 10:37:45 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131632 
>Unformatted:
