svn commit: r438896 - in head/sysutils/osquery: . files
David Thiel
lx at FreeBSD.org
Wed Apr 19 17:17:34 UTC 2017
Author: lx
Date: Wed Apr 19 17:17:33 2017
New Revision: 438896
URL: https://svnweb.freebsd.org/changeset/ports/438896
Log:
Update to 2.4.0, with working osqueryd support.
Approved by: zi
Deleted:
head/sysutils/osquery/files/patch-osquery_CMakeLists.txt
head/sysutils/osquery/files/patch-osquery_core_init.cpp
head/sysutils/osquery/files/patch-third-party_glog_src_glog_stl__logging.h.in
head/sysutils/osquery/files/patch-third-party_glog_src_googletest.h
head/sysutils/osquery/files/patch-third-party_glog_src_logging__unittest.cc
head/sysutils/osquery/files/patch-third-party_glog_src_stacktrace__unittest.cc
head/sysutils/osquery/files/patch-third-party_glog_src_stl__logging__unittest.cc
head/sysutils/osquery/pkg-message
Modified:
head/sysutils/osquery/Makefile
head/sysutils/osquery/distinfo
head/sysutils/osquery/files/osqueryd.in
head/sysutils/osquery/pkg-plist
Modified: head/sysutils/osquery/Makefile
==============================================================================
--- head/sysutils/osquery/Makefile Wed Apr 19 17:16:18 2017 (r438895)
+++ head/sysutils/osquery/Makefile Wed Apr 19 17:17:33 2017 (r438896)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= osquery
-PORTVERSION= 1.4.7
-PORTREVISION= 7
+PORTVERSION= 2.4.0
CATEGORIES= sysutils
MAINTAINER= zi at FreeBSD.org
@@ -12,26 +11,22 @@ COMMENT= SQL powered OS instrumentation,
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= snappy>0:archivers/snappy \
- rocksdb>0:databases/rocksdb \
- thrift>0:devel/thrift \
- thrift-cpp>0:devel/thrift-cpp \
+BUILD_DEPENDS= thrift>0:devel/thrift \
bash>0:shells/bash \
- yara>0:security/yara \
- doxygen:devel/doxygen \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
- ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil \
- ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift \
- ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
-LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
+ linenoise-ng>0:devel/linenoise-ng \
+ asio>0:net/asio \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
+LIB_DEPENDS= libaugeas.so:textproc/augeas \
+ libboost_regex.so:devel/boost-libs \
libgflags.so:devel/gflags \
- libicuuc.so:devel/icu
-
-BROKEN= does not build (error: no matching constructor for initialization of 'gflags::FlagRegisterer')
-DEPRECATED= repeated build and dependency issues, upstream unable to assist
-EXPIRATION_DATE=2017-04-28
+ libglog.so:devel/glog \
+ libicuuc.so:devel/icu \
+ libthrift.so:devel/thrift-cpp \
+ libtsk.so:sysutils/sleuthkit \
+ libcppnetlib-uri.so:devel/cpp-netlib \
+ librocksdb-lite.so:databases/rocksdb-lite \
+ libyara.so:security/yara \
+ liblldpctl.so:net-mgmt/lldpd
USES= cmake:outsource gmake libtool python:build compiler:c++11-lib
CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \
@@ -46,19 +41,11 @@ GH_SUBDIR= third-party:tp
MAKE_JOBS_UNSAFE= yes
post-patch:
- ${REINPLACE_CMD} -e 's|/var/osquery|/var/db/osquery|g' \
- ${WRKSRC}/osquery/core/init.cpp
- ${REINPLACE_CMD} -e 's|/var/osquery/osquery.em|/var/run/osquery.em|g' \
- -e 's|/etc/osquery/extensions.load|${PREFIX}/etc/osquery.extensions|g' \
- -e 's|/etc/osquery/modules.load|${PREFIX}/etc/osquery.modules|g' \
- ${WRKSRC}/osquery/extensions/extensions.cpp
- ${REINPLACE_CMD} -e 's|/var/osquery/osquery.conf|${PREFIX}/etc/osquery.conf|g' \
- ${WRKSRC}/osquery/config/plugins/filesystem.cpp
${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}/CMake/CMakeLibs.cmake \
- ${WRKSRC}/CMakeLists.txt
+ ${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
@@ -69,5 +56,6 @@ do-install:
${STAGEDIR}${PREFIX}/etc/osquery.conf.sample
${MKDIR} ${STAGEDIR}/var/db/osquery
+ ${MKDIR} ${STAGEDIR}/var/log/osquery
.include <bsd.port.mk>
Modified: head/sysutils/osquery/distinfo
==============================================================================
--- head/sysutils/osquery/distinfo Wed Apr 19 17:16:18 2017 (r438895)
+++ head/sysutils/osquery/distinfo Wed Apr 19 17:17:33 2017 (r438896)
@@ -1,4 +1,5 @@
-SHA256 (facebook-osquery-1.4.7_GH0.tar.gz) = da0b648159e8a9677152a2d2b3140d5a61e34b637c408c21462d07629d3b64c2
-SIZE (facebook-osquery-1.4.7_GH0.tar.gz) = 459762
-SHA256 (osquery-third-party-1.4.7_GH0.tar.gz) = baf57d27ca739d876e8da472c162552c6bb740cf4d723ffab4826a4abee83045
-SIZE (osquery-third-party-1.4.7_GH0.tar.gz) = 5509720
+TIMESTAMP = 1492024136
+SHA256 (facebook-osquery-2.4.0_GH0.tar.gz) = e5c3f01ac10ac9a9732f9610921cea8e8a7234a18061cf58e22dc86b2b74d685
+SIZE (facebook-osquery-2.4.0_GH0.tar.gz) = 874186
+SHA256 (osquery-third-party-2.4.0_GH0.tar.gz) = 729830902faa4f438c77dfdce849bfbc862501591e3a51154f0e0fbe14af7ede
+SIZE (osquery-third-party-2.4.0_GH0.tar.gz) = 3864623
Modified: head/sysutils/osquery/files/osqueryd.in
==============================================================================
--- head/sysutils/osquery/files/osqueryd.in Wed Apr 19 17:16:18 2017 (r438895)
+++ head/sysutils/osquery/files/osqueryd.in Wed Apr 19 17:17:33 2017 (r438896)
@@ -23,7 +23,7 @@ osqueryd_enable=${osqueryd_enable-"NO"}
osqueryd_flags=${osqueryd_flags-""}
osqueryd_config=${osqueryd_config-"%%PREFIX%%/etc/osquery.conf"}
required_files=${osqueryd_config}
-command_args="--pidfile /var/run/osqueryd.pid --disable_watchdog --daemonize=true --config_path=${osqueryd_config}"
+command_args="--pidfile /var/run/osqueryd.pid --disable_watchdog --daemonize=true --database_path /var/db/osquery/osqueryd --extensions_socket /var/run/osquery.em --extensions_autoload %%PREFIX%%/etc/osquery.extensions --modules_autoload %%PREFIX%%/etc/osquery.modules --config_path=${osqueryd_config}"
extra_commands="configtest"
configtest_cmd="configtest"
pidfile="/var/run/osqueryd.pid"
Modified: head/sysutils/osquery/pkg-plist
==============================================================================
--- head/sysutils/osquery/pkg-plist Wed Apr 19 17:16:18 2017 (r438895)
+++ head/sysutils/osquery/pkg-plist Wed Apr 19 17:17:33 2017 (r438896)
@@ -1,19 +1,23 @@
bin/osqueryi
@dir /var/db/osquery
+ at 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/hash.h
include/osquery/logger.h
+include/osquery/packs.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
lib/libosquery.a
sbin/osqueryd
More information about the svn-ports-head
mailing list