From owner-svn-ports-all@freebsd.org Fri Jul 3 23:50:11 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C8389946D2; Fri, 3 Jul 2015 23:50:11 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4971A261C; Fri, 3 Jul 2015 23:50:11 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t63NoBcq028689; Fri, 3 Jul 2015 23:50:11 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t63No9LK028681; Fri, 3 Jul 2015 23:50:09 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201507032350.t63No9LK028681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Fri, 3 Jul 2015 23:50:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391287 - in head/sysutils/osquery: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2015 23:50:11 -0000 Author: zi Date: Fri Jul 3 23:50:09 2015 New Revision: 391287 URL: https://svnweb.freebsd.org/changeset/ports/391287 Log: - Update to 1.4.7 Added: head/sysutils/osquery/files/patch-osquery_core_init.cpp (contents, props changed) Deleted: head/sysutils/osquery/files/patch-CMakeLists.txt head/sysutils/osquery/files/patch-CMake_CMakeLibs.cmake head/sysutils/osquery/files/patch-CMake_FindGlog.cmake head/sysutils/osquery/files/patch-Makefile head/sysutils/osquery/files/patch-include_osquery_core.h head/sysutils/osquery/files/patch-include_osquery_events.h head/sysutils/osquery/files/patch-include_osquery_flags.h head/sysutils/osquery/files/patch-include_osquery_registry.h head/sysutils/osquery/files/patch-kernel_linux_.gitignore head/sysutils/osquery/files/patch-kernel_linux_Makefile head/sysutils/osquery/files/patch-kernel_linux_hash.c head/sysutils/osquery/files/patch-kernel_linux_hash.h head/sysutils/osquery/files/patch-kernel_linux_hide.c head/sysutils/osquery/files/patch-kernel_linux_hide.h head/sysutils/osquery/files/patch-kernel_linux_main.c head/sysutils/osquery/files/patch-kernel_linux_sysfs.c head/sysutils/osquery/files/patch-kernel_linux_sysfs.h head/sysutils/osquery/files/patch-osquery_config_config.cpp head/sysutils/osquery/files/patch-osquery_config_plugins_http.cpp head/sysutils/osquery/files/patch-osquery_config_plugins_tests_http__config__tests.cpp head/sysutils/osquery/files/patch-osquery_core_watcher.cpp head/sysutils/osquery/files/patch-osquery_core_watcher.h head/sysutils/osquery/files/patch-osquery_database_db__handle.cpp head/sysutils/osquery/files/patch-osquery_dispatcher_dispatcher.cpp head/sysutils/osquery/files/patch-osquery_dispatcher_dispatcher.h head/sysutils/osquery/files/patch-osquery_dispatcher_scheduler.cpp head/sysutils/osquery/files/patch-osquery_dispatcher_scheduler.h head/sysutils/osquery/files/patch-osquery_dispatcher_tests_dispatcher__tests.cpp head/sysutils/osquery/files/patch-osquery_events_darwin_fsevents.cpp head/sysutils/osquery/files/patch-osquery_events_darwin_fsevents.h head/sysutils/osquery/files/patch-osquery_events_darwin_tests_fsevents__tests.cpp head/sysutils/osquery/files/patch-osquery_events_events.cpp head/sysutils/osquery/files/patch-osquery_extensions_extensions.cpp head/sysutils/osquery/files/patch-osquery_extensions_interface.cpp head/sysutils/osquery/files/patch-osquery_extensions_interface.h head/sysutils/osquery/files/patch-osquery_extensions_tests_extensions__tests.cpp head/sysutils/osquery/files/patch-osquery_filesystem_CMakeLists.txt head/sysutils/osquery/files/patch-osquery_main_run.cpp head/sysutils/osquery/files/patch-osquery_remote_enrollment_plugins_tests_http__enrollment__tests.cpp head/sysutils/osquery/files/patch-osquery_remote_requests.h head/sysutils/osquery/files/patch-osquery_remote_transports_http.cpp head/sysutils/osquery/files/patch-osquery_remote_transports_tests_http__transports__tests.cpp head/sysutils/osquery/files/patch-osquery_tables_CMakeLists.txt head/sysutils/osquery/files/patch-osquery_tables_networking_interfaces.cpp head/sysutils/osquery/files/patch-osquery_tables_networking_utils.h head/sysutils/osquery/files/patch-osquery_tables_specs_blacklist head/sysutils/osquery/files/patch-osquery_tables_system_centos_rpm__packages.cpp head/sysutils/osquery/files/patch-osquery_tables_system_freebsd_groups.cpp head/sysutils/osquery/files/patch-osquery_tables_system_freebsd_mounts.cpp head/sysutils/osquery/files/patch-osquery_tables_system_freebsd_sysctl__utils.cpp head/sysutils/osquery/files/patch-osquery_tables_system_freebsd_users.cpp head/sysutils/osquery/files/patch-osquery_tables_system_linux_os__version.cpp head/sysutils/osquery/files/patch-third-party_cpp-netlib_CMakeLists.txt head/sysutils/osquery/files/patch-third-party_cpp-netlib_libs_network_src_CMakeLists.txt head/sysutils/osquery/files/patch-third-party_glog_src_utilities.h head/sysutils/osquery/files/patch-tools_codegen_gentable.py head/sysutils/osquery/files/patch-tools_deployment_osquery.example.conf head/sysutils/osquery/files/patch-tools_provision_freebsd.sh head/sysutils/osquery/files/patch-tools_provision_lib.sh head/sysutils/osquery/files/patch-tools_tests_test__extensions.py Modified: head/sysutils/osquery/Makefile head/sysutils/osquery/distinfo head/sysutils/osquery/files/patch-osquery_CMakeLists.txt head/sysutils/osquery/pkg-plist Modified: head/sysutils/osquery/Makefile ============================================================================== --- head/sysutils/osquery/Makefile Fri Jul 3 23:34:07 2015 (r391286) +++ head/sysutils/osquery/Makefile Fri Jul 3 23:50:09 2015 (r391287) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= osquery -PORTVERSION= 1.4.5 -PORTREVISION= 2 +PORTVERSION= 1.4.7 CATEGORIES= sysutils MAINTAINER= zi@FreeBSD.org @@ -30,7 +29,8 @@ LIB_DEPENDS= libboost_regex.so:${PORTSDI libicuuc.so:${PORTSDIR}/devel/icu USES= cmake:outsource gmake libtool python:build compiler:c++11-lib -CMAKE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" SKIP_TESTS="yes" +CMAKE_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 Modified: head/sysutils/osquery/distinfo ============================================================================== --- head/sysutils/osquery/distinfo Fri Jul 3 23:34:07 2015 (r391286) +++ head/sysutils/osquery/distinfo Fri Jul 3 23:50:09 2015 (r391287) @@ -1,4 +1,4 @@ -SHA256 (facebook-osquery-1.4.5_GH0.tar.gz) = b0812eec4ca53eb6ada4692330caaed00ed1e50ead43b99486b3d15139369738 -SIZE (facebook-osquery-1.4.5_GH0.tar.gz) = 412622 -SHA256 (osquery-third-party-1.4.5_GH0.tar.gz) = 06897b9ddf637c61f5c9e90f640b9f8c50c124d6276058a71f7d952439c8e58f -SIZE (osquery-third-party-1.4.5_GH0.tar.gz) = 6073986 +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 Modified: head/sysutils/osquery/files/patch-osquery_CMakeLists.txt ============================================================================== --- head/sysutils/osquery/files/patch-osquery_CMakeLists.txt Fri Jul 3 23:34:07 2015 (r391286) +++ head/sysutils/osquery/files/patch-osquery_CMakeLists.txt Fri Jul 3 23:50:09 2015 (r391287) @@ -1,40 +1,11 @@ ---- osquery/CMakeLists.txt.orig 2015-05-05 00:16:41 UTC +--- osquery/CMakeLists.txt.orig 2015-07-03 23:09:06 UTC +++ osquery/CMakeLists.txt -@@ -22,11 +22,14 @@ set(OSQUERY_LIBS - - readline - pthread -- dl - bz2 - z - ) - -+if(NOT FREEBSD) -+ set(OSQUERY_LIBS ${OSQUERY_LIBS} dl) -+endif() -+ - # Add default linking details (the first argument means SDK + core). - ADD_OSQUERY_LINK(TRUE "-rdynamic") - -@@ -44,7 +47,7 @@ endif() +@@ -54,7 +54,7 @@ endif() # The remaining boost libraries are discovered with find_library. - ADD_OSQUERY_LINK(TRUE "boost_system") - ADD_OSQUERY_LINK(TRUE "boost_filesystem") --ADD_OSQUERY_LINK(TRUE "boost_regex") -+ADD_OSQUERY_LINK(TRUE "-lboost_regex") - ADD_OSQUERY_LINK(TRUE "yara") + ADD_OSQUERY_LINK_CORE("boost_system") + ADD_OSQUERY_LINK_CORE("boost_filesystem") +-ADD_OSQUERY_LINK_CORE("boost_regex") ++ADD_OSQUERY_LINK_CORE("-lboost_regex") + ADD_OSQUERY_LINK_CORE("yara") if(DEFINED ENV{SANITIZE}) -@@ -133,7 +136,11 @@ if(NOT OSQUERY_BUILD_SDK_ONLY) - - # Include the public API includes if make devel. - install(TARGETS libosquery ARCHIVE DESTINATION lib COMPONENT devel OPTIONAL) -- install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/" DESTINATION include COMPONENT devel OPTIONAL) -+ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include" -+ DESTINATION include -+ COMPONENT devel OPTIONAL -+ PATTERN ".*" EXCLUDE -+ ) - - # make install (executables) - install(TARGETS shell RUNTIME DESTINATION bin COMPONENT main) Added: head/sysutils/osquery/files/patch-osquery_core_init.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/osquery/files/patch-osquery_core_init.cpp Fri Jul 3 23:50:09 2015 (r391287) @@ -0,0 +1,22 @@ +--- osquery/core/init.cpp.orig 2015-07-03 22:32:52 UTC ++++ osquery/core/init.cpp +@@ -31,6 +31,10 @@ + #include "osquery/core/watcher.h" + #include "osquery/database/db_handle.h" + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + #ifdef __linux__ + #include + #include +@@ -238,7 +242,7 @@ void Initializer::initDaemon() { + #ifdef __linux__ + // Using: ioprio_set(IOPRIO_WHO_PGRP, 0, IOPRIO_CLASS_IDLE); + syscall(SYS_ioprio_set, IOPRIO_WHO_PGRP, 0, IOPRIO_CLASS_IDLE); +-#elif defined(__APPLE__) || defined(__FreeBSD__) ++#elif defined(__APPLE__) + setiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS, IOPOL_THROTTLE); + #endif + } Modified: head/sysutils/osquery/pkg-plist ============================================================================== --- head/sysutils/osquery/pkg-plist Fri Jul 3 23:34:07 2015 (r391286) +++ head/sysutils/osquery/pkg-plist Fri Jul 3 23:50:09 2015 (r391287) @@ -3,10 +3,7 @@ bin/osqueryi include/osquery/config.h include/osquery/core.h include/osquery/database.h -include/osquery/database/db_handle.h -include/osquery/database/query.h -include/osquery/database/results.h -include/osquery/enrollment.h +include/osquery/enroll.h include/osquery/events.h include/osquery/extensions.h include/osquery/filesystem.h