Index: head/sysutils/osquery/Makefile =================================================================== --- head/sysutils/osquery/Makefile (revision 450395) +++ head/sysutils/osquery/Makefile (revision 450396) @@ -1,96 +1,95 @@ # Created by: Ryan Steinmetz # $FreeBSD$ PORTNAME= osquery -PORTVERSION= 2.7.0 -PORTREVISION= 2 +PORTVERSION= 2.8.0 CATEGORIES= sysutils MAINTAINER= zi@FreeBSD.org COMMENT= SQL powered OS instrumentation, monitoring, and analytics LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= thrift>0:devel/thrift \ bash>0:shells/bash \ linenoise-ng>0:devel/linenoise-ng \ asio>0:net/asio \ rapidjson>0:devel/rapidjson \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 LIB_DEPENDS= libaugeas.so:textproc/augeas \ libboost_regex.so:devel/boost-libs \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libicuuc.so:devel/icu \ liblz4.so:archivers/liblz4 \ libsnappy.so:archivers/snappy \ librocksdb-lite.so:databases/rocksdb-lite \ libthrift.so:devel/thrift-cpp \ libcppnetlib-uri.so:devel/cpp-netlib \ libzstd.so:archivers/zstd RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss USES= cmake:outsource libtool python:build compiler:c++11-lib \ libarchive ssl USE_GNOME= libxml2 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} USE_RC_SUBR= ${PORTNAME}d USE_GITHUB= yes GH_ACCOUNT= facebook ${PORTNAME}:tp GH_PROJECT= third-party:tp GH_SUBDIR= third-party:tp GH_TAGNAME= ${PORTVERSION}:tp # Some options for things that bring in many dependencies OPTIONS_DEFINE= TSK AWS YARA LLDPD TSK_DESC= Build with sleuthkit support TSK_LIB_DEPENDS= libtsk.so:sysutils/sleuthkit TSK_CONFIGURE_ENV_OFF= SKIP_TSK=1 AWS_DESC= Support logging to AWS Kinesis AWS_LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp AWS_CONFIGURE_ENV_OFF= SKIP_AWS=1 YARA_DESC= Build with YARA malware identification support YARA_LIB_DEPENDS= libyara.so:security/yara YARA_CONFIGURE_ENV_OFF= SKIP_YARA=1 LLDPD_DESC= Support Link Layer Discovery Protocol LLDPD_LIB_DEPENDS= liblldpctl.so:net-mgmt/lldpd LLDPD_CONFIGURE_ENV_OFF=SKIP_LLDPD=1 .include .if ${OSVERSION} < 1100000 -BUILD_DEPENDS+= clang38:devel/llvm38 -CC= clang38 -CXX= clang++38 +BUILD_DEPENDS+= clang40:devel/llvm40 +CC= clang40 +CXX= clang++40 .endif post-patch: ${REINPLACE_CMD} -e 's|/var/osquery/|/var/db/osquery/|g' \ ${WRKSRC}/tools/deployment/osquery.example.conf ${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' \ ${WRKSRC}/CMakeLists.txt \ ${WRKSRC}/tools/get_platform.py do-install: ${INSTALL_PROGRAM} ${BLDDIR}/osqueryi ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${BLDDIR}/osqueryd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${BLDDIR}/libosquery.a ${STAGEDIR}${PREFIX}/lib (cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include) ${INSTALL_DATA} ${WRKSRC}/tools/deployment/osquery.example.conf \ ${STAGEDIR}${PREFIX}/etc/osquery.conf.sample ${MKDIR} ${STAGEDIR}/var/db/osquery ${STAGEDIR}/var/log/osquery # The flags file must exist, even if empty. Using @sample # prevents a populated flags file from being nuked on upgrade. ${TOUCH} ${STAGEDIR}${PREFIX}/etc/osquery.flags.sample \ ${STAGEDIR}${PREFIX}/etc/osquery.flags .include Index: head/sysutils/osquery/distinfo =================================================================== --- head/sysutils/osquery/distinfo (revision 450395) +++ head/sysutils/osquery/distinfo (revision 450396) @@ -1,5 +1,5 @@ -TIMESTAMP = 1504120429 -SHA256 (facebook-osquery-2.7.0_GH0.tar.gz) = ce5fb4e6000904e998ca4cc9aae2c4125505d6b11e5f0c318456ee9ded8cc2dc -SIZE (facebook-osquery-2.7.0_GH0.tar.gz) = 973435 -SHA256 (osquery-third-party-2.7.0_GH0.tar.gz) = 264070dbe55e1cb3dd94b263b9110b863963cbde9363a08f49d7a27b2aa9e5f1 -SIZE (osquery-third-party-2.7.0_GH0.tar.gz) = 3264470 +TIMESTAMP = 1506029964 +SHA256 (facebook-osquery-2.8.0_GH0.tar.gz) = 2ebb8c513e684a29f5bad0b95ffbc00cc063514566ae15a62e3c3928cfa51dc5 +SIZE (facebook-osquery-2.8.0_GH0.tar.gz) = 994679 +SHA256 (osquery-third-party-2.8.0_GH0.tar.gz) = cbfb9a2bde1c8b8e53566f7dd7599bc6b91910e657c5efcff8ebb212f2ea5830 +SIZE (osquery-third-party-2.8.0_GH0.tar.gz) = 3264454 Index: head/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a =================================================================== --- head/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a (revision 450395) +++ head/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a (nonexistent) @@ -1,22 +0,0 @@ -diff --git a/osquery/tables/networking/freebsd/routes.cpp b/osquery/tables/networking/freebsd/routes.cpp -index 991564caf..fd7a878fa 100644 ---- osquery/tables/networking/freebsd/routes.cpp -+++ osquery/tables/networking/freebsd/routes.cpp -@@ -18,7 +18,6 @@ - - #include - #include --#include - #include - - #include -@@ -27,6 +26,9 @@ - #include - #include - -+// Include belongs here to fix build on older fbsds. -+#include -+ - #include "osquery/tables/networking/utils.h" - - namespace osquery { Property changes on: head/sysutils/osquery/files/patch-2f60dd0fd3ef5df9d19368c0d17d96990d088d1a ___________________________________________________________________ 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/sysutils/osquery/pkg-plist =================================================================== --- head/sysutils/osquery/pkg-plist (revision 450395) +++ head/sysutils/osquery/pkg-plist (revision 450396) @@ -1,26 +1,28 @@ bin/osqueryi @dir /var/db/osquery @dir /var/log/osquery include/osquery/config.h include/osquery/core.h include/osquery/database.h include/osquery/dispatcher.h include/osquery/distributed.h include/osquery/enroll.h include/osquery/events.h include/osquery/extensions.h include/osquery/filesystem.h include/osquery/flags.h include/osquery/logger.h include/osquery/packs.h +include/osquery/posix/system.h include/osquery/registry.h include/osquery/sdk.h include/osquery/sql.h include/osquery/status.h include/osquery/system.h include/osquery/tables.h include/osquery/query.h +include/osquery/windows/system.h lib/libosquery.a sbin/osqueryd @sample etc/osquery.conf.sample @sample etc/osquery.flags.sample