[arch-commits] Commit in osquery/repos (4 files)

[Anatol Pomozov]

    Date: Thursday, June 2, 2022 @ 18:21:18
  Author: anatolik
Revision: 1218905

archrelease: copy trunk to community-testing-x86_64

Added:
  osquery/repos/community-testing-x86_64/
  osquery/repos/community-testing-x86_64/PKGBUILD
    (from rev 1218904, osquery/trunk/PKGBUILD)
  osquery/repos/community-testing-x86_64/ebpf-common.patch
    (from rev 1218904, osquery/trunk/ebpf-common.patch)
  osquery/repos/community-testing-x86_64/libaudit.patch
    (from rev 1218904, osquery/trunk/libaudit.patch)

-------------------+
 PKGBUILD          |   45 +++++++++++++++++++++++++++++++++++++++++++++
 ebpf-common.patch |   36 ++++++++++++++++++++++++++++++++++++
 libaudit.patch    |   12 ++++++++++++
 3 files changed, 93 insertions(+)

Copied: osquery/repos/community-testing-x86_64/PKGBUILD (from rev 1218904, osquery/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2022-06-02 18:21:18 UTC (rev 1218905)
@@ -0,0 +1,45 @@
+# Maintainer: Anatol Pomozov
+
+pkgname=osquery
+pkgver=5.3.0
+pkgrel=2
+pkgdesc='SQL powered operating system instrumentation, monitoring, and analytics'
+arch=(x86_64)
+url='https://osquery.io'
+license=(Apache GPL2)
+depends=(zlib)
+makedepends=(cmake ninja clang python gcc-libs git libunwind)
+options=(!strip)
+# following commit represents osquery $pkgver with some Arch-specific patches
+_commit=279553bf33ebe62c98923be19826fe4bd29cced2
+source=(git+https://github.com/anatol/osquery.git#commit=$_commit
+        ebpf-common.patch
+        libaudit.patch)
+sha256sums=('SKIP'
+            '88cba2eebd12079bf3a4a8c5ba4ed34b1b5ccd9f9ac3fa518f1591396176666d'
+            '96218ef5b7d6d6deb3a7b4b3dfed8068b7e4d10acd5b19372b9882f89d4478a8')
+
+build() {
+  cd osquery
+
+  CC=clang CXX=clang++ cmake \
+      -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver \
+      -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/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
+}
+
+package() {
+  cd osquery
+
+  DESTDIR="${pkgdir}" ninja -C build install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 tools/deployment/osquery.example.conf "$pkgdir/etc/osquery/osquery.conf"
+  install -Dm644 tools/deployment/linux_packaging/osqueryd.sysconfig "$pkgdir/etc/sysconfig/osqueryd"
+  install -Dm644 tools/deployment/linux_packaging/rpm/osqueryd.service "$pkgdir/usr/lib/systemd/system/osqueryd.service"
+  rm -r $pkgdir/control
+}

Copied: osquery/repos/community-testing-x86_64/ebpf-common.patch (from rev 1218904, osquery/trunk/ebpf-common.patch)
===================================================================
--- community-testing-x86_64/ebpf-common.patch	                        (rev 0)
+++ community-testing-x86_64/ebpf-common.patch	2022-06-02 18:21:18 UTC (rev 1218905)
@@ -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 {

Copied: osquery/repos/community-testing-x86_64/libaudit.patch (from rev 1218904, osquery/trunk/libaudit.patch)
===================================================================
--- community-testing-x86_64/libaudit.patch	                        (rev 0)
+++ community-testing-x86_64/libaudit.patch	2022-06-02 18:21:18 UTC (rev 1218905)
@@ -0,0 +1,12 @@
+diff --git a/lib/libaudit.h b/lib/libaudit.h
+index 05ee91e..2ee3842 100644
+--- a/lib/libaudit.h
++++ b/lib/libaudit.h
+@@ -260,7 +260,6 @@ extern "C" {
+ #define AUDIT_KEY_SEPARATOR 0x01
+ 
+ /* These are used in filter control */
+-#define AUDIT_FILTER_EXCLUDE	AUDIT_FILTER_TYPE
+ #define AUDIT_FILTER_MASK	0x07	/* Mask to get actual filter */
+ #define AUDIT_FILTER_UNSET	0x80	/* This value means filter is unset */
+