Index: head/security/clamav/files/patch-libclamav-c++-llvm =================================================================== --- head/security/clamav/files/patch-libclamav-c++-llvm (revision 450393) +++ head/security/clamav/files/patch-libclamav-c++-llvm (nonexistent) @@ -1,62 +0,0 @@ ---- 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: head/security/clamav/files/patch-libclamav-c++-llvm ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/clamav/files/patch-configure =================================================================== --- head/security/clamav/files/patch-configure (revision 450393) +++ head/security/clamav/files/patch-configure (revision 450394) @@ -1,32 +1,23 @@ --- configure.orig 2016-04-22 16:19:50 UTC +++ configure @@ -18716,9 +18716,9 @@ then as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5 else - vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h` + vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h` if test -z "$vuln"; then - vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h` + vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h` fi if test -n "$vuln"; then -@@ -20758,7 +20758,7 @@ $as_echo "#define C_BSD 1" >>confdefs.h - ;; - freebsd*) - if test "$have_pthreads" = "yes"; then -- THREAD_LIBS="-lthr" -+ THREAD_LIBS="%%PTHREAD_LIBS%%" - TH_SAFE="-thread-safe" - fi - @@ -20934,7 +20934,7 @@ esac if test "$have_milter" = "yes"; then save_LIBS="$LIBS" - CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread" + CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS" if test -d /usr/lib/libmilter ; then CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter" fi Index: head/security/clamav/files/patch-libclamav_bytecode__api.c =================================================================== --- head/security/clamav/files/patch-libclamav_bytecode__api.c (nonexistent) +++ head/security/clamav/files/patch-libclamav_bytecode__api.c (revision 450394) @@ -0,0 +1,44 @@ +--- libclamav/bytecode_api.c.orig 2016-04-22 15:02:19 UTC ++++ libclamav/bytecode_api.c +@@ -811,8 +811,19 @@ int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx, + cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n"); + return -1; + } +- memset(&stream, 0, sizeof(stream)); +- ret = inflateInit2(&stream, windowBits); ++ b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n); ++ if (!b) { ++ return -1; ++ } ++ ctx->inflates = b; ++ ctx->ninflates = n; ++ b = &b[n-1]; ++ ++ b->from = from; ++ b->to = to; ++ b->needSync = 0; ++ memset(&b->stream, 0, sizeof(stream)); ++ ret = inflateInit2(&b->stream, windowBits); + switch (ret) { + case Z_MEM_ERROR: + cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n"); +@@ -830,19 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cli_bc_ctx *ctx, + return -1; + } + +- b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n); +- if (!b) { +- inflateEnd(&stream); +- return -1; +- } +- ctx->inflates = b; +- ctx->ninflates = n; +- b = &b[n-1]; +- +- b->from = from; +- b->to = to; +- b->needSync = 0; +- memcpy(&b->stream, &stream, sizeof(stream)); + return n-1; + } + Property changes on: head/security/clamav/files/patch-libclamav_bytecode__api.c ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/clamav/files/patch-libclamav_c++_llvm_include_llvm_Support_CFG.h =================================================================== --- head/security/clamav/files/patch-libclamav_c++_llvm_include_llvm_Support_CFG.h (nonexistent) +++ head/security/clamav/files/patch-libclamav_c++_llvm_include_llvm_Support_CFG.h (revision 450394) @@ -0,0 +1,62 @@ +--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig 2016-04-22 15:02:19 UTC ++++ libclamav/c++/llvm/include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ namespace llvm { + + 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 @@ class PredIterator : public std::iteratoruse_begin()) { + advancePastNonTerminators(); +@@ -49,7 +51,7 @@ class PredIterator : public std::iterator(*It)->getParent(); + } +@@ -87,10 +89,11 @@ inline const_pred_iterator pred_end(const BasicBlock * + + 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) { +@@ -99,6 +102,7 @@ class SuccIterator : public std::iteratorgetSuccessor(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: head/security/clamav/files/patch-libclamav_c++_llvm_include_llvm_Support_CFG.h ___________________________________________________________________ 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 Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property