From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 15 01:20:04 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A3F616A408 for ; Thu, 15 Feb 2007 01:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id F06B713C4AC for ; Thu, 15 Feb 2007 01:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1F1K3pS078520 for ; Thu, 15 Feb 2007 01:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1F1K3UT078519; Thu, 15 Feb 2007 01:20:03 GMT (envelope-from gnats) Resent-Date: Thu, 15 Feb 2007 01:20:03 GMT Resent-Message-Id: <200702150120.l1F1K3UT078519@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Michael Scheidell Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1264C16A402 for ; Thu, 15 Feb 2007 01:11:21 +0000 (UTC) (envelope-from scheidell@secnap.net) Received: from scanner.secnap.net (corp.secnap.com [204.89.241.135]) by mx1.freebsd.org (Postfix) with ESMTP id C67EB13C4AC for ; Thu, 15 Feb 2007 01:11:20 +0000 (UTC) (envelope-from scheidell@secnap.net) Received: by scanner.secnap.net (Postfix, from userid 1001) id E925D1CCF4; Wed, 14 Feb 2007 20:11:19 -0500 (EST) Message-Id: <20070215011119.E925D1CCF4@scanner.secnap.net> Date: Wed, 14 Feb 2007 20:11:19 -0500 (EST) From: Michael Scheidell To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: garga@FreeBSD.org Subject: ports/109185: patches to update clamav .87 to .90 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2007 01:20:04 -0000 >Number: 109185 >Category: ports >Synopsis: patches to update clamav .87 to .90 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 15 01:20:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Michael Scheidell >Release: FreeBSD 5.5-RELEASE-p8 i386 >Organization: SECNAP Network Security Corporation >Environment: System: FreeBSD scanner.secnap.net 5.5-RELEASE-p8 FreeBSD 5.5-RELEASE-p8 #2: Fri Dec 29 22:23:34 EST 2006 scheidell@scanner.secnap.net:/usr/obj/usr/src/sys/HACKERTRAP_750 i386 >Description: Clamav has released .90. Current .87 versions will complain about missing functionality unless updated. Note: For some reason, I could no get this to compile on 4.11 systems >How-To-Repeat: run program 'freshclam -V' >Fix: Apply this patch. Note that librar not supported, rar and unzip not needed (compiled in now) Also note, some files/* (patches) not needed either. These should be removed from files/* patch-libclamav::zziplib::zzip-conf.h patch-libclamav_clamav.h extra-patch-libclamav__unrarlib.h diff -bBru /var/tmp/clamav.orig /usr/ports/security/clamav diff -bBru /var/tmp/clamav.orig/Makefile /usr/ports/security/clamav/Makefile --- /var/tmp/clamav.orig/Makefile Wed Dec 13 07:41:33 2006 +++ /usr/ports/security/clamav/Makefile Wed Feb 14 17:23:09 2007 @@ -6,8 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 0.88.7 -PORTREVISION= 1 +PORTVERSION= 0.90 CATEGORIES= security MASTER_SITES= SF @@ -18,12 +17,11 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \ arj:${PORTSDIR}/archivers/arj \ unzoo:${PORTSDIR}/archivers/unzoo \ - arc:${PORTSDIR}/archivers/arc \ - unzip:${PORTSDIR}/archivers/unzip + arc:${PORTSDIR}/archivers/arc OPTIONS= MILTER "Compile the milter interface" Off \ CURL "Support URL downloading" Off \ - LIBUNRAR "Support for external Unrar library" Off \ + LIBUNRAR "Support for external Unrar library (unsupported)" Off \ STDERR "Print logs to stderr instead of stdout" Off USE_AUTOTOOLS= libtool:15 @@ -83,10 +81,10 @@ -e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \ -e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \ -e 's|^\#?(ScanMail)$$|\1|' \ - -e 's|^\#?(NotifyClamd)$$|\1|' \ -e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \ -e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \ - -e 's|^\#?(FixStaleSocket)$$|\1|' + -e 's|^\#?(FixStaleSocket)$$|\1|' \ + -e 's|(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ CLAMAVGROUP=${CLAMAVGROUP} @@ -92,9 +90,10 @@ CLAMAVGROUP=${CLAMAVGROUP} .include - .if ${OSVERSION} == 502010 PTHREAD_LIBS= -pthread +.elif ${OSVERSION} < 500000 +BROKEN = Wants broken pthread libs. patches welcome .endif .if defined(WITH_MILTER) @@ -122,15 +121,15 @@ CONFIGURE_ARGS+= --without-libcurl .endif -.if defined(WITH_LIBUNRAR) -CFLAGS+= -DUNRAR3 -LDFLAGS+= -lunrar -LIB_DEPENDS+= unrar.3:${PORTSDIR}/archivers/libunrar -EXTRA_PATCHES= ${FILESDIR}/extra-patch-libunrar -.else -RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar -EXTRA_PATCHES= ${FILESDIR}/extra-patch-libclamav__unrarlib.h -.endif +#.if defined(WITH_LIBUNRAR) +COMMENT= "Libunrar unsupported at this time. Please help with patches" +#CFLAGS+= -DUNRAR3 +#LDFLAGS+= -lunrar +#LIB_DEPENDS+= unrar.3:${PORTSDIR}/archivers/libunrar +#EXTRA_PATCHES= ${FILESDIR}/extra-patch-libunrar +#.else +#RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar +#.endif .if defined(WITH_STDERR) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-shared_output.c diff -bBru /var/tmp/clamav.orig/distinfo /usr/ports/security/clamav/distinfo --- /var/tmp/clamav.orig/distinfo Tue Dec 12 12:03:24 2006 +++ /usr/ports/security/clamav/distinfo Wed Feb 14 09:49:33 2007 @@ -1,3 +1,3 @@ -MD5 (clamav-0.88.7.tar.gz) = 34a9d58cf5bcb04dbe3eb32b5367a3f8 -SHA256 (clamav-0.88.7.tar.gz) = 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2 -SIZE (clamav-0.88.7.tar.gz) = 9510548 +MD5 (clamav-0.90.tar.gz) = f04372e49c3c5ff3bd94bbe1fef2eaca +SHA256 (clamav-0.90.tar.gz) = c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d +SIZE (clamav-0.90.tar.gz) = 11575374 diff -bBru /var/tmp/clamav.orig/files/patch-configure /usr/ports/security/clamav/files/patch-configure --- /var/tmp/clamav.orig/files/patch-configure Tue Jun 28 14:57:42 2005 +++ /usr/ports/security/clamav/files/patch-configure Wed Feb 14 09:58:38 2007 @@ -1,25 +1,5 @@ --- configure.orig Thu Jun 23 23:12:00 2005 +++ configure Tue Jun 28 20:53:10 2005 -@@ -10914,6 +10914,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+#include -+#include -+#include - #include - _ACEOF - rm -f conftest.$ac_objext -@@ -10957,6 +10960,9 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include -+#include -+#include - #include - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -11195,19 +11201,25 @@ sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` >Release-Note: >Audit-Trail: >Unformatted: