svn commit: r395327 - in head/security/obfsclient: . files

[Xin LI]

Author: delphij
Date: Wed Aug 26 00:23:39 2015
New Revision: 395327
URL: https://svnweb.freebsd.org/changeset/ports/395327

Log:
  Fix security/obfsclient build with clang 3.7.0.
  
  PR:		ports/202581
  Submitted by:	dim

Added:
  head/security/obfsclient/files/patch-ext-easylogging++.h   (contents, props changed)
Modified:
  head/security/obfsclient/Makefile

Modified: head/security/obfsclient/Makefile
==============================================================================
--- head/security/obfsclient/Makefile	Tue Aug 25 23:58:18 2015	(r395326)
+++ head/security/obfsclient/Makefile	Wed Aug 26 00:23:39 2015	(r395327)
@@ -3,7 +3,7 @@
 
 PORTNAME=	obfsclient
 PORTVERSION=	0.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	fk at fabiankeil.de

Added: head/security/obfsclient/files/patch-ext-easylogging++.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/obfsclient/files/patch-ext-easylogging++.h	Wed Aug 26 00:23:39 2015	(r395327)
@@ -0,0 +1,20 @@
+--- src/ext/easylogging++.h.orig	2014-03-28 09:35:09.000000000 +0100
++++ src/ext/easylogging++.h	2015-08-23 00:44:41.276551000 +0200
+@@ -3586,7 +3586,7 @@ class LogMessage {
+     LogMessage(const Level& level, const char* file, unsigned long int line, const char* func,  // NOLINT
+                           base::VRegistry::VLevel verboseLevel, Logger* logger) :
+                   m_level(level), m_file(file), m_line(line), m_func(func),
+-                  m_verboseLevel(verboseLevel), m_logger(logger), m_message(std::move(logger->stream().str())) {
++                  m_verboseLevel(verboseLevel), m_logger(logger), m_message(logger->stream().str()) {
+     }
+     inline const Level& level(void) const { return m_level; }
+     inline const char* file(void) const { return m_file; }
+@@ -3895,7 +3895,7 @@ class LogDispatcher : base::NoCopy {
+         if (ELPP->hasFlag(LoggingFlag::StrictLogFileSizeCheck)) {
+             tc->validateFileRolling(m_logMessage.level(), ELPP->preRollOutHandler());
+         }
+-        dispatch(std::move(m_logMessage.logger()->logBuilder()->build(&m_logMessage, m_dispatchAction == base::DispatchAction::NormalLog)));
++        dispatch(m_logMessage.logger()->logBuilder()->build(&m_logMessage, m_dispatchAction == base::DispatchAction::NormalLog));
+         if (lockLogger) {
+             m_logMessage.logger()->unlock();
+         }