* [PR PATCH] WIP: New package: osquery-5.6.0
@ 2022-11-02 11:33 jcgruenhage
2022-11-17 17:10 ` [PR PATCH] [Updated] " jcgruenhage
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: jcgruenhage @ 2022-11-02 11:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1735 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages osquery-bin-5.5.1_1
https://github.com/void-linux/void-packages/pull/40298
WIP: New package: osquery-5.6.0
osquery is a major PITA to package "properly", but considering I need it for work, I've started with an `osquery-bin` package for now. Stuff like the service should be reusable for a proper `osquery` package later, so I thought pushing my current state might already be useful to someone, but this is definitely in no state to be merged at all.
Help on the `osquery` package for getting it to build with system libraries would be really appreciated, my C++/CMake foo is not strong enough for this I'm afraid.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osquery-bin-5.5.1_1-40298.patch --]
[-- Type: text/x-diff, Size: 8288 bytes --]
From 586f26ab2c2e15b942d5fc04b667c524ac02e1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 2 Nov 2022 12:27:20 +0100
Subject: [PATCH 1/2] New package: osquery-bin-5.5.1
---
srcpkgs/osquery-bin/files/osqueryd/log/run | 1 +
srcpkgs/osquery-bin/files/osqueryd/run | 7 ++++
srcpkgs/osquery-bin/template | 39 ++++++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 120000 srcpkgs/osquery-bin/files/osqueryd/log/run
create mode 100755 srcpkgs/osquery-bin/files/osqueryd/run
create mode 100644 srcpkgs/osquery-bin/template
diff --git a/srcpkgs/osquery-bin/files/osqueryd/log/run b/srcpkgs/osquery-bin/files/osqueryd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/osquery-bin/files/osqueryd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/osquery-bin/files/osqueryd/run b/srcpkgs/osquery-bin/files/osqueryd/run
new file mode 100755
index 000000000000..44ed48d51f39
--- /dev/null
+++ b/srcpkgs/osquery-bin/files/osqueryd/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+FLAG_FILE=/etc/osquery/osquery.flags
+CONFIG_FILE=/etc/osquery/osquery.conf
+[ -r conf ] && . ./conf
+[ ! -f /etc/osquery/ ] && -p mkdir /etc/osquery/
+[ ! -f ${FLAG_FILE} ] && touch "${FLAG_FILE}"
+exec /usr/bin/osqueryd --flagfile ${FLAG_FILE} --config_path ${CONFIG_FILE} --tls_server_certs /etc/ssl/certs.pem $OPTS 2>&1
diff --git a/srcpkgs/osquery-bin/template b/srcpkgs/osquery-bin/template
new file mode 100644
index 000000000000..cf3755ca0601
--- /dev/null
+++ b/srcpkgs/osquery-bin/template
@@ -0,0 +1,39 @@
+# Template file for 'osquery-bin'
+pkgname=osquery-bin
+version=5.5.1
+revision=1
+archs="x86_64"
+#wrksrc=
+create_wrksrc=yes
+#create_wrksrc=yes
+#build_style=fetch
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends=""
+makedepends=""
+depends=""
+short_desc="osquery binary releases"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="Apache-2.0 OR GPL-2.0-only"
+homepage="https://osquery.io/"
+changelog="https://github.com/osquery/osquery/raw/master/CHANGELOG.md"
+distfiles="https://pkg.osquery.io/linux/osquery-${version}_${revision}.linux_${archs}.tar.gz"
+checksum=5e21502cfd0ce042ce4acb2c20ae64c20296a5deb10ff053e12a5e342e163b7e
+
+do_install() {
+ vbin opt/osquery/bin/osqueryd
+ vbin opt/osquery/bin/osqueryctl
+ ln -s /usr/bin/osqueryd ${PKGDESTDIR}/usr/bin/osqueryi
+
+ vsconf opt/osquery/share/osquery/osquery.example.conf osquery.conf
+
+ install -d -Dm0644 opt/osquery/share/osquery/lenses ${PKGDESTDIR}/usr/share/osquery
+ install -d -Dm0644 opt/osquery/share/osquery/packs ${PKGDESTDIR}/usr/share/osquery
+
+ vmkdir /etc/osquery 0644
+
+ vsv osqueryd
+}
From 728ff2ca736f824dcd19a7e0a090774d76c74720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 2 Nov 2022 12:28:04 +0100
Subject: [PATCH 2/2] New package: osquery-5.6.0
---
...001-locate-libraries-with-pkg-config.patch | 132 ++++++++++++++++++
srcpkgs/osquery/template | 29 ++++
2 files changed, 161 insertions(+)
create mode 100644 srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch
create mode 100644 srcpkgs/osquery/template
diff --git a/srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch b/srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch
new file mode 100644
index 000000000000..5bd29d369bb0
--- /dev/null
+++ b/srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch
@@ -0,0 +1,132 @@
+From e9f104a8eb1f1e61240b11359c9bf5e0fff1019b Mon Sep 17 00:00:00 2001
+From: Piraty <piraty1@inbox.ru>
+Date: Wed, 19 Oct 2022 15:16:02 +0200
+Subject: [PATCH] locate libraries with pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-authored-by: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
+---
+ .../cmake/source/modules/Findaugeas.cmake | 15 +---
+ .../cmake/source/modules/Findboost.cmake | 84 +------------------
+ 2 files changed, 4 insertions(+), 95 deletions(-)
+
+diff --git a/libraries/cmake/source/modules/Findaugeas.cmake b/libraries/cmake/source/modules/Findaugeas.cmake
+index 77186b9df..c5d1cfa47 100644
+--- a/libraries/cmake/source/modules/Findaugeas.cmake
++++ b/libraries/cmake/source/modules/Findaugeas.cmake
+@@ -7,16 +7,5 @@
+
+ include("${CMAKE_CURRENT_LIST_DIR}/utils.cmake")
+
+-importSourceSubmodule(
+- NAME "augeas/gnulib"
+-
+- SHALLOW_SUBMODULES "src"
+-)
+-
+-importSourceSubmodule(
+- NAME "augeas"
+-
+- NO_RECURSIVE
+-
+- SHALLOW_SUBMODULES "src"
+-)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(augeas REQUIRED "augeas")
+diff --git a/libraries/cmake/source/modules/Findboost.cmake b/libraries/cmake/source/modules/Findboost.cmake
+index b7fc8d94f..48152fd76 100644
+--- a/libraries/cmake/source/modules/Findboost.cmake
++++ b/libraries/cmake/source/modules/Findboost.cmake
+@@ -7,85 +7,5 @@
+
+ include("${CMAKE_CURRENT_LIST_DIR}/utils.cmake")
+
+-importSourceSubmodule(
+- NAME "boost"
+-
+- NO_RECURSIVE
+-
+- SUBMODULES
+- "src"
+-
+- SHALLOW_SUBMODULES
+- "src/libs/algorithm"
+- "src/libs/align"
+- "src/libs/any"
+- "src/libs/array"
+- "src/libs/asio"
+- "src/libs/assert"
+- "src/libs/atomic"
+- "src/libs/beast"
+- "src/libs/bind"
+- "src/libs/chrono"
+- "src/libs/concept_check"
+- "src/libs/config"
+- "src/libs/container"
+- "src/libs/container_hash"
+- "src/libs/context"
+- "src/libs/conversion"
+- "src/libs/core"
+- "src/libs/coroutine2"
+- "src/libs/date_time"
+- "src/libs/detail"
+- "src/libs/dynamic_bitset"
+- "src/libs/endian"
+- "src/libs/exception"
+- "src/libs/filesystem"
+- "src/libs/foreach"
+- "src/libs/format"
+- "src/libs/function"
+- "src/libs/function_types"
+- "src/libs/fusion"
+- "src/libs/integer"
+- "src/libs/intrusive"
+- "src/libs/io"
+- "src/libs/iterator"
+- "src/libs/lexical_cast"
+- "src/libs/locale"
+- "src/libs/logic"
+- "src/libs/move"
+- "src/libs/mp11"
+- "src/libs/mpl"
+- "src/libs/multi_index"
+- "src/libs/numeric/conversion"
+- "src/libs/optional"
+- "src/libs/phoenix"
+- "src/libs/pool"
+- "src/libs/predef"
+- "src/libs/preprocessor"
+- "src/libs/property_tree"
+- "src/libs/proto"
+- "src/libs/random"
+- "src/libs/range"
+- "src/libs/ratio"
+- "src/libs/rational"
+- "src/libs/regex"
+- "src/libs/scope_exit"
+- "src/libs/serialization"
+- "src/libs/smart_ptr"
+- "src/libs/spirit"
+- "src/libs/static_assert"
+- "src/libs/system"
+- "src/libs/thread"
+- "src/libs/throw_exception"
+- "src/libs/tokenizer"
+- "src/libs/tti"
+- "src/libs/tuple"
+- "src/libs/type_index"
+- "src/libs/typeof"
+- "src/libs/type_traits"
+- "src/libs/unordered"
+- "src/libs/utility"
+- "src/libs/uuid"
+- "src/libs/variant"
+- "src/libs/winapi"
+-)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(boost REQUIRED "boost")
+--
+2.38.1
+
diff --git a/srcpkgs/osquery/template b/srcpkgs/osquery/template
new file mode 100644
index 000000000000..a375dbf11a7d
--- /dev/null
+++ b/srcpkgs/osquery/template
@@ -0,0 +1,29 @@
+# Template file for 'osquery'
+pkgname=osquery
+version=5.6.0
+revision=1
+#archs="i686 x86_64"
+#wrksrc=
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DOSQUERY_VERSION=${version}"
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="pkg-config python3 git"
+makedepends="augeas-devel boost-devel"
+depends=""
+short_desc="SQL powered operating system instrumentation, monitoring, and analytics"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-3.0-or-later" #FIXME
+homepage="https://osquery.io/"
+#changelog=""
+distfiles="https://github.com/osquery/osquery/archive/refs/tags/${version}.tar.gz"
+checksum=5694d54c8bab3d7c3706e177242a6dff5bb17a04b860de3a116103d99388ffa7
+
+# debug
+# configure_args+=" -LAH"
+
+# no tests for now
+configure_args+=" -DOSQUERY_BUILD_TESTS=OFF"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] WIP: New package: osquery-5.6.0
2022-11-02 11:33 [PR PATCH] WIP: New package: osquery-5.6.0 jcgruenhage
@ 2022-11-17 17:10 ` jcgruenhage
2022-11-18 11:13 ` [PR REVIEW] " jcgruenhage
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: jcgruenhage @ 2022-11-17 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages osquery-bin-5.5.1_1
https://github.com/void-linux/void-packages/pull/40298
WIP: New package: osquery-5.6.0
osquery is a major PITA to package "properly", but considering I need it for work, I've started with an `osquery-bin` package for now. Stuff like the service should be reusable for a proper `osquery` package later, so I thought pushing my current state might already be useful to someone, but this is definitely in no state to be merged at all.
Help on the `osquery` package for getting it to build with system libraries would be really appreciated, my C++/CMake foo is not strong enough for this I'm afraid.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40298.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-osquery-bin-5.5.1_1-40298.patch --]
[-- Type: text/x-diff, Size: 9628 bytes --]
From ecdb3d1c25051a92d2a039eb56efadfa547572f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 2 Nov 2022 12:27:20 +0100
Subject: [PATCH 1/3] New package: osquery-bin-5.5.1
---
srcpkgs/osquery-bin/files/osqueryd/log/run | 1 +
srcpkgs/osquery-bin/files/osqueryd/run | 7 ++++
srcpkgs/osquery-bin/template | 39 ++++++++++++++++++++++
3 files changed, 47 insertions(+)
create mode 120000 srcpkgs/osquery-bin/files/osqueryd/log/run
create mode 100755 srcpkgs/osquery-bin/files/osqueryd/run
create mode 100644 srcpkgs/osquery-bin/template
diff --git a/srcpkgs/osquery-bin/files/osqueryd/log/run b/srcpkgs/osquery-bin/files/osqueryd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/osquery-bin/files/osqueryd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/osquery-bin/files/osqueryd/run b/srcpkgs/osquery-bin/files/osqueryd/run
new file mode 100755
index 000000000000..44ed48d51f39
--- /dev/null
+++ b/srcpkgs/osquery-bin/files/osqueryd/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+FLAG_FILE=/etc/osquery/osquery.flags
+CONFIG_FILE=/etc/osquery/osquery.conf
+[ -r conf ] && . ./conf
+[ ! -f /etc/osquery/ ] && -p mkdir /etc/osquery/
+[ ! -f ${FLAG_FILE} ] && touch "${FLAG_FILE}"
+exec /usr/bin/osqueryd --flagfile ${FLAG_FILE} --config_path ${CONFIG_FILE} --tls_server_certs /etc/ssl/certs.pem $OPTS 2>&1
diff --git a/srcpkgs/osquery-bin/template b/srcpkgs/osquery-bin/template
new file mode 100644
index 000000000000..cf3755ca0601
--- /dev/null
+++ b/srcpkgs/osquery-bin/template
@@ -0,0 +1,39 @@
+# Template file for 'osquery-bin'
+pkgname=osquery-bin
+version=5.5.1
+revision=1
+archs="x86_64"
+#wrksrc=
+create_wrksrc=yes
+#create_wrksrc=yes
+#build_style=fetch
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends=""
+makedepends=""
+depends=""
+short_desc="osquery binary releases"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="Apache-2.0 OR GPL-2.0-only"
+homepage="https://osquery.io/"
+changelog="https://github.com/osquery/osquery/raw/master/CHANGELOG.md"
+distfiles="https://pkg.osquery.io/linux/osquery-${version}_${revision}.linux_${archs}.tar.gz"
+checksum=5e21502cfd0ce042ce4acb2c20ae64c20296a5deb10ff053e12a5e342e163b7e
+
+do_install() {
+ vbin opt/osquery/bin/osqueryd
+ vbin opt/osquery/bin/osqueryctl
+ ln -s /usr/bin/osqueryd ${PKGDESTDIR}/usr/bin/osqueryi
+
+ vsconf opt/osquery/share/osquery/osquery.example.conf osquery.conf
+
+ install -d -Dm0644 opt/osquery/share/osquery/lenses ${PKGDESTDIR}/usr/share/osquery
+ install -d -Dm0644 opt/osquery/share/osquery/packs ${PKGDESTDIR}/usr/share/osquery
+
+ vmkdir /etc/osquery 0644
+
+ vsv osqueryd
+}
From 70d7f7068e557491278755da9e745cea76e5cc51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 2 Nov 2022 12:28:04 +0100
Subject: [PATCH 2/3] New package: osquery-5.6.0
---
...001-locate-libraries-with-pkg-config.patch | 132 ++++++++++++++++++
srcpkgs/osquery/template | 29 ++++
2 files changed, 161 insertions(+)
create mode 100644 srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch
create mode 100644 srcpkgs/osquery/template
diff --git a/srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch b/srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch
new file mode 100644
index 000000000000..5bd29d369bb0
--- /dev/null
+++ b/srcpkgs/osquery/patches/0001-locate-libraries-with-pkg-config.patch
@@ -0,0 +1,132 @@
+From e9f104a8eb1f1e61240b11359c9bf5e0fff1019b Mon Sep 17 00:00:00 2001
+From: Piraty <piraty1@inbox.ru>
+Date: Wed, 19 Oct 2022 15:16:02 +0200
+Subject: [PATCH] locate libraries with pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-authored-by: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
+---
+ .../cmake/source/modules/Findaugeas.cmake | 15 +---
+ .../cmake/source/modules/Findboost.cmake | 84 +------------------
+ 2 files changed, 4 insertions(+), 95 deletions(-)
+
+diff --git a/libraries/cmake/source/modules/Findaugeas.cmake b/libraries/cmake/source/modules/Findaugeas.cmake
+index 77186b9df..c5d1cfa47 100644
+--- a/libraries/cmake/source/modules/Findaugeas.cmake
++++ b/libraries/cmake/source/modules/Findaugeas.cmake
+@@ -7,16 +7,5 @@
+
+ include("${CMAKE_CURRENT_LIST_DIR}/utils.cmake")
+
+-importSourceSubmodule(
+- NAME "augeas/gnulib"
+-
+- SHALLOW_SUBMODULES "src"
+-)
+-
+-importSourceSubmodule(
+- NAME "augeas"
+-
+- NO_RECURSIVE
+-
+- SHALLOW_SUBMODULES "src"
+-)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(augeas REQUIRED "augeas")
+diff --git a/libraries/cmake/source/modules/Findboost.cmake b/libraries/cmake/source/modules/Findboost.cmake
+index b7fc8d94f..48152fd76 100644
+--- a/libraries/cmake/source/modules/Findboost.cmake
++++ b/libraries/cmake/source/modules/Findboost.cmake
+@@ -7,85 +7,5 @@
+
+ include("${CMAKE_CURRENT_LIST_DIR}/utils.cmake")
+
+-importSourceSubmodule(
+- NAME "boost"
+-
+- NO_RECURSIVE
+-
+- SUBMODULES
+- "src"
+-
+- SHALLOW_SUBMODULES
+- "src/libs/algorithm"
+- "src/libs/align"
+- "src/libs/any"
+- "src/libs/array"
+- "src/libs/asio"
+- "src/libs/assert"
+- "src/libs/atomic"
+- "src/libs/beast"
+- "src/libs/bind"
+- "src/libs/chrono"
+- "src/libs/concept_check"
+- "src/libs/config"
+- "src/libs/container"
+- "src/libs/container_hash"
+- "src/libs/context"
+- "src/libs/conversion"
+- "src/libs/core"
+- "src/libs/coroutine2"
+- "src/libs/date_time"
+- "src/libs/detail"
+- "src/libs/dynamic_bitset"
+- "src/libs/endian"
+- "src/libs/exception"
+- "src/libs/filesystem"
+- "src/libs/foreach"
+- "src/libs/format"
+- "src/libs/function"
+- "src/libs/function_types"
+- "src/libs/fusion"
+- "src/libs/integer"
+- "src/libs/intrusive"
+- "src/libs/io"
+- "src/libs/iterator"
+- "src/libs/lexical_cast"
+- "src/libs/locale"
+- "src/libs/logic"
+- "src/libs/move"
+- "src/libs/mp11"
+- "src/libs/mpl"
+- "src/libs/multi_index"
+- "src/libs/numeric/conversion"
+- "src/libs/optional"
+- "src/libs/phoenix"
+- "src/libs/pool"
+- "src/libs/predef"
+- "src/libs/preprocessor"
+- "src/libs/property_tree"
+- "src/libs/proto"
+- "src/libs/random"
+- "src/libs/range"
+- "src/libs/ratio"
+- "src/libs/rational"
+- "src/libs/regex"
+- "src/libs/scope_exit"
+- "src/libs/serialization"
+- "src/libs/smart_ptr"
+- "src/libs/spirit"
+- "src/libs/static_assert"
+- "src/libs/system"
+- "src/libs/thread"
+- "src/libs/throw_exception"
+- "src/libs/tokenizer"
+- "src/libs/tti"
+- "src/libs/tuple"
+- "src/libs/type_index"
+- "src/libs/typeof"
+- "src/libs/type_traits"
+- "src/libs/unordered"
+- "src/libs/utility"
+- "src/libs/uuid"
+- "src/libs/variant"
+- "src/libs/winapi"
+-)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(boost REQUIRED "boost")
+--
+2.38.1
+
diff --git a/srcpkgs/osquery/template b/srcpkgs/osquery/template
new file mode 100644
index 000000000000..a375dbf11a7d
--- /dev/null
+++ b/srcpkgs/osquery/template
@@ -0,0 +1,29 @@
+# Template file for 'osquery'
+pkgname=osquery
+version=5.6.0
+revision=1
+#archs="i686 x86_64"
+#wrksrc=
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DOSQUERY_VERSION=${version}"
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="pkg-config python3 git"
+makedepends="augeas-devel boost-devel"
+depends=""
+short_desc="SQL powered operating system instrumentation, monitoring, and analytics"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-3.0-or-later" #FIXME
+homepage="https://osquery.io/"
+#changelog=""
+distfiles="https://github.com/osquery/osquery/archive/refs/tags/${version}.tar.gz"
+checksum=5694d54c8bab3d7c3706e177242a6dff5bb17a04b860de3a116103d99388ffa7
+
+# debug
+# configure_args+=" -LAH"
+
+# no tests for now
+configure_args+=" -DOSQUERY_BUILD_TESTS=OFF"
From b54989c082440e6a96391a445f6c41eae820d41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 17 Nov 2022 17:34:06 +0100
Subject: [PATCH 3/3] New package: osquery-voidlinux-0.1.0
---
srcpkgs/osquery-voidlinux/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/osquery-voidlinux/template
diff --git a/srcpkgs/osquery-voidlinux/template b/srcpkgs/osquery-voidlinux/template
new file mode 100644
index 000000000000..f3492fa91f44
--- /dev/null
+++ b/srcpkgs/osquery-voidlinux/template
@@ -0,0 +1,17 @@
+# Template file for 'osquery-voidlinux'
+pkgname=osquery-voidlinux
+version=0.1.0
+revision=1
+build_style=cargo
+short_desc="Extension for osquery to provide Void Linux specific information"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="AGPL-3.0-or-later"
+homepage="https://git.jcg.re/jcgruenhage/osquery-voidlinux"
+changelog="https://git.jcg.re/jcgruenhage/osquery-voidlinux/raw/branch/main/CHANGELOG.md"
+distfiles="https://git.jcg.re/jcgruenhage/osquery-voidlinux/archive/v${version}.tar.gz"
+checksum=1608d0932711c25361267975130000e0d51a605a297cab8006af4b8a7854d922
+
+do_install() {
+ vbin target/${RUST_TARGET}/release/osquery-voidlinux osquery-voidlinux.ext
+ vlicense LICENSE.md
+}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] WIP: New package: osquery-5.6.0
2022-11-02 11:33 [PR PATCH] WIP: New package: osquery-5.6.0 jcgruenhage
2022-11-17 17:10 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-11-18 11:13 ` jcgruenhage
2023-02-17 2:04 ` github-actions
2023-03-03 2:20 ` [PR PATCH] [Closed]: " github-actions
3 siblings, 0 replies; 5+ messages in thread
From: jcgruenhage @ 2022-11-18 11:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/40298#discussion_r1026317165
Comment:
I'm not quite sure whether this is the right place actually, https://osquery.readthedocs.io/en/stable/deployment/extensions/ sounds like `/usr/lib/osquery/extensions/<extension>.ext` would be the right place
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: WIP: New package: osquery-5.6.0
2022-11-02 11:33 [PR PATCH] WIP: New package: osquery-5.6.0 jcgruenhage
2022-11-17 17:10 ` [PR PATCH] [Updated] " jcgruenhage
2022-11-18 11:13 ` [PR REVIEW] " jcgruenhage
@ 2023-02-17 2:04 ` github-actions
2023-03-03 2:20 ` [PR PATCH] [Closed]: " github-actions
3 siblings, 0 replies; 5+ messages in thread
From: github-actions @ 2023-02-17 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/40298#issuecomment-1433992851
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: WIP: New package: osquery-5.6.0
2022-11-02 11:33 [PR PATCH] WIP: New package: osquery-5.6.0 jcgruenhage
` (2 preceding siblings ...)
2023-02-17 2:04 ` github-actions
@ 2023-03-03 2:20 ` github-actions
3 siblings, 0 replies; 5+ messages in thread
From: github-actions @ 2023-03-03 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1564 bytes --]
There's a closed pull request on the void-packages repository
WIP: New package: osquery-5.6.0
https://github.com/void-linux/void-packages/pull/40298
Description:
osquery is a major PITA to package "properly", but considering I need it for work, I've started with an `osquery-bin` package for now. Stuff like the service should be reusable for a proper `osquery` package later, so I thought pushing my current state might already be useful to someone, but this is definitely in no state to be merged at all.
Help on the `osquery` package for getting it to build with system libraries would be really appreciated, my C++/CMake foo is not strong enough for this I'm afraid.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-03 2:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-02 11:33 [PR PATCH] WIP: New package: osquery-5.6.0 jcgruenhage
2022-11-17 17:10 ` [PR PATCH] [Updated] " jcgruenhage
2022-11-18 11:13 ` [PR REVIEW] " jcgruenhage
2023-02-17 2:04 ` github-actions
2023-03-03 2:20 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).