upgpkg: 5.12.2-3: Add support for sending logs to AWS

https://osquery.readthedocs.io/en/latest/deployment/aws-logging/

upgpkg: 5.12.2-3: Add support for sending logs to AWS
4259c121 · Carl Smedstad · 41802be1 · 4259c121 · 4259c121
Verified Commit 4259c121 authored 6 months ago by Carl Smedstad
--- a/.SRCINFO
+++ b/.SRCINFO
 pkgbase = osquery
 	pkgdesc = SQL powered operating system instrumentation, monitoring, and analytics
 	pkgver = 5.12.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://osquery.io
 	arch = x86_64
 	license = Apache-2.0 OR GPL-2.0-only
@@ -17,6 +17,20 @@ pkgbase = osquery
 	makedepends = rapidjson
 	depends = audit
 	depends = augeas
+	depends = aws-c-auth
+	depends = aws-c-cal
+	depends = aws-c-common
+	depends = aws-c-compression
+	depends = aws-c-event-stream
+	depends = aws-c-http
+	depends = aws-c-io
+	depends = aws-c-mqtt
+	depends = aws-c-s3
+	depends = aws-c-sdkutils
+	depends = aws-checksums
+	depends = aws-crt-cpp
+	depends = aws-sdk-cpp
+	depends = bash
 	depends = boost-libs
 	depends = cryptsetup
 	depends = dbus
@@ -34,6 +48,7 @@ pkgbase = osquery
 	depends = popt
 	depends = rocksdb
 	depends = rpm-tools
+	depends = s2n-tls
 	depends = sleuthkit
 	depends = sqlite
 	depends = systemd-libs
@@ -46,40 +61,40 @@ pkgbase = osquery
 	source = git+https://github.com/osquery/osquery.git#tag=5.12.2
 	source = git+https://github.com/arangodb/linenoise-ng.git
 	source = git+https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
-	source = 0001-Use-system-libraries-where-possible.patch::https://github.com/osquery/osquery/commit/0123bf2657c325acdf738e33a5b8fcdf984b0d99.patch
-	source = 0002-Disable-submodule-fetching.patch::https://github.com/osquery/osquery/commit/723ae80cd212c477f87bfb88be0b6469795f2564.patch
-	source = 0003-Remove-incompatible-build-flags.patch::https://github.com/osquery/osquery/commit/d2690e98347bea3dbf6036b6b459c0c42e8d14f3.patch
-	source = 0004-Remove-include-of-non-existing-header-xlocale.h.patch::https://github.com/osquery/osquery/commit/8d5f7a5c2d89abbe6e24a4516fb4e4509e0f7ec7.patch
-	source = 0005-Add-missing-includes-causing-compilation-error-with-.patch::https://github.com/osquery/osquery/commit/a7acf00329afba22ec1fb3a314d9cf3caeddf4fd.patch
-	source = 0006-Replace-usage-of-libaudit-function-removed-in-v3.0.7.patch::https://github.com/osquery/osquery/commit/752cfd56c0aff320a6269aa71c2cb528379824e7.patch
-	source = 0007-Fix-remaining-compilation-issues.patch::https://github.com/osquery/osquery/commit/8a417a722fceca0d1263c1adabda3a5ae4c49db1.patch
-	source = 0008-Do-not-build-system_controls-tables.patch::https://github.com/osquery/osquery/commit/fc14676d385f27d28c6c5269eefcfeccfb22685a.patch
-	source = 0009-Do-not-build-block_devices-tables.patch::https://github.com/osquery/osquery/commit/e06f19be075c0768e480fa85f5cdacf6a75d50a7.patch
-	source = 0010-Do-not-build-utils-requiring-libdpkg.patch::https://github.com/osquery/osquery/commit/c78e2549952af2eb359eaf5f8ee0f5a065f1abc8.patch
-	source = 0011-Fix-systemd-service-and-systemctl-script.patch::https://github.com/osquery/osquery/commit/aa9db4fe47a2f7828654bee025a6ef61fe3a2116.patch
-	source = 0012-Adapt-installation-to-using-system-packages.patch::https://github.com/osquery/osquery/commit/3a29f038634e82255da770638b0c43bf7fac5feb.patch
-	source = 0013-Replace-boost-filesystem-path.-leaf-filename.patch::https://github.com/osquery/osquery/commit/68107a349052b2b71381f730bb9e178f874ef09f.patch
-	source = 0014-Update-usage-of-boost-property_tree-ptree-get_child.patch::https://github.com/osquery/osquery/commit/e4b8c72482a3dda7da720d8f57a1a5b933578356.patch
-	source = 0015-Replace-boost-filesystem-path.-normalize-lexically_n.patch::https://github.com/osquery/osquery/commit/303e3c68437bc0d7722e898463ba7fa1c07f484a.patch
-	source = 0016-Adapt-tests-for-Boost-1.86.0-JSON-serialization-chan.patch::https://github.com/osquery/osquery/commit/732322e67457670741d6cd08055daa8ea5cc641e.patch
+	source = 0001-Use-system-libraries-where-possible.patch::https://github.com/osquery/osquery/commit/196cef6ab11762eb81640e9d2043ec404e626994.patch
+	source = 0002-Disable-submodule-fetching.patch::https://github.com/osquery/osquery/commit/d1b1974d416fea21676cccff8c99160f8631a7f1.patch
+	source = 0003-Remove-incompatible-build-flags.patch::https://github.com/osquery/osquery/commit/f524afd218b67f2ef126efa2bbe01765a551fdf3.patch
+	source = 0004-Remove-include-of-non-existing-header-xlocale.h.patch::https://github.com/osquery/osquery/commit/8461290050c4df7d6342f4454ec578cc7fa3c171.patch
+	source = 0005-Add-missing-includes-causing-compilation-error-with-.patch::https://github.com/osquery/osquery/commit/5bc0c4191ebb94830b90a957c0b6db04ad0f23c9.patch
+	source = 0006-Replace-usage-of-libaudit-function-removed-in-v3.0.7.patch::https://github.com/osquery/osquery/commit/9539fdcfe9b4ac4b9f3db244e99b39a46594a40b.patch
+	source = 0007-Fix-remaining-compilation-issues.patch::https://github.com/osquery/osquery/commit/b4af4776764afce0c2f05d2eb195e4b3e7ca6e09.patch
+	source = 0008-Do-not-build-system_controls-tables.patch::https://github.com/osquery/osquery/commit/9e04ff399737a2bdfcdd67eb75772e8683d47e72.patch
+	source = 0009-Do-not-build-block_devices-tables.patch::https://github.com/osquery/osquery/commit/7add67af68c42b3995b53dcbbfd86e71c5ce4a94.patch
+	source = 0010-Do-not-build-utils-requiring-libdpkg.patch::https://github.com/osquery/osquery/commit/e03230faef43e9bff621b2946c5f950e95382d07.patch
+	source = 0011-Fix-systemd-service-and-systemctl-script.patch::https://github.com/osquery/osquery/commit/22b18db72392dcf72bc5601b39887ea4685a90ae.patch
+	source = 0012-Adapt-installation-to-using-system-packages.patch::https://github.com/osquery/osquery/commit/751630a7b1b0e98731f86f29f0f90ecf7e0227c4.patch
+	source = 0013-Replace-boost-filesystem-path.-leaf-filename.patch::https://github.com/osquery/osquery/commit/6c73f2a4439a10e1e461e3801a11015793ee93b6.patch
+	source = 0014-Update-usage-of-boost-property_tree-ptree-get_child.patch::https://github.com/osquery/osquery/commit/66070894acc3d7956162304c6a06277d94e1fa2e.patch
+	source = 0015-Replace-boost-filesystem-path.-normalize-lexically_n.patch::https://github.com/osquery/osquery/commit/7c8aa7ee95fd560ce76da7769f5a693aa70478b8.patch
+	source = 0016-Adapt-tests-for-Boost-1.86.0-JSON-serialization-chan.patch::https://github.com/osquery/osquery/commit/680a246f587fc300daacf2bb16e87c799bec597b.patch
 	sha256sums = 1239edfc5c1d80ce3d1a4ee072e2691df01587c00ab1e28fc9caa49f5ff46380
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 06cd603566de5f3407989d3da097d344e700506a5f578fdbd69adfa268fd9558
-	sha256sums = 220462d1e0045f7fb26d6bb1251ddd30417fe69bdd331fcb0f0ea869132fa53f
-	sha256sums = 9d394efd8f037f87d022cd61064986102695a7c845079a6366e2d4acb3e06bfb
-	sha256sums = ec6f87b4e0387ae3885ea3cd47fb05aa7ac0d9b0c6a1352b6b6679d71b02d486
-	sha256sums = 8f49b35dea618656d00c281d5e4c3ed2c88524d2673d50917e8043c9cd89cd83
-	sha256sums = 7db146fa4573871dd48cf21cc1778a91a67ea353cf0413a3692ce4e9f113aa8c
-	sha256sums = f9ab00ea606f7802c6559cf7e0d20cbb41fa2d6eff020d9d0e2a294c169a4905
-	sha256sums = 8e502cc9c27fbc16f529f157b8368f698a9c6a614a57dcd60f19a9874db4fa31
-	sha256sums = abfaa7b1692ab211b93545dcfa50fbd3500cbc6673dc6280e33dcbbe5e211204
-	sha256sums = d4b22e37a4b0e2064ea04e2a14fb8e5e894cd0736605e0ea7d0fe4cf5a902c08
-	sha256sums = b2d9b0905b182c89a4f5806a28f968f236fc5b2c9e5f9264eda8071f50888bf5
-	sha256sums = 6dbd58cf25b0b99c3c95a2bf9f9965ce9d24cc5eef9758f8585c737c53cf486c
-	sha256sums = fcb716a957491808e6cfced7686d19400bf9dd6309252fb00c55c0a02534cc8f
-	sha256sums = 5b9e7dcd0f937c99f6e9dbaef165d20960180965610d19db58c57387c743cf25
-	sha256sums = c2b14885f425ce1b68bfbd42d691e311e56b9c647338147f4417e5ca2cf2f754
-	sha256sums = badc4bbac15be7f0cab06e2fb0f04c49f7ccf3f9b89f5739ccf8f71305f3cf22
+	sha256sums = d2ddbb5b05fc8471566e3f3d62525a601458e3b0c158658b05f6a82fef8e8533
+	sha256sums = 3ed7937d82134c5412ce4071fc44d20ca2df84270884aab89df4084be1b1cc20
+	sha256sums = ca444d1212f6c7a58e1f27d713796181cd7ef9bd57b84fc73a589e76909bdd51
+	sha256sums = dbcc488d09e66acbb9cbad79404a0bd0e8e47835df068d286bd321402bd5ffdb
+	sha256sums = cf543a5008c8c542411a6753d25e16b3e7bf2493dc9c1fa20b5177fd1d8760f2
+	sha256sums = dfcc824e9a0ffa9979f15787fe3a8878b6e4d3ad4f882659cbc5c6b9e8c0e579
+	sha256sums = 5fb0373369a108382d18c7579d18a2d3842ff483ffd3cf2c4e4b75bf0f3047ed
+	sha256sums = 55f2e3773f3a5804e7e8c9237cd5001fa8c12ed16bd5524ab0557936aebb92d8
+	sha256sums = c2d57e27dc6b2063322d5f6a88b411b447d2904628601f82876026a8c4583e55
+	sha256sums = cc2df4a84c421ea7b133fe51797be2499783893e04053ac101d3b7ec25dd0f20
+	sha256sums = 70326d8ac6555d38c7bffffc270a7f1bc36551f35a3d9132245bdeb4085b986a
+	sha256sums = d3b39d84d4c4db47f43e8568e5e4406573159cb33a6da9ad7f980dfe3305970e
+	sha256sums = dcafbb27b5a54f7e180f838d1e3fcfc62857e7ad48405e48a4e691e95f7e0f83
+	sha256sums = 8f4441f3f11b9250f7c4b6107d08498cb3e231bd898fcec90373c2cb19fe8b78
+	sha256sums = 07d4ea9f79ef58e9542aa251fca1d4fcb45798786aac1fb4387522a653caf63d
+	sha256sums = 90ddfd8a94f40c11715a2bd8b083af5f43fcd1863b1300f6d4b08b48ccc26e13

 pkgname = osquery
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@

 pkgname=osquery
 pkgver=5.12.2
-pkgrel=2
+pkgrel=3
 pkgdesc="SQL powered operating system instrumentation, monitoring, and analytics"
 arch=(x86_64)
 url="https://osquery.io"
@@ -11,6 +11,20 @@ license=('Apache-2.0 OR GPL-2.0-only')
 depends=(
  audit
  augeas
+  aws-c-auth
+  aws-c-cal
+  aws-c-common
+  aws-c-compression
+  aws-c-event-stream
+  aws-c-http
+  aws-c-io
+  aws-c-mqtt
+  aws-c-s3
+  aws-c-sdkutils
+  aws-checksums
+  aws-crt-cpp
+  aws-sdk-cpp
+  bash
  boost-libs
  cryptsetup
  dbus
@@ -28,6 +42,7 @@ depends=(
  popt
  rocksdb
  rpm-tools
+  s2n-tls
  sleuthkit
  sqlite
  systemd-libs
@@ -59,44 +74,45 @@ source=(
  "git+$_url.git#tag=$pkgver"
  "git+https://github.com/arangodb/linenoise-ng.git"
  "git+https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-  "0001-Use-system-libraries-where-possible.patch::$_url/commit/0123bf2657c325acdf738e33a5b8fcdf984b0d99.patch"
-  "0002-Disable-submodule-fetching.patch::$_url/commit/723ae80cd212c477f87bfb88be0b6469795f2564.patch"
-  "0003-Remove-incompatible-build-flags.patch::$_url/commit/d2690e98347bea3dbf6036b6b459c0c42e8d14f3.patch"
-  "0004-Remove-include-of-non-existing-header-xlocale.h.patch::$_url/commit/8d5f7a5c2d89abbe6e24a4516fb4e4509e0f7ec7.patch"
+  "0001-Use-system-libraries-where-possible.patch::$_url/commit/196cef6ab11762eb81640e9d2043ec404e626994.patch"
+  "0002-Disable-submodule-fetching.patch::$_url/commit/d1b1974d416fea21676cccff8c99160f8631a7f1.patch"
+  "0003-Remove-incompatible-build-flags.patch::$_url/commit/f524afd218b67f2ef126efa2bbe01765a551fdf3.patch"
+  "0004-Remove-include-of-non-existing-header-xlocale.h.patch::$_url/commit/8461290050c4df7d6342f4454ec578cc7fa3c171.patch"
  # https://github.com/osquery/osquery/pull/8400
-  "0005-Add-missing-includes-causing-compilation-error-with-.patch::$_url/commit/a7acf00329afba22ec1fb3a314d9cf3caeddf4fd.patch"
+  "0005-Add-missing-includes-causing-compilation-error-with-.patch::$_url/commit/5bc0c4191ebb94830b90a957c0b6db04ad0f23c9.patch"
  # https://github.com/osquery/osquery/pull/8401
-  "0006-Replace-usage-of-libaudit-function-removed-in-v3.0.7.patch::$_url/commit/752cfd56c0aff320a6269aa71c2cb528379824e7.patch"
-  "0007-Fix-remaining-compilation-issues.patch::$_url/commit/8a417a722fceca0d1263c1adabda3a5ae4c49db1.patch"
-  "0008-Do-not-build-system_controls-tables.patch::$_url/commit/fc14676d385f27d28c6c5269eefcfeccfb22685a.patch"
-  "0009-Do-not-build-block_devices-tables.patch::$_url/commit/e06f19be075c0768e480fa85f5cdacf6a75d50a7.patch"
-  "0010-Do-not-build-utils-requiring-libdpkg.patch::$_url/commit/c78e2549952af2eb359eaf5f8ee0f5a065f1abc8.patch"
-  "0011-Fix-systemd-service-and-systemctl-script.patch::$_url/commit/aa9db4fe47a2f7828654bee025a6ef61fe3a2116.patch"
-  "0012-Adapt-installation-to-using-system-packages.patch::$_url/commit/3a29f038634e82255da770638b0c43bf7fac5feb.patch"
-  "0013-Replace-boost-filesystem-path.-leaf-filename.patch::$_url/commit/68107a349052b2b71381f730bb9e178f874ef09f.patch"
-  "0014-Update-usage-of-boost-property_tree-ptree-get_child.patch::$_url/commit/e4b8c72482a3dda7da720d8f57a1a5b933578356.patch"
-  "0015-Replace-boost-filesystem-path.-normalize-lexically_n.patch::$_url/commit/303e3c68437bc0d7722e898463ba7fa1c07f484a.patch"
-  "0016-Adapt-tests-for-Boost-1.86.0-JSON-serialization-chan.patch::$_url/commit/732322e67457670741d6cd08055daa8ea5cc641e.patch"
+  "0006-Replace-usage-of-libaudit-function-removed-in-v3.0.7.patch::$_url/commit/9539fdcfe9b4ac4b9f3db244e99b39a46594a40b.patch"
+  "0007-Fix-remaining-compilation-issues.patch::$_url/commit/b4af4776764afce0c2f05d2eb195e4b3e7ca6e09.patch"
+  "0008-Do-not-build-system_controls-tables.patch::$_url/commit/9e04ff399737a2bdfcdd67eb75772e8683d47e72.patch"
+  "0009-Do-not-build-block_devices-tables.patch::$_url/commit/7add67af68c42b3995b53dcbbfd86e71c5ce4a94.patch"
+  "0010-Do-not-build-utils-requiring-libdpkg.patch::$_url/commit/e03230faef43e9bff621b2946c5f950e95382d07.patch"
+  "0011-Fix-systemd-service-and-systemctl-script.patch::$_url/commit/22b18db72392dcf72bc5601b39887ea4685a90ae.patch"
+  "0012-Adapt-installation-to-using-system-packages.patch::$_url/commit/751630a7b1b0e98731f86f29f0f90ecf7e0227c4.patch"
+  # https://github.com/osquery/osquery/pull/8409
+  "0013-Replace-boost-filesystem-path.-leaf-filename.patch::$_url/commit/6c73f2a4439a10e1e461e3801a11015793ee93b6.patch"
+  "0014-Update-usage-of-boost-property_tree-ptree-get_child.patch::$_url/commit/66070894acc3d7956162304c6a06277d94e1fa2e.patch"
+  "0015-Replace-boost-filesystem-path.-normalize-lexically_n.patch::$_url/commit/7c8aa7ee95fd560ce76da7769f5a693aa70478b8.patch"
+  "0016-Adapt-tests-for-Boost-1.86.0-JSON-serialization-chan.patch::$_url/commit/680a246f587fc300daacf2bb16e87c799bec597b.patch"
 )
 sha256sums=('1239edfc5c1d80ce3d1a4ee072e2691df01587c00ab1e28fc9caa49f5ff46380'
            'SKIP'
            'SKIP'
-            '06cd603566de5f3407989d3da097d344e700506a5f578fdbd69adfa268fd9558'
-            '220462d1e0045f7fb26d6bb1251ddd30417fe69bdd331fcb0f0ea869132fa53f'
-            '9d394efd8f037f87d022cd61064986102695a7c845079a6366e2d4acb3e06bfb'
-            'ec6f87b4e0387ae3885ea3cd47fb05aa7ac0d9b0c6a1352b6b6679d71b02d486'
-            '8f49b35dea618656d00c281d5e4c3ed2c88524d2673d50917e8043c9cd89cd83'
-            '7db146fa4573871dd48cf21cc1778a91a67ea353cf0413a3692ce4e9f113aa8c'
-            'f9ab00ea606f7802c6559cf7e0d20cbb41fa2d6eff020d9d0e2a294c169a4905'
-            '8e502cc9c27fbc16f529f157b8368f698a9c6a614a57dcd60f19a9874db4fa31'
-            'abfaa7b1692ab211b93545dcfa50fbd3500cbc6673dc6280e33dcbbe5e211204'
-            'd4b22e37a4b0e2064ea04e2a14fb8e5e894cd0736605e0ea7d0fe4cf5a902c08'
-            'b2d9b0905b182c89a4f5806a28f968f236fc5b2c9e5f9264eda8071f50888bf5'
-            '6dbd58cf25b0b99c3c95a2bf9f9965ce9d24cc5eef9758f8585c737c53cf486c'
-            'fcb716a957491808e6cfced7686d19400bf9dd6309252fb00c55c0a02534cc8f'
-            '5b9e7dcd0f937c99f6e9dbaef165d20960180965610d19db58c57387c743cf25'
-            'c2b14885f425ce1b68bfbd42d691e311e56b9c647338147f4417e5ca2cf2f754'
-            'badc4bbac15be7f0cab06e2fb0f04c49f7ccf3f9b89f5739ccf8f71305f3cf22')
+            'd2ddbb5b05fc8471566e3f3d62525a601458e3b0c158658b05f6a82fef8e8533'
+            '3ed7937d82134c5412ce4071fc44d20ca2df84270884aab89df4084be1b1cc20'
+            'ca444d1212f6c7a58e1f27d713796181cd7ef9bd57b84fc73a589e76909bdd51'
+            'dbcc488d09e66acbb9cbad79404a0bd0e8e47835df068d286bd321402bd5ffdb'
+            'cf543a5008c8c542411a6753d25e16b3e7bf2493dc9c1fa20b5177fd1d8760f2'
+            'dfcc824e9a0ffa9979f15787fe3a8878b6e4d3ad4f882659cbc5c6b9e8c0e579'
+            '5fb0373369a108382d18c7579d18a2d3842ff483ffd3cf2c4e4b75bf0f3047ed'
+            '55f2e3773f3a5804e7e8c9237cd5001fa8c12ed16bd5524ab0557936aebb92d8'
+            'c2d57e27dc6b2063322d5f6a88b411b447d2904628601f82876026a8c4583e55'
+            'cc2df4a84c421ea7b133fe51797be2499783893e04053ac101d3b7ec25dd0f20'
+            '70326d8ac6555d38c7bffffc270a7f1bc36551f35a3d9132245bdeb4085b986a'
+            'd3b39d84d4c4db47f43e8568e5e4406573159cb33a6da9ad7f980dfe3305970e'
+            'dcafbb27b5a54f7e180f838d1e3fcfc62857e7ad48405e48a4e691e95f7e0f83'
+            '8f4441f3f11b9250f7c4b6107d08498cb3e231bd898fcec90373c2cb19fe8b78'
+            '07d4ea9f79ef58e9542aa251fca1d4fcb45798786aac1fb4387522a653caf63d'
+            '90ddfd8a94f40c11715a2bd8b083af5f43fcd1863b1300f6d4b08b48ccc26e13')

 prepare() {
  cd $pkgname
@@ -126,7 +142,7 @@ build() {
    -DOSQUERY_BUILD_TESTS=ON \
    -DOSQUERY_BUILD_BPF=OFF \
    -DOSQUERY_BUILD_EXPERIMENTS=OFF \
-    -DOSQUERY_BUILD_AWS=OFF \
+    -DOSQUERY_BUILD_AWS=ON \
    -DOSQUERY_BUILD_DPKG=OFF \
    -DOSQUERY_USE_SYSTEM_LIBRARIES=ON \
    -DOSQUERY_VERSION="$pkgver"