diff options
| author | Shulhan <ms@kilabit.info> | 2024-08-24 14:27:01 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2024-08-24 14:27:01 +0700 |
| commit | 6c724ab4efcdcb6bdbecf03980546f0c9c5fe814 (patch) | |
| tree | 2e88c606d8914fbb00d2fd3769f5786d6283af8f | |
| parent | 8fe614a0877973d85c7c5d6c444901b34592b0f4 (diff) | |
| download | google-cloud-ops-agent-git-6c724ab4efcdcb6bdbecf03980546f0c9c5fe814.tar.xz | |
all: remove previous patch to fix openssl in fluent-bit
The latest source on fluent-bit already applied the patch to fix the
issue.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | fluent-bit-8901-fix-gcc-14.1.patch | 56 |
3 files changed, 2 insertions, 64 deletions
@@ -1,6 +1,6 @@ pkgbase = google-cloud-ops-agent-git pkgdesc = Ops Agents that are part of the Google Cloud Operations product suite (specifically Cloud Logging and Cloud Monitoring) - pkgver = 2.48.0.r5.g4b3b7496c + pkgver = 2.50.0.r4.g3c3db61cd pkgrel = 1 url = https://github.com/GoogleCloudPlatform/ops-agent arch = x86_64 @@ -23,12 +23,10 @@ pkgbase = google-cloud-ops-agent-git source = opentelemetry-operations-collector::git+https://github.com/GoogleCloudPlatform/opentelemetry-operations-collector.git source = opentelemetry-java-contrib::git+https://github.com/open-telemetry/opentelemetry-java-contrib.git source = 0001-build-sh.patch - source = fluent-bit-8901-fix-gcc-14.1.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98 - sha256sums = 8f986cebd9e22b57445fd533389b56d73eb0006a6a292c69d8b52e9f2b6ed7d2 pkgname = google-cloud-ops-agent-git @@ -1,7 +1,7 @@ # Maintainer: shulhan <ms@kilabit.info> pkgname=google-cloud-ops-agent-git -pkgver=2.48.0.r5.g4b3b7496c +pkgver=2.50.0.r4.g3c3db61cd pkgrel=1 pkgdesc="Ops Agents that are part of the Google Cloud Operations product suite (specifically Cloud Logging and Cloud Monitoring)" @@ -37,7 +37,6 @@ source=( "opentelemetry-operations-collector::git+https://github.com/GoogleCloudPlatform/opentelemetry-operations-collector.git" "opentelemetry-java-contrib::git+https://github.com/open-telemetry/opentelemetry-java-contrib.git" "0001-build-sh.patch" - "fluent-bit-8901-fix-gcc-14.1.patch" ) sha256sums=( 'SKIP' @@ -45,7 +44,6 @@ sha256sums=( 'SKIP' 'SKIP' 'ba66d01b8058644597d9b406d3b8ce7ed40aed77c7358f2b97ff0e262a4cbb98' - '8f986cebd9e22b57445fd533389b56d73eb0006a6a292c69d8b52e9f2b6ed7d2' ) pkgver() { @@ -75,8 +73,6 @@ build() { echo "--- Applying patches ..." cd "${pkgname}" git apply "${srcdir}/0001-build-sh.patch" - ## See: https://github.com/fluent/fluent-bit/issues/8858 - git apply --directory=submodules/fluent-bit "${srcdir}/fluent-bit-8901-fix-gcc-14.1.patch" echo "--- Building otel ..." CGO_ENABLED=1 ./builds/otel.sh "$_destdir" diff --git a/fluent-bit-8901-fix-gcc-14.1.patch b/fluent-bit-8901-fix-gcc-14.1.patch deleted file mode 100644 index 0dbfbd0..0000000 --- a/fluent-bit-8901-fix-gcc-14.1.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 33690ee3fd6ad97f3f1917a1a91bd4c4f1f235d6 Mon Sep 17 00:00:00 2001 -From: javex <florian.ruechel@inexplicity.de> -Date: Fri, 31 May 2024 21:25:38 +0930 -Subject: [PATCH 1/2] tls: Type cast explicitly for OpenSSL - -With the release of GCC 14.1, some previous warnings are now errors, -including the SSL_select_next_proto call in -tls_context_server_alpn_select_callback. To fix the build, add -explicitly type cast. - -Signed-off-by: javex <florian.ruechel@inexplicity.de> ---- - src/tls/openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tls/openssl.c b/src/tls/openssl.c -index 14b77e09c6a..03aeb9610b7 100644 ---- a/src/tls/openssl.c -+++ b/src/tls/openssl.c -@@ -217,7 +217,7 @@ static int tls_context_server_alpn_select_callback(SSL *ssl, - result = SSL_TLSEXT_ERR_NOACK; - - if (ctx->alpn != NULL) { -- result = SSL_select_next_proto(out, -+ result = SSL_select_next_proto((unsigned char **) out, - outlen, - &ctx->alpn[1], - (unsigned int) ctx->alpn[0], - -From 944bb0ce680c6f92c20fddfb7442a19e4cfe0a36 Mon Sep 17 00:00:00 2001 -From: javex <florian.ruechel@inexplicity.de> -Date: Fri, 31 May 2024 21:27:57 +0930 -Subject: [PATCH 2/2] in_kubernetes_events: Type cast explicitly - -With the release of GCC 14.1, some previous warnings are now errors, -including the check_event_is_filtered call in -process_events. To fix the build, add explicitly type cast. - -Signed-off-by: javex <florian.ruechel@inexplicity.de> ---- - plugins/in_kubernetes_events/kubernetes_events.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/in_kubernetes_events/kubernetes_events.c b/plugins/in_kubernetes_events/kubernetes_events.c -index 6231becb0ad..22a69b65af4 100644 ---- a/plugins/in_kubernetes_events/kubernetes_events.c -+++ b/plugins/in_kubernetes_events/kubernetes_events.c -@@ -487,7 +487,7 @@ static int process_events(struct k8s_events *ctx, char *in_data, size_t in_size, - goto msg_error; - } - -- if (check_event_is_filtered(ctx, item, &ts) == FLB_TRUE) { -+ if (check_event_is_filtered(ctx, item, (time_t *) &ts) == FLB_TRUE) { - continue; - } - |