Date: Thursday, June 2, 2022 @ 18:20:55 Author: anatolik Revision: 1218904
upgpkg: osquery 5.3.0-2 Rebase Archlinux patches on top of upstream 5.3.0 release Added: osquery/trunk/ebpf-common.patch Modified: osquery/trunk/PKGBUILD -------------------+ PKGBUILD | 11 +++++------ ebpf-common.patch | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-02 18:20:02 UTC (rev 1218903) +++ PKGBUILD 2022-06-02 18:20:55 UTC (rev 1218904) @@ -2,7 +2,7 @@ pkgname=osquery pkgver=5.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='SQL powered operating system instrumentation, monitoring, and analytics' arch=(x86_64) url='https://osquery.io' @@ -11,12 +11,12 @@ makedepends=(cmake ninja clang python gcc-libs git libunwind) options=(!strip) # following commit represents osquery $pkgver with some Arch-specific patches -_commit=4261097abb7505403966a6e45a2526f2abb2aac9 +_commit=279553bf33ebe62c98923be19826fe4bd29cced2 source=(git+https://github.com/anatol/osquery.git#commit=$_commit - fix_pthread_stack.patch::https://github.com/boostorg/thread/commit/74fb0a26099bc51d717f5f154b37231ce7df3e98.patch + ebpf-common.patch libaudit.patch) sha256sums=('SKIP' - '4a677ebdcebcfecba1bb83ec04ed8c81d8f8decf904e745a1459c84aecb638ca' + '88cba2eebd12079bf3a4a8c5ba4ed34b1b5ccd9f9ac3fa518f1591396176666d' '96218ef5b7d6d6deb3a7b4b3dfed8068b7e4d10acd5b19372b9882f89d4478a8') build() { @@ -24,12 +24,11 @@ CC=clang CXX=clang++ cmake \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver \ - -DOSQUERY_IGNORE_CMAKE_MAX_VERSION_CHECK=TRUE \ -G Ninja -S . -B build # submodules are checked out by cmake, patch it after it were checked out (cd $srcdir/osquery/libraries/cmake/source/libaudit/src && git reset --hard && patch -p1 < $srcdir/libaudit.patch) - (cd $srcdir/osquery/libraries/cmake/source/boost/src/libs/thread && git reset --hard && patch -p1 < $srcdir/fix_pthread_stack.patch) + (cd $srcdir/osquery/libraries/cmake/source/ebpfpub/src && git reset --hard && git submodule update --init && cd libraries/ebpf-common/src && git reset --hard && patch -p1 < $srcdir/ebpf-common.patch) ninja -C build } Added: ebpf-common.patch =================================================================== --- ebpf-common.patch (rev 0) +++ ebpf-common.patch 2022-06-02 18:20:55 UTC (rev 1218904) @@ -0,0 +1,36 @@ +diff --git a/ebpf/src/tracepointdescriptor.cpp b/ebpf/src/tracepointdescriptor.cpp +index 29c3219..2758cc5 100644 +--- a/ebpf/src/tracepointdescriptor.cpp ++++ b/ebpf/src/tracepointdescriptor.cpp +@@ -7,6 +7,7 @@ + */ + + #include <algorithm> ++#include <array> + #include <cassert> + #include <fstream> + #include <iostream> +diff --git a/error/include/tob/error/erroror.h b/error/include/tob/error/erroror.h +index 1d5a13d..f627a09 100644 +--- a/error/include/tob/error/erroror.h ++++ b/error/include/tob/error/erroror.h +@@ -10,6 +10,7 @@ + + #include <stdexcept> + #include <variant> ++#include <utility> + + namespace tob { + template <typename ValueType, typename ErrorType> class ErrorOr final { +diff --git a/error/include/tob/error/successor.h b/error/include/tob/error/successor.h +index 6d8260e..4f19845 100644 +--- a/error/include/tob/error/successor.h ++++ b/error/include/tob/error/successor.h +@@ -10,6 +10,7 @@ + + #include <optional> + #include <stdexcept> ++#include <utility> + + namespace tob { + template <typename ErrorType> class SuccessOr final {
