From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 31 12:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE19639C for ; Tue, 31 Dec 2013 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A5B151ADA for ; Tue, 31 Dec 2013 12:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVC00w5024200 for ; Tue, 31 Dec 2013 12:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBVC00SJ024199; Tue, 31 Dec 2013 12:00:00 GMT (envelope-from gnats) Resent-Date: Tue, 31 Dec 2013 12:00:00 GMT Resent-Message-Id: <201312311200.rBVC00SJ024199@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, Tijl Coosemans Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9C2122F for ; Tue, 31 Dec 2013 11:54:05 +0000 (UTC) Received: from mailrelay004.isp.belgacom.be (mailrelay004.isp.belgacom.be [195.238.6.170]) by mx1.freebsd.org (Postfix) with ESMTP id 433721ABE for ; Tue, 31 Dec 2013 11:54:04 +0000 (UTC) Received: from 251.67-129-109.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([109.129.67.251]) by relay.skynet.be with ESMTP; 31 Dec 2013 12:53:56 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id rBVBrsQf049631 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 31 Dec 2013 12:53:55 +0100 (CET) (envelope-from tijl@kalimero.tijl.coosemans.org) Received: (from tijl@localhost) by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id rBVBrsXE049630; Tue, 31 Dec 2013 12:53:54 +0100 (CET) (envelope-from tijl) Message-Id: <201312311153.rBVBrsXE049630@kalimero.tijl.coosemans.org> Date: Tue, 31 Dec 2013 12:53:54 +0100 (CET) From: Tijl Coosemans To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/185366: [patch] security/clamav: remove USE_GCC=any X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Tijl Coosemans List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2013 12:00:01 -0000 >Number: 185366 >Category: ports >Synopsis: [patch] security/clamav: remove USE_GCC=any >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 31 12:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 11.0-CURRENT i386 >Organization: >Environment: >Description: The attached patch removes USE_GCC=any. It also adds a new patch to the port to make the bundled LLVM build with libc++. The patch for libclamav/c++/llvm/include/llvm/Support/CFG.h is LLVM revision 178240. It is the same as patch-svn-r178240 in the devel/llvm32 port. >How-To-Repeat: >Fix: --- clamav.patch begins here --- Index: security/clamav/Makefile =================================================================== --- security/clamav/Makefile (revision 337955) +++ security/clamav/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF @@ -44,7 +44,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GCC= any USES= gmake USE_RC_SUBR= clamav-clamd clamav-freshclam Index: security/clamav/files/patch-libclamav-c++-llvm =================================================================== --- security/clamav/files/patch-libclamav-c++-llvm (revision 0) +++ security/clamav/files/patch-libclamav-c++-llvm (working copy) @@ -0,0 +1,72 @@ +--- libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp.orig ++++ libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + using namespace llvm; + + //===----------------------------------------------------------------------===// +--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig ++++ libclamav/c++/llvm/include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ + + template // Predecessor Iterator + class PredIterator : public std::iterator { +- typedef std::iterator super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator super; + typedef PredIterator Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast(*It)->getParent(); + } +@@ -100,10 +102,11 @@ + + template // Successor Iterator + class SuccIterator : public std::iterator { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator super; ++ typedef std::iterator super; + typedef SuccIterator Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement Property changes on: security/clamav/files/patch-libclamav-c++-llvm ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --- clamav.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: