[arch-commits] Commit in osquery/trunk (PKGBUILD devendorize-lvm2.patch)

[Christian Hesse]

    Date: Monday, February 8, 2021 @ 12:54:29
  Author: eworm
Revision: 849002

upgpkg: osquery 4.5.1-6: lvm2 2.03.x rebuild

lvm2 2.03.x does no longer support lvm2app, so linking statically

Added:
  osquery/trunk/devendorize-lvm2.patch
Modified:
  osquery/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   16 +++++++++++++---
 devendorize-lvm2.patch |   18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-08 12:53:48 UTC (rev 849001)
+++ PKGBUILD	2021-02-08 12:54:29 UTC (rev 849002)
@@ -2,7 +2,7 @@
 
 pkgname=osquery
 pkgver=4.5.1
-pkgrel=5
+pkgrel=6
 pkgdesc='SQL powered operating system instrumentation, monitoring, and analytics'
 arch=(x86_64)
 url='https://osquery.io'
@@ -12,19 +12,29 @@
 # 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
 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)
+        lvm2-$_lvm2_version.tar.gz::https://github.com/lvmteam/lvm2/archive/v$_lvm2_version.tar.gz
+        devendorize.patch::https://github.com/anatol/osquery/compare/$pkgver...$_patched_osquery_commit.patch
+        devendorize-lvm2.patch)
 sha256sums=('568af4bd2562e5321bbac68177b377b3ad386942e227511867981876cbce3e26'
             '191848bf04ca6fe14a9634bdcff6f6e851aa59526f1f3fb168ad7c8c6d9b1d00'
-            'fbcfb24caa3786a37d371cd8e2e45fdc3095d6e526e97c0d403bba8be2683d0f')
+            '7480738df33f5912c1e473c9138ebabf42169c3d1c54fe92bcc443cbe2e2511c'
+            'fbcfb24caa3786a37d371cd8e2e45fdc3095d6e526e97c0d403bba8be2683d0f'
+            'f0c4e7f8b71986ea9c9a5f2e2f4c13979cffb84ddd67c199b2071cd4c359b139')
 
 prepare() {
   cd osquery-$pkgver
   patch -p1 < ../devendorize.patch
+  patch -p1 -R < ../devendorize-lvm2.patch
 
   rm -rf libraries/cmake/source/smartmontools/src
   ln -sf `pwd`/../third-party-smartmontools-$_smartmontools_commit libraries/cmake/source/smartmontools/src
+
+  rm -rf libraries/cmake/source/libdevmapper/src
+  ln -sf `pwd`/../lvm2-$_lvm2_version libraries/cmake/source/libdevmapper/src
 }
 
 build() {

Added: devendorize-lvm2.patch
===================================================================
--- devendorize-lvm2.patch	                        (rev 0)
+++ devendorize-lvm2.patch	2021-02-08 12:54:29 UTC (rev 849002)
@@ -0,0 +1,18 @@
+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"
++)