[Midnightbsd-cvs] mports [16530] trunk/security/clamav/files: put these back..

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 22 21:33:46 EDT 2014


Revision: 16530
          http://svnweb.midnightbsd.org/mports/?rev=16530
Author:   laffer1
Date:     2014-08-22 21:33:45 -0400 (Fri, 22 Aug 2014)
Log Message:
-----------
put these back.. accident

Added Paths:
-----------
    trunk/security/clamav/files/patch-freshclam__Makefile.in
    trunk/security/clamav/files/patch-libclamav-c++-llvm

Added: trunk/security/clamav/files/patch-freshclam__Makefile.in
===================================================================
--- trunk/security/clamav/files/patch-freshclam__Makefile.in	                        (rev 0)
+++ trunk/security/clamav/files/patch-freshclam__Makefile.in	2014-08-23 01:33:45 UTC (rev 16530)
@@ -0,0 +1,11 @@
+--- freshclam/Makefile.in.orig	2014-06-09 10:19:33.000000000 -0300
++++ freshclam/Makefile.in	2014-06-09 10:20:12.000000000 -0300
+@@ -414,7 +414,7 @@
+     mirman.h
+ 
+ AM_CFLAGS = @WERR_CFLAGS@
+-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
+ CLEANFILES = *.gcda *.gcno
+ all: all-am

Added: trunk/security/clamav/files/patch-libclamav-c++-llvm
===================================================================
--- trunk/security/clamav/files/patch-libclamav-c++-llvm	                        (rev 0)
+++ trunk/security/clamav/files/patch-libclamav-c++-llvm	2014-08-23 01:33:45 UTC (rev 16530)
@@ -0,0 +1,62 @@
+--- 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



More information about the Midnightbsd-cvs mailing list