From bf922d8080e5c30203076865ecd996c56c524b13 Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Sun, 24 Nov 2024 19:51:17 +0000 Subject: [PATCH 01/10] apache-arrow/18.1.0 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- apache-arrow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-arrow.yaml b/apache-arrow.yaml index 4e805dd65cd..52f506678bb 100644 --- a/apache-arrow.yaml +++ b/apache-arrow.yaml @@ -1,6 +1,6 @@ package: name: apache-arrow - version: 18.0.0 + version: 18.1.0 epoch: 0 description: "multi-language toolbox for accelerated data interchange and in-memory processing" copyright: @@ -74,7 +74,7 @@ pipeline: with: repository: https://github.com/apache/arrow tag: apache-arrow-${{package.version}} - expected-commit: 9105a4109a80a1c01eabb24ee4b9f7c94ee942cb + expected-commit: 6a0414bd9a91e890ec6a45369bf61f405180628c - working-directory: /home/build/apache-arrow/cpp uses: cmake/configure From 9fb5b4662b3feb4546e022364a95650017d3d218 Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:51:37 +0000 Subject: [PATCH 02/10] opentelemetry-cpp/1.18.0 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- opentelemetry-cpp.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opentelemetry-cpp.yaml b/opentelemetry-cpp.yaml index 0181e8f4c3c..1fc2ad75602 100644 --- a/opentelemetry-cpp.yaml +++ b/opentelemetry-cpp.yaml @@ -1,7 +1,7 @@ package: name: opentelemetry-cpp - version: 1.17.0 - epoch: 2 + version: 1.18.0 + epoch: 0 description: The OpenTelemetry C++ Client copyright: - license: Apache-2.0 @@ -32,7 +32,7 @@ pipeline: with: repository: https://github.com/open-telemetry/opentelemetry-cpp tag: v${{package.version}} - expected-commit: fa0a5200ddbe9ae6f487a228e658aedc102dab56 + expected-commit: 955a807c0461544560429c2414b8967f6023e590 - uses: cmake/configure with: From 6f3ce3245dbe38d08dc606e901ed2cf2019056ad Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:50:52 +0000 Subject: [PATCH 03/10] protobuf/3.28.3 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- protobuf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protobuf.yaml b/protobuf.yaml index b9653c644c7..a3b3c055f4f 100644 --- a/protobuf.yaml +++ b/protobuf.yaml @@ -1,7 +1,7 @@ package: name: protobuf - version: 3.27.4 - epoch: 1 + version: 3.28.3 + epoch: 0 description: Library for extensible, efficient structure packing copyright: - license: BSD-3-Clause @@ -34,7 +34,7 @@ pipeline: with: repository: https://github.com/protocolbuffers/protobuf tag: v${{package.version}} - expected-commit: 80d48ae92d3007caac5eab0a8f8ee4e57f3a921e + expected-commit: 5fda5abda3dee5f7a102c85860594bff8d8610bd - runs: | cd third_party From ff9fda8f8a8667b693297845a10321f3970421f1 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Wed, 20 Nov 2024 18:17:02 -0700 Subject: [PATCH 04/10] protobuf: Disable use of openssf-compiler-options See #34075 Signed-off-by: dann frazier --- protobuf.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/protobuf.yaml b/protobuf.yaml index a3b3c055f4f..8e55cb70f66 100644 --- a/protobuf.yaml +++ b/protobuf.yaml @@ -28,6 +28,9 @@ environment: - libtool - samurai - zlib-dev + environment: + # https://github.com/wolfi-dev/os/issues/34075 + GCC_SPEC_FILE: /dev/null pipeline: - uses: git-checkout From 351ec396b78d95d01b69a9b258534202376e4435 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Thu, 21 Nov 2024 16:06:04 -0700 Subject: [PATCH 05/10] protobuf: Drop hardcoded binary version suffix to future-proof Signed-off-by: dann frazier --- protobuf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf.yaml b/protobuf.yaml index 8e55cb70f66..485d84ea14f 100644 --- a/protobuf.yaml +++ b/protobuf.yaml @@ -83,8 +83,8 @@ subpackages: - name: Verify protoc installation runs: | protoc --version || exit 1 - protoc-27.4.0 --version - protoc-27.4.0 --help + protoc-${{vars.mangled-package-version}}.0 --version + protoc-${{vars.mangled-package-version}}.0 --help - name: Compile sample proto file runs: | echo 'syntax = "proto3"; message Test { string name = 1; }' > test.proto From d8c3e814de538fe8c66d4ba80ee8f991f9b7694d Mon Sep 17 00:00:00 2001 From: dann frazier Date: Thu, 21 Nov 2024 16:08:21 -0700 Subject: [PATCH 06/10] protobuf: Cherry-pick so-versioning support for libutf8_validity and ship it This will fix the following CI failures: 2024/11/21 01:23:56 INFO running step "Verify protoc installation" 2242 2024/11/21 01:23:56 WARN + '[' -d /home/build ] name="Verify protoc installation" 2243 2024/11/21 01:23:56 WARN + cd /home/build name="Verify protoc installation" 2244 2024/11/21 01:23:56 WARN + protoc --version name="Verify protoc installation" 2245 2024/11/21 01:23:56 WARN protoc: error while loading shared libraries: libutf8_validity.so: cannot open shared object file: No such file or directory name="Verify protoc installation" 2246 2024/11/21 01:23:56 WARN + exit 1 name="Verify protoc installation" This upstream version builds these .so files unversioned. I don't like shipping unversioned .so files - but luckily upstream has addressed that and we can cherry-pick it back. Signed-off-by: dann frazier --- protobuf.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/protobuf.yaml b/protobuf.yaml index 485d84ea14f..003deedea46 100644 --- a/protobuf.yaml +++ b/protobuf.yaml @@ -38,6 +38,8 @@ pipeline: repository: https://github.com/protocolbuffers/protobuf tag: v${{package.version}} expected-commit: 5fda5abda3dee5f7a102c85860594bff8d8610bd + cherry-picks: | + main/ced605d0e6a7ad20985375b596b2ca6720e07737: utf8_range: add version marker to library - runs: | cd third_party @@ -96,6 +98,7 @@ subpackages: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib mv ${{targets.destdir}}/usr/lib/libprotoc*.so.* ${{targets.subpkgdir}}/usr/lib/ + mv ${{targets.destdir}}/usr/lib/libutf8_validity*.so.* ${{targets.subpkgdir}}/usr/lib/ - name: libprotobuf description: Runtime library for C++ users of protocol buffers From 0972176987e6296e59141317b527024e948a8ded Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 26 Nov 2024 15:05:48 +0000 Subject: [PATCH 07/10] grpc-1.66: Avoid FTBFS by disabling openssf-compiler-options (#34569) Until `abseil-cpp-compiler-options` is available (which is blocked by a melange/apko issue), let's disable openssf-compiler-options to unblock building this package. Related: https://github.com/wolfi-dev/os/issues/34568 Signed-off-by: dann frazier --- grpc-1.66.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/grpc-1.66.yaml b/grpc-1.66.yaml index c305e4a7831..21f0b920ab2 100644 --- a/grpc-1.66.yaml +++ b/grpc-1.66.yaml @@ -51,6 +51,9 @@ environment: - xxhash-dev - yaml-dev - zlib-dev + environment: + # https://github.com/wolfi-dev/os/issues/34568 + GCC_SPEC_FILE: /dev/null pipeline: - uses: git-checkout From 372e8f095eb3463e469e8c8e7c36a735b52030cf Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 26 Nov 2024 15:08:52 +0000 Subject: [PATCH 08/10] protobuf-c: Avoid FTBFS by disabling openssf-compiler-options (#34569) Until `abseil-cpp-compiler-options` is available (which is blocked by a melange/apko issue), let's disable openssf-compiler-options to unblock building this package. Related: https://github.com/wolfi-dev/os/issues/34568 Signed-off-by: dann frazier --- protobuf-c.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/protobuf-c.yaml b/protobuf-c.yaml index 403c4f858a8..e3e322101bf 100644 --- a/protobuf-c.yaml +++ b/protobuf-c.yaml @@ -17,6 +17,9 @@ environment: - ca-certificates-bundle - libtool - protobuf-dev + environment: + # https://github.com/wolfi-dev/os/issues/34075 + GCC_SPEC_FILE: /dev/null pipeline: - uses: git-checkout From c29e7259c80d13acf7c8de36cc2e6f7ce13f640a Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 26 Nov 2024 15:30:42 +0000 Subject: [PATCH 09/10] wolfictl bumps for protobuf lib rdeps As determined by the ABI Compatibility check job. Signed-off-by: dann frazier --- apache-arrow.yaml | 2 +- falco.yaml | 2 +- grpc-1.66.yaml | 2 +- grpc-1.67.yaml | 2 +- libpulsar.yaml | 2 +- opentelemetry-cpp.yaml | 2 +- opentelemetry-plugin-nginx.yaml | 2 +- percona-xtrabackup-8.4.yaml | 2 +- protobuf-c.yaml | 2 +- py3-onnx.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apache-arrow.yaml b/apache-arrow.yaml index 4e805dd65cd..4dcb7fcbd16 100644 --- a/apache-arrow.yaml +++ b/apache-arrow.yaml @@ -1,7 +1,7 @@ package: name: apache-arrow version: 18.0.0 - epoch: 0 + epoch: 1 description: "multi-language toolbox for accelerated data interchange and in-memory processing" copyright: - license: Apache-2.0 diff --git a/falco.yaml b/falco.yaml index f7718f6b027..77b75ea34d7 100644 --- a/falco.yaml +++ b/falco.yaml @@ -1,7 +1,7 @@ package: name: falco version: 0.39.2 # on update check if we can remove the 'Patch falcosecurity-libs' pipeline below if https://github.com/falcosecurity/libs/pull/2079 is merged - epoch: 0 + epoch: 1 description: Cloud Native Runtime Security copyright: - license: Apache-2.0 diff --git a/grpc-1.66.yaml b/grpc-1.66.yaml index 21f0b920ab2..b91d819ed78 100644 --- a/grpc-1.66.yaml +++ b/grpc-1.66.yaml @@ -1,7 +1,7 @@ package: name: grpc-1.66 version: 1.66.2 - epoch: 0 + epoch: 1 description: The C based gRPC copyright: - license: Apache-2.0 AND BSD-3-Clause AND MIT diff --git a/grpc-1.67.yaml b/grpc-1.67.yaml index f7fe1a2bfc6..85c8cbdf562 100644 --- a/grpc-1.67.yaml +++ b/grpc-1.67.yaml @@ -1,7 +1,7 @@ package: name: grpc-1.67 version: 1.67.1 - epoch: 1 + epoch: 2 description: The C based gRPC copyright: - license: Apache-2.0 AND BSD-3-Clause AND MIT diff --git a/libpulsar.yaml b/libpulsar.yaml index f8e4c4d7520..c11b9f4aa12 100644 --- a/libpulsar.yaml +++ b/libpulsar.yaml @@ -1,7 +1,7 @@ package: name: libpulsar version: 3.6.0 - epoch: 1 + epoch: 2 description: Optimizer and compiler/toolchain library for WebAssembly copyright: - license: Apache-2.0 diff --git a/opentelemetry-cpp.yaml b/opentelemetry-cpp.yaml index 0181e8f4c3c..079bb2530e2 100644 --- a/opentelemetry-cpp.yaml +++ b/opentelemetry-cpp.yaml @@ -1,7 +1,7 @@ package: name: opentelemetry-cpp version: 1.17.0 - epoch: 2 + epoch: 3 description: The OpenTelemetry C++ Client copyright: - license: Apache-2.0 diff --git a/opentelemetry-plugin-nginx.yaml b/opentelemetry-plugin-nginx.yaml index d105fa9295d..35bafabf8aa 100644 --- a/opentelemetry-plugin-nginx.yaml +++ b/opentelemetry-plugin-nginx.yaml @@ -2,7 +2,7 @@ package: name: opentelemetry-plugin-nginx version: 0_git20241125 - epoch: 0 + epoch: 1 description: Adds OpenTelemetry distributed tracing support to nginx. This is the otel community plugin for nginx, not the official nginx plugin for otel. copyright: - license: Apache-2.0 diff --git a/percona-xtrabackup-8.4.yaml b/percona-xtrabackup-8.4.yaml index 7c2c2784665..9260df46083 100644 --- a/percona-xtrabackup-8.4.yaml +++ b/percona-xtrabackup-8.4.yaml @@ -1,7 +1,7 @@ package: name: percona-xtrabackup-8.4 version: 8.4.0.1 - epoch: 1 + epoch: 2 description: Open source hot backup tool for InnoDB and XtraDB databases copyright: - license: Apache-2.0 diff --git a/protobuf-c.yaml b/protobuf-c.yaml index e3e322101bf..78dd1fed2e8 100644 --- a/protobuf-c.yaml +++ b/protobuf-c.yaml @@ -1,7 +1,7 @@ package: name: protobuf-c version: 1.5.0 - epoch: 9 + epoch: 10 description: Protocol Buffers implementation in C copyright: - license: BSD-2-Clause diff --git a/py3-onnx.yaml b/py3-onnx.yaml index d130d13999b..b750340ebd0 100644 --- a/py3-onnx.yaml +++ b/py3-onnx.yaml @@ -1,7 +1,7 @@ package: name: py3-onnx version: 1.17.0 - epoch: 1 + epoch: 2 description: Open Neural Network Exchange copyright: - license: Apache-2.0 From 875358a864c42dd3346196f9f4592990129ff355 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 26 Nov 2024 08:42:47 -0700 Subject: [PATCH 10/10] opentelemetry-plugin-nginx: bump snapshot version instead of epoch Signed-off-by: dann frazier --- opentelemetry-plugin-nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-plugin-nginx.yaml b/opentelemetry-plugin-nginx.yaml index 35bafabf8aa..27ba5740a73 100644 --- a/opentelemetry-plugin-nginx.yaml +++ b/opentelemetry-plugin-nginx.yaml @@ -1,8 +1,8 @@ #nolint:valid-pipeline-git-checkout-tag package: name: opentelemetry-plugin-nginx - version: 0_git20241125 - epoch: 1 + version: 0_git20241126 + epoch: 0 description: Adds OpenTelemetry distributed tracing support to nginx. This is the otel community plugin for nginx, not the official nginx plugin for otel. copyright: - license: Apache-2.0