[arch-commits] Commit in osquery/trunk (3 files)

[Anatol Pomozov]

    Date: Tuesday, March 9, 2021 @ 22:46:45
  Author: anatolik
Revision: 887180

upgpkg: osquery 4.6.0-1

Devendorization patch porting has been done by @loqs, see FS#69873.

Modified:
  osquery/trunk/PKGBUILD
Deleted:
  osquery/trunk/devendorize-lvm2.patch
  osquery/trunk/nolvm2app.patch

------------------------+
 PKGBUILD               |   29 ++++++++++++--------------
 devendorize-lvm2.patch |   18 ----------------
 nolvm2app.patch        |   52 -----------------------------------------------
 3 files changed, 14 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-09 22:11:44 UTC (rev 887179)
+++ PKGBUILD	2021-03-09 22:46:45 UTC (rev 887180)
@@ -1,35 +1,30 @@
 # Maintainer: Anatol Pomozov
 
 pkgname=osquery
-pkgver=4.5.1
-pkgrel=8
+pkgver=4.6.0
+pkgrel=1
 pkgdesc='SQL powered operating system instrumentation, monitoring, and analytics'
 arch=(x86_64)
 url='https://osquery.io'
 license=(Apache GPL2)
-depends=(augeas boost-libs gflags google-glog aws-sdk-cpp librdkafka rocksdb gtest device-mapper rpm-tools dpkg pacman lvm2 libelfin lldpd rapidjson sleuthkit ssdeep thrift yara lmdb iptables)
+depends=(augeas boost-libs gflags google-glog aws-sdk-cpp librdkafka rocksdb gtest device-mapper rpm-tools dpkg pacman libelfin lldpd rapidjson sleuthkit ssdeep thrift yara lmdb iptables)
 makedepends=(cmake python boost linenoise-ng ninja)
 options=(!strip)
 # patched version of smartools that we need to build statically to avoid collision with the upstream version
 _smartmontools_commit=6afcf545d2ab86d13a3ecb9f656aa81622031f2a
-_patched_osquery_commit=f54b2ca8b18dee86077521789788f9e29c8db317
-# lvm2 2.03.x does no longer support lvm2app, so linking statically
-_lvm2_version=2_02_173
+_patched_osquery_commit=4.6.0-archlinux-1
 source=(osquery-$pkgver.zip::https://github.com/osquery/osquery/archive/$pkgver.zip
 	smartmontools-$_smartmontools_commit.zip::https://github.com/osquery/third-party-smartmontools/archive/$_smartmontools_commit.zip
 	devendorize.patch::https://github.com/anatol/osquery/compare/$pkgver...$_patched_osquery_commit.patch
-	tls_crash.patch::https://github.com/osquery/osquery/commit/d69380cb7713dd5f7f48849a028a7723e7a619bf.patch
-	nolvm2app.patch)
-sha256sums=('568af4bd2562e5321bbac68177b377b3ad386942e227511867981876cbce3e26'
+	tls_crash.patch::https://github.com/osquery/osquery/commit/d69380cb7713dd5f7f48849a028a7723e7a619bf.patch)
+sha256sums=('59dc5fce0f09133e17b8e4a5d2497ef3efd6c01243abf32564cf9ba1caa7fc44'
             '191848bf04ca6fe14a9634bdcff6f6e851aa59526f1f3fb168ad7c8c6d9b1d00'
-            'fbcfb24caa3786a37d371cd8e2e45fdc3095d6e526e97c0d403bba8be2683d0f'
-            'ec6378a531866320b6086c7ee90f333ec35598669a39f4621eed0beb252408ba'
-            'fa0e81fb9104a08d802420c56fe3484501c213a909966fe036a64fd6a0552d50')
+            'fb4ba54777c50e846edc82581085add9674732ca148d108f289329ebc1acb09b'
+            'ec6378a531866320b6086c7ee90f333ec35598669a39f4621eed0beb252408ba')
 
 prepare() {
   cd osquery-$pkgver
   patch -p1 < ../devendorize.patch
-  patch -p1 < ../nolvm2app.patch
   patch -p1 < ../tls_crash.patch
 
   rm -rf libraries/cmake/source/smartmontools/src
@@ -39,8 +34,12 @@
 build() {
   cd osquery-$pkgver
 
-  cmake -DCMAKE_BUILD_TYPE=Release -DOSQUERY_STATIC_BUILD=OFF -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver -G Ninja -S . -B build
-  cmake --build build
+  # disable ebpfpub dependency as https://github.com/trailofbits/ebpfpub is not in community repo yet
+  cmake -DCMAKE_BUILD_TYPE=Release -DOSQUERY_STATIC_BUILD=OFF -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver \
+      -DOSQUERY_IGNORE_CMAKE_MAX_VERSION_CHECK=TRUE \
+      -DOSQUERY_BUILD_BPF=OFF \
+      -G Ninja -S . -B build
+  ninja -C build
 }
 
 package() {

Deleted: devendorize-lvm2.patch
===================================================================
--- devendorize-lvm2.patch	2021-03-09 22:11:44 UTC (rev 887179)
+++ devendorize-lvm2.patch	2021-03-09 22:46:45 UTC (rev 887180)
@@ -1,18 +0,0 @@
-diff --git a/libraries/cmake/system/modules/Findlibdevmapper.cmake b/libraries/cmake/system/modules/Findlibdevmapper.cmake
-index 34eb119959..47b5f566a2 100644
---- a/libraries/cmake/system/modules/Findlibdevmapper.cmake
-+++ b/libraries/cmake/system/modules/Findlibdevmapper.cmake
-@@ -4,4 +4,12 @@
- # This source code is licensed in accordance with the terms specified in
- # the LICENSE file found in the root directory of this source tree.
- 
--include("${CMAKE_SOURCE_DIR}/libraries/cmake/source/modules/Findlibdevmapper.cmake")
-+cmake_minimum_required(VERSION 3.15)
-+include("${CMAKE_CURRENT_LIST_DIR}/api.cmake")
-+
-+locateSystemLibrary(
-+  NAME libdevmapper
-+  REQUIRED ${libdevmapper_REQUIRED}
-+  MAIN_HEADER "libdevmapper.h"
-+  LIBRARIES "devmapper" "lvm2app"
-+)

Deleted: nolvm2app.patch
===================================================================
--- nolvm2app.patch	2021-03-09 22:11:44 UTC (rev 887179)
+++ nolvm2app.patch	2021-03-09 22:46:45 UTC (rev 887180)
@@ -1,52 +0,0 @@
-diff --git a/libraries/cmake/system/modules/Findlibdevmapper.cmake b/libraries/cmake/system/modules/Findlibdevmapper.cmake
-index 47b5f56..c464f5c 100644
---- a/libraries/cmake/system/modules/Findlibdevmapper.cmake
-+++ b/libraries/cmake/system/modules/Findlibdevmapper.cmake
-@@ -11,5 +11,5 @@ locateSystemLibrary(
-   NAME libdevmapper
-   REQUIRED ${libdevmapper_REQUIRED}
-   MAIN_HEADER "libdevmapper.h"
--  LIBRARIES "devmapper" "lvm2app"
-+  LIBRARIES "devmapper"
- )
-diff --git a/osquery/tables/system/linux/block_devices.cpp b/osquery/tables/system/linux/block_devices.cpp
-index 2eab290..01a4bf3 100644
---- a/osquery/tables/system/linux/block_devices.cpp
-+++ b/osquery/tables/system/linux/block_devices.cpp
-@@ -20,13 +20,13 @@
- #include <osquery/logger/logger.h>
- 
- extern "C" {
--#include <lvm2app.h>
- #include <sys/sysmacros.h>
- }
- 
- namespace osquery {
- namespace tables {
- 
-+#if 0
- void populatePVChildren(lvm_t lvm,
-                         const std::string& devname,
-                         const std::string& pvid,
-@@ -61,6 +61,7 @@ void populatePVChildren(lvm_t lvm,
-   }
-   lvm_vg_close(vg);
- }
-+#endif
- 
- static void getBlockDevice(struct udev_device* dev,
-                            QueryData& results,
-@@ -125,11 +126,13 @@ static void getBlockDevice(struct udev_device* dev,
-         r["label"] = blk_value;
-       }
-       if (boost::algorithm::starts_with(r["type"], "LVM")) {
-+#if 0
-         lvm_t lvm = lvm_init(nullptr);
-         if (lvm != nullptr) {
-           populatePVChildren(lvm, name, r["uuid"], lvm_lv2pv);
-           lvm_quit(lvm);
-         }
-+#endif
-       }
-     }
-     blkid_free_probe(pr);