Attachment 139177 Details for Bug 185366 – clamav.patch

[patch] clamav.patch

clamav.patch (text/plain), 4.07 KB, created by Tijl Coosemans on 2013-12-31 12:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2013-12-31 12:00:00 UTC

Size: 4.07 KB

patch

obsolete

>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 <algorithm>
>+ #include <cassert>
>+ #include <cctype>
>++#include <cstdlib>
>+ 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 <class Ptr, class USE_iterator> // Predecessor Iterator
>+ class PredIterator : public std::iterator<std::forward_iterator_tag,
>+-                                          Ptr, ptrdiff_t> {
>+-  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
>++                                          Ptr, ptrdiff_t, Ptr*, Ptr*> {
>++  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*,
>++                                                                    Ptr*> super;
>+   typedef PredIterator<Ptr, USE_iterator> 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<TerminatorInst>(*It)->getParent();
>+   }
>+@@ -100,10 +102,11 @@
>+ 
>+ template <class Term_, class BB_>           // Successor Iterator
>+ class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
>+-                                          BB_, ptrdiff_t> {
>++                                          BB_, ptrdiff_t, BB_*, BB_*> {
>+   const Term_ Term;
>+   unsigned idx;
>+-  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
>++  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*,
>++                                                                    BB_*> super;
>+   typedef SuccIterator<Term_, BB_> 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

Actions: View | Diff

Attachments on bug 185366: 139177