- Update to 2.11.2

PR:		224180
This commit is contained in:
Ryan Steinmetz
2018-03-02 02:43:50 +00:00
parent 466738b16b
commit ac81d70b6f
3 changed files with 22 additions and 12 deletions

View File

@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= osquery
PORTVERSION= 2.10.2
PORTREVISION= 1
PORTVERSION= 2.11.2
CATEGORIES= sysutils
MAINTAINER= zi@FreeBSD.org
@@ -12,10 +11,7 @@ COMMENT= SQL powered OS instrumentation, monitoring, and analytics
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to link
#BROKEN= fails to build with boost 1.66, see bug 224180
BUILD_DEPENDS= thrift>0:devel/thrift \
BUILD_DEPENDS= thrift>=0.11.0:devel/thrift \
bash>0:shells/bash \
linenoise-ng>0:devel/linenoise-ng \
asio>0:net/asio \
@@ -41,7 +37,7 @@ CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \
SKIP_TESTS="yes" CC="${CC}" CXX="${CXX}"
CMAKE_ARGS+= -DFREEBSD=awesome -DCMAKE_SYSTEM_NAME="FreeBSD"
BLDDIR= ${WRKDIR}/.build/${PORTNAME}
TPVERSION= ${PORTVERSION}
TPVERSION= 2.11.0
USE_RC_SUBR= ${PORTNAME}d
USE_GITHUB= yes
GH_ACCOUNT= facebook ${PORTNAME}:tp

View File

@@ -1,5 +1,5 @@
TIMESTAMP = 1510683800
SHA256 (facebook-osquery-2.10.2_GH0.tar.gz) = cf4e809a8667a2155fdd99de26baf3f3774693bcf04db74323e3a9af0a78d40b
SIZE (facebook-osquery-2.10.2_GH0.tar.gz) = 2352646
SHA256 (osquery-third-party-2.10.2_GH0.tar.gz) = d11ad89e277a43278c65ffff89f538f3c47e52f5716287f7f0944cdcf2f3730d
SIZE (osquery-third-party-2.10.2_GH0.tar.gz) = 3496837
TIMESTAMP = 1519958114
SHA256 (facebook-osquery-2.11.2_GH0.tar.gz) = f1214cffe694a61857aa9fd111d1d7baadab90f6c8737d23becc831e8e631045
SIZE (facebook-osquery-2.11.2_GH0.tar.gz) = 2396376
SHA256 (osquery-third-party-2.11.0_GH0.tar.gz) = 0499456a7e70dabe283c3dc221a65544b0c5c08710905e1f7339bba45c1f1ffa
SIZE (osquery-third-party-2.11.0_GH0.tar.gz) = 3496854

View File

@@ -0,0 +1,14 @@
--- CMakeLists.txt.orig 2018-03-02 02:36:38 UTC
+++ CMakeLists.txt
@@ -523,11 +523,6 @@ if(POSIX)
include_directories("${BUILD_DEPS}/include/openssl")
endif()
-if(NOT LINUX AND NOT APPLE)
- # Including Boost Beast within third-party until it's merged into boot 1.66.
- include_directories("${CMAKE_SOURCE_DIR}/third-party/beast")
-endif()
-
include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
include_directories("${CMAKE_SOURCE_DIR}/include")
include_directories("${CMAKE_SOURCE_DIR}")