diff options
Diffstat (limited to 'community/netdata/APKBUILD')
-rw-r--r-- | community/netdata/APKBUILD | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/community/netdata/APKBUILD b/community/netdata/APKBUILD index bec572dd8e0..df07df626cc 100644 --- a/community/netdata/APKBUILD +++ b/community/netdata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=netdata -pkgver=1.36.0 +pkgver=1.44.3 pkgrel=0 pkgdesc="Real-time performance monitoring" url="https://www.netdata.cloud/" @@ -9,6 +9,7 @@ license="GPL-3.0-or-later" arch="all" depends="bash" makedepends=" + abseil-cpp-dev autoconf automake e2fsprogs-dev @@ -19,6 +20,7 @@ makedepends=" lz4-dev openssl-dev>3 protobuf-dev + yaml-dev zlib-dev " checkdepends="cmocka-dev" @@ -27,27 +29,29 @@ pkggroups="netdata" subpackages="$pkgname-openrc $pkgname-python::noarch" install="$pkgname.pre-install" options="!check" # Broken tests -_aclk_schemas_commit=3252118bd547640251356629f0df05eaf952ac39 -_ml_json_commit=0b345b20c888f7dc8888485768e4bf9a6be29de0 -_ml_kmeans_dlib_commit=021cbbb1c2ddec39d8dd4cb6abfbbafdf1cf4482 -_mqtt_websockets_commit=0ccbce11b82fd5cfc6c9b6f0ec4228c8717813cd -_mqtt_c_commit=dd7a92e60bbc70fbe01c80f29b3c3256cb0653a3 -_c_rbuf_commit=49981420edf53f7465e239c9fbf927921d357a5c +_aclk_schemas_commit=83c661c0dcddb9526814ebbd0668fbc3e281f03f +_ml_dlib_commit=021cbbb1c2ddec39d8dd4cb6abfbbafdf1cf4482 +_mqtt_websockets_commit=6664789ccf57c95451638364f544d1679efd910e +# This _h2o_commit fixes CVE-2023-44487, and does not follow upstream +_h2o_commit=094a6f90f76eeb280a430200cba47bde39b0b8e8 +_c_rbuf_commit=51485be511f8c1d592b699f09f7c783aa2270375 +_c_rhash_commit=f6c21836b921535ab818c7f72b77346d25f60d8e source="$pkgname-$pkgver.tar.gz::https://github.com/netdata/netdata/archive/v$pkgver.tar.gz aclk-schemas-$_aclk_schemas_commit.tar.gz::https://github.com/netdata/aclk-schemas/archive/$_aclk_schemas_commit.tar.gz - json-$_ml_json_commit.tar.gz::https://github.com/nlohmann/json/archive/$_ml_json_commit.tar.gz - dlib-$_ml_kmeans_dlib_commit.tar.gz::https://github.com/davisking/dlib/archive/$_ml_kmeans_dlib_commit.tar.gz + dlib-$_ml_dlib_commit.tar.gz::https://github.com/davisking/dlib/archive/$_ml_dlib_commit.tar.gz mqtt_websockets-$_mqtt_websockets_commit.tar.gz::https://github.com/underhood/mqtt_websockets/archive/$_mqtt_websockets_commit.tar.gz - mqtt-c-$_mqtt_c_commit.tar.gz::https://github.com/underhood/MQTT-C/archive/$_mqtt_c_commit.tar.gz + h2o-$_h2o_commit.tar.gz::https://github.com/h2o/h2o/archive/$_h2o_commit.tar.gz c-rbuf-$_c_rbuf_commit.tar.gz::https://github.com/underhood/c-rbuf/archive/$_c_rbuf_commit.tar.gz + c_rhash-$_c_rhash_commit.tar.gz::https://github.com/underhood/c_rhash/archive/$_c_rhash_commit.tar.gz + cxx17-2.patch + protobuf-23.patch $pkgname.initd $pkgname.confd " -# temp allow textrels on riscv64 -case $CARCH in - riscv64) options="$options textrels";; -esac +# secfixes: +# 1.43.2-r1: +# - CVE-2023-44487 copy_submodule() { local name=$1 @@ -61,18 +65,19 @@ copy_submodule() { } prepare() { - default_prepare - autoreconf -i - copy_submodule aclk-schemas "$_aclk_schemas_commit" aclk/aclk-schemas - copy_submodule json "$_ml_json_commit" ml/json - copy_submodule dlib "$_ml_kmeans_dlib_commit" ml/kmeans/dlib + copy_submodule dlib "$_ml_dlib_commit" ml/dlib copy_submodule mqtt_websockets "$_mqtt_websockets_commit" mqtt_websockets - copy_submodule MQTT-C "$_mqtt_c_commit" mqtt_websockets/MQTT-C + copy_submodule h2o "$_h2o_commit" web/server/h2o/libh2o copy_submodule c-rbuf "$_c_rbuf_commit" mqtt_websockets/c-rbuf + copy_submodule c_rhash "$_c_rhash_commit" mqtt_websockets/c_rhash + + default_prepare + autoreconf -i } build() { + CXXFLAGS="$CXXFLAGS -std=c++17" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -124,13 +129,15 @@ python() { } sha512sums=" -b2621d7c4fc69e30818e6a7712beb4e315ab4116f6b8316faa20beec1b69a8a94e9d97b9e5f6e2a80b9ac2fd97c95187a6ddbc0f9606b8c6c3b6f1b3e0995290 netdata-1.36.0.tar.gz -6871809e9268d35f138f1ae2b417cfeea6f4718f62a91ec6370524015126906c9f3d6a2f86dee30ce53fd2ddee4de8a3f1ff84d1afd6bc6007144705cf10d11e aclk-schemas-3252118bd547640251356629f0df05eaf952ac39.tar.gz -57b072ad502a37b45172f06b07af10431e491421ae8d8a196f7ddc577b362309aa9362374f99606fca2a2e354a44cf4461c7c6110369355d6c5d5ed031b893c2 json-0b345b20c888f7dc8888485768e4bf9a6be29de0.tar.gz +783d9de4ff108197c3b081c8945eae8f5faee5cb4c717f1bfa27e3c9efca517c60794960005ee332eb24c672389f87ed4084348f7f5deec8a067bc25ad8e7ab0 netdata-1.44.3.tar.gz +9687ede999002e73563c118fb604cbf8957670f8fac8f7c51d637c1518c00c1919e3b66bf055f152cda766695fc625a751db19a91174f487c0cc2752d47afb52 aclk-schemas-83c661c0dcddb9526814ebbd0668fbc3e281f03f.tar.gz 814e3ee5811b43349a218c2b6595e53c1daf5db2c9346b2ec0ff6475cc83b1803adad3f3210f51e219d6523fcf839543087b94eb18501ee144128fb169bd9c0b dlib-021cbbb1c2ddec39d8dd4cb6abfbbafdf1cf4482.tar.gz -4dcc90286f55f37cb7f9779220a85504ae568cc5d0e6d66b3f6705e85dd78fd47608367dacc618524c8a4686ea541e01aab17ef4fdd3f27dd51e3c76f9c981c0 mqtt_websockets-0ccbce11b82fd5cfc6c9b6f0ec4228c8717813cd.tar.gz -c12dda7d88318f44a2ababe68bf7b4922782d2eae68bf27e9fd4f06c0fc4e906c06b621c773f0405800e43a2475d8bc7d446eb7b534e7553830751b024988559 mqtt-c-dd7a92e60bbc70fbe01c80f29b3c3256cb0653a3.tar.gz -a9cfe426b0a9976eedd457423488a8ad2755993334624ca108d59939628f081b10b22c6714c45765918d8b7263db50616f749344e19aec0de881ba8fff78d7c0 c-rbuf-49981420edf53f7465e239c9fbf927921d357a5c.tar.gz +26dc950804887982fe4472a6c5ce78e36ec89b75fb5e94a8ad9eac3abb7558e2e151cd10652e159910af78da13de054011f266a4cec22becb6f488154ee5737b mqtt_websockets-6664789ccf57c95451638364f544d1679efd910e.tar.gz +f494a2bf75fe7a6c97bf64ae8d2a4eabe6bcc5c1a4a038cb27c23b478a65a543f9c2dcc8223b0e05ebe2ee811baa06876d13d5abb344c1bc51bdf5e3e8d3a75b h2o-094a6f90f76eeb280a430200cba47bde39b0b8e8.tar.gz +c65c3c72c60654ef575f485b45c0389198a91b307f39ce984baa4d2fc519c62d645fd226f076b2ec059a97599be8892a8270ffb57bba575c0390181244aff228 c-rbuf-51485be511f8c1d592b699f09f7c783aa2270375.tar.gz +2082de803895a1499006e683f3173205b5033c9f788f1d5a5944463c1da5bc8d8661a187e7a0ec23f9f0e0251557741f72d54a7732a3ad010930e16fa04a0853 c_rhash-f6c21836b921535ab818c7f72b77346d25f60d8e.tar.gz +39cc473fbfff28862a9c3dbbfe59005c57ccee6664bb328924c2124a8f1faeb5e6247a6405a7e498c01a975e826582c28e66b7dd4552b8923ded446bf42609cd cxx17-2.patch +cfe712c6038f483fd276633330bb0cfc92c2779585e1855295da0d54e7f380d4a201a8bd25b939b69df65a8fe5a1dfa6debbcd9f4e8ca88c1caad3869fcc55a0 protobuf-23.patch 89d5e31a9ff05678bd42b79777069137bb7cb140079fb3c8a8ca52ffdcad0f800eef7a458c065a2ef10fbdd01e96ce5321b59a3d57a7528aa874a49d5a88a8b8 netdata.initd 990ea3f485d9d5ffda50e5f6169704a209d51d18a5d75f97de742b8539c764745f9f59489007d5d1091cdf9f25e8e46519c32fc43cfe527fe2fc8426b0344612 netdata.confd " |