From e52824493cc828e3014fe39565ecb99e0b9a385e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:24:01 +0200 Subject: [PATCH 01/35] abseil-cpp: update to 20230125.3. --- common/shlibs | 128 ++++++++++++------ srcpkgs/abseil-cpp/patches/google-sucks.patch | 77 ----------- srcpkgs/abseil-cpp/template | 4 +- 3 files changed, 85 insertions(+), 124 deletions(-) delete mode 100644 srcpkgs/abseil-cpp/patches/google-sucks.patch diff --git a/common/shlibs b/common/shlibs index 4b2122d1b199..d1e779f4e7cb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4207,51 +4207,89 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1 libtpm2-totp.so.0 libtpm2-totp-0.3.0_1 libmujs.so.1.2.0 mujs-1.2.0_2 libiir.so.1 libiir1-1.9.3_1 -libabsl_statusor.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_hash.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_raw_hash_set.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_bad_variant_access.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_status.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_pool_urbg.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen_hwaes_impl.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen_slow.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cord.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_city.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_bad_optional_access.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cordz_info.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_str_format_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_synchronization.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_time.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_base.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_civil_time.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cord_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cordz_functions.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_cordz_handle.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_debugging_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_demangle_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_exponential_biased.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_graphcycles_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_hashtablez_sampler.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_int128.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_log_severity.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_low_level_hash.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_malloc_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_distributions.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_platform.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_randen_hwaes.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_internal_seed_material.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_seed_gen_exception.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_random_seed_sequences.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_raw_logging_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_stacktrace.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_strerror.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_strings_internal.so.2206.0.0 abseil-cpp-20220623.1_1 -libabsl_symbolize.so.2206.0.0 abseil-cpp-20220623.1_1 +libabsl_flags.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_raw_logging_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_parse.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_reflection.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_globals.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_config.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_seed_sequences.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_statusor.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_usage_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_commandlineflag.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen_hwaes_impl.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_status.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_bad_any_cast_impl.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_bad_variant_access.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_raw_hash_set.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_bad_optional_access.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cord.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_distribution_test_util.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_handle.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_graphcycles_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_spinlock_wait.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_functions.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_usage.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_debugging_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_strerror.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_seed_material.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_log_sink_set.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_proto.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_civil_time.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_conditions.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc_cpu_detect.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_entry.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_distributions.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_globals.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_format.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_exponential_biased.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_city.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_symbolize.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_leak_check.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_low_level_hash.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_severity.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_scoped_set_env.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_strings.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_die_if_null.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_hash.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_commandlineflag_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_periodic_sampler.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_platform.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_malloc_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_sample_token.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_str_format_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_synchronization.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_message.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_strings_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_private_handle_accessor.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cord_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen_hwaes.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_throw_delegate.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc_cord_state.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_flags.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_program_name.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_time_zone.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_examine_stack.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_crc32c.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_initialize.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_failure_signal_handler.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_time.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_cordz_info.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_sink.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_nullguard.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_demangle_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_internal.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_base.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_hashtablez_sampler.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_flags_marshalling.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_pool_urbg.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_int128.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_stacktrace.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_seed_gen_exception.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_log_internal_check_op.so.2301.0.0 abseil-cpp-20230125.3_1 +libabsl_random_internal_randen_slow.so.2301.0.0 abseil-cpp-20230125.3_1 libairspyhf.so.0 libairspyhf-1.6.8_1 libtraceevent.so.1 libtraceevent-1.6.2_1 libtracefs.so.1 libtracefs-1.4.2_1 diff --git a/srcpkgs/abseil-cpp/patches/google-sucks.patch b/srcpkgs/abseil-cpp/patches/google-sucks.patch deleted file mode 100644 index 511bae847101..000000000000 --- a/srcpkgs/abseil-cpp/patches/google-sucks.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 1fbfea71fb42b2e79f9e342c1843bd26a8703536 -Author: Daniel Kolesa -Date: Thu Aug 25 01:20:58 2022 +0200 - - An all-in-one patch that fixes several issues: - - 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) - 2) powerpc stacktrace implementation only works on glibc (disabled on musl) - 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) - 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) - -diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc -index b1c396c..d62bfd6 100644 ---- a/absl/base/internal/unscaledcycleclock.cc -+++ b/absl/base/internal/unscaledcycleclock.cc -@@ -20,7 +20,7 @@ - #include - #endif - --#if defined(__powerpc__) || defined(__ppc__) -+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - #ifdef __GLIBC__ - #include - #elif defined(__FreeBSD__) -@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { - return base_internal::NominalCPUFrequency(); - } - --#elif defined(__powerpc__) || defined(__ppc__) -+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - - int64_t UnscaledCycleClock::Now() { - #ifdef __GLIBC__ -diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h -index 2cbeae3..83d8c98 100644 ---- a/absl/base/internal/unscaledcycleclock.h -+++ b/absl/base/internal/unscaledcycleclock.h -@@ -46,8 +46,8 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ -- defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -+ defined(__riscv) || defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0 -diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc -index 5bdd341..a42a3c4 100644 ---- a/absl/debugging/internal/examine_stack.cc -+++ b/absl/debugging/internal/examine_stack.cc -@@ -174,8 +174,10 @@ void* GetProgramCounter(void* const vuc) { - return reinterpret_cast(context->uc_mcontext.pc); - #elif defined(__powerpc64__) - return reinterpret_cast(context->uc_mcontext.gp_regs[32]); --#elif defined(__powerpc__) -+#elif defined(__powerpc__) && defined(__GLIBC__) - return reinterpret_cast(context->uc_mcontext.uc_regs->gregs[32]); -+#elif defined(__powerpc__) -+ return reinterpret_cast(context->uc_mcontext.gregs[32]); - #elif defined(__riscv) - return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); - #elif defined(__s390__) && !defined(__s390x__) -diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h -index 3929b1b..23d5e50 100644 ---- a/absl/debugging/internal/stacktrace_config.h -+++ b/absl/debugging/internal/stacktrace_config.h -@@ -60,7 +60,7 @@ - #elif defined(__i386__) || defined(__x86_64__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_x86-inl.inc" --#elif defined(__ppc__) || defined(__PPC__) -+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) - #define ABSL_STACKTRACE_INL_HEADER \ - "absl/debugging/internal/stacktrace_powerpc-inl.inc" - #elif defined(__aarch64__) diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template index 8640d2489406..3ffdb4d99d33 100644 --- a/srcpkgs/abseil-cpp/template +++ b/srcpkgs/abseil-cpp/template @@ -1,6 +1,6 @@ # Template file for 'abseil-cpp' pkgname=abseil-cpp -version=20220623.1 +version=20230125.3 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON" @@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://abseil.io" distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz" -checksum=91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 +checksum=5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36 abseil-cpp-devel_package() { short_desc+=" (development files)" From 070c94ef46fae72a215611c0cd5091aa6c2d0a06 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:29:59 +0200 Subject: [PATCH 02/35] Bear: rebuild against abseil-cpp-20230125.3_1 --- srcpkgs/Bear/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index cebf51b64728..2e6da3ba9a30 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,7 +1,7 @@ # Template file for 'Bear' pkgname=Bear version=3.1.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config protobuf protobuf-devel grpc" makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel" From f0d5fbd24e91caa8ec80f5a00395997f90c055b4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:29:59 +0200 Subject: [PATCH 03/35] grpc: rebuild against abseil-cpp-20230125.3_1 --- srcpkgs/grpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 5b4547a5c0fc..f9d197a1c354 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.49.1 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package From 5135b2469b605af7a30f54f996ae79342c0a0083 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:29:59 +0200 Subject: [PATCH 04/35] justbuild: rebuild against abseil-cpp-20230125.3_1 --- srcpkgs/justbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index 1ad8e334617d..ee36f6dae575 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,7 +1,7 @@ # Template file for 'justbuild' pkgname=justbuild version=1.1.2 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget" makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++ From 83d0bcb86fc591094cb8f322b15d25d0f1bb7c09 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:29:59 +0200 Subject: [PATCH 05/35] python3-grpcio: rebuild against abseil-cpp-20230125.3_1 --- srcpkgs/python3-grpcio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index 826eda0fc560..9b3c7288a9dd 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -1,7 +1,7 @@ # Template file for 'python3-grpcio' pkgname=python3-grpcio version=1.49.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-six python3-Cython" makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel From e70416672cfbac20254e87e4cdcfdaf0f971d171 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 21:29:59 +0200 Subject: [PATCH 06/35] sysdig: rebuild against abseil-cpp-20230125.3_1 --- srcpkgs/sysdig/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 81ddb7aba5e3..4a04e762468c 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.28.0 -revision=7 +revision=8 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF @@ -36,7 +36,8 @@ CXXFLAGS="-Wno-deprecated-declarations" CXXFLAGS+=" -I/usr/include/grpc_absl" post_extract() { - sed -i 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' scripts/CMakeLists.txt + vsed -e 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' -i scripts/CMakeLists.txt + vsed -e 's|-std=c++0x||' -i CMakeLists.txt } post_install() { From 800ca7d5875ce0ad81cf9da4910ea2016a37e737 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 22:01:12 +0200 Subject: [PATCH 07/35] python3-grpcio: update to 1.56.0. --- srcpkgs/python3-grpcio/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index 9b3c7288a9dd..25ea3fc34620 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -1,7 +1,7 @@ # Template file for 'python3-grpcio' pkgname=python3-grpcio -version=1.49.1 -revision=4 +version=1.56.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-six python3-Cython" makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel @@ -12,7 +12,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" -checksum=d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f +checksum=4c08ee21b3d10315b8dc26f6c13917b20ed574cdbed2d2d80c53d5508fdcc0f2 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -29,5 +29,7 @@ export GRPC_PYTHON_BUILD_SYSTEM_RE2=1 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 post_extract() { + # abseil-cpp 2023xxxxxx requires at least c++ 17 + vsed -e 's/c++14/c++17/g' -i setup.py rm src/python/grpcio/grpc/_cython/cygrpc.cpp } From c76a291deda8265fcaaf4d12f30dcde98f0ab156 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 26 Jun 2023 22:01:47 +0200 Subject: [PATCH 08/35] grpc: update to 1.56.0. --- common/shlibs | 24 +++++++++---------- srcpkgs/grpc/patches/cmake.patch | 20 ++++++++++++++++ .../grpc/patches/revert-find-protobuf.patch | 23 ++++++++++++++++++ srcpkgs/grpc/template | 15 ++++++------ 4 files changed, 63 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/grpc/patches/cmake.patch create mode 100644 srcpkgs/grpc/patches/revert-find-protobuf.patch diff --git a/common/shlibs b/common/shlibs index d1e779f4e7cb..5adfa4d6e69f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3683,18 +3683,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1 libaal-1.0.so.7 libaal-1.0.7_1 libaal-minimal.so.0 libaal-1.0.7_1 libcli.so.1.9 libcli-1.9.8.4_1 -libaddress_sorting.so.27 libgrpc-1.49.1_1 -libgpr.so.27 libgrpc-1.49.1_1 -libgrpc.so.27 libgrpc-1.49.1_1 -libgrpc_unsecure.so.27 libgrpc-1.49.1_1 -libupb.so.27 libgrpc-1.49.1_1 -libgrpc++.so.1.49 libgrpc-1.49.1_1 -libgrpc++_alts.so.1.49 libgrpc-1.49.1_1 -libgrpc++_error_details.so.1.49 libgrpc-1.49.1_1 -libgrpc++_reflection.so.1.49 libgrpc-1.49.1_1 -libgrpc++_unsecure.so.1.49 libgrpc-1.49.1_1 -libgrpc_plugin_support.so.1.49 libgrpc-1.49.1_1 -libgrpcpp_channelz.so.1.49 libgrpc-1.49.1_1 +libaddress_sorting.so.33 libgrpc-1.56.0_1 +libgpr.so.33 libgrpc-1.56.0_1 +libgrpc.so.33 libgrpc-1.56.0_1 +libgrpc_unsecure.so.33 libgrpc-1.56.0_1 +libupb.so.33 libgrpc-1.56.0_1 +libgrpc++.so.1.56 libgrpc-1.56.0_1 +libgrpc++_alts.so.1.56 libgrpc-1.56.0_1 +libgrpc++_error_details.so.1.56 libgrpc-1.56.0_1 +libgrpc++_reflection.so.1.56 libgrpc-1.56.0_1 +libgrpc++_unsecure.so.1.56 libgrpc-1.56.0_1 +libgrpc_plugin_support.so.1.56 libgrpc-1.56.0_1 +libgrpcpp_channelz.so.1.56 libgrpc-1.56.0_1 libircclient.so.1 libircclient-1.10_5 libFAudio.so.0 FAudio-19.05_1 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1 diff --git a/srcpkgs/grpc/patches/cmake.patch b/srcpkgs/grpc/patches/cmake.patch new file mode 100644 index 000000000000..54d04e29837d --- /dev/null +++ b/srcpkgs/grpc/patches/cmake.patch @@ -0,0 +1,20 @@ +--- a/cmake/gRPCConfig.cmake.in 2023-06-14 22:21:16.000000000 +0200 ++++ - 2023-06-28 11:11:32.902678412 +0200 +@@ -1,5 +1,6 @@ + # Module path + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) ++include(CMakeFindDependencyMacro) + + # Depend packages + @_gRPC_FIND_ZLIB@ +--- a/CMakeLists.txt 2023-07-11 08:54:22.009027477 +0200 ++++ - 2023-07-11 08:54:38.950947984 +0200 +@@ -12375,6 +12375,8 @@ + ${_gRPC_ZLIB_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_plugin_support ++ absl::hash ++ absl::raw_hash_set + ) + + diff --git a/srcpkgs/grpc/patches/revert-find-protobuf.patch b/srcpkgs/grpc/patches/revert-find-protobuf.patch new file mode 100644 index 000000000000..6001f37c6b1b --- /dev/null +++ b/srcpkgs/grpc/patches/revert-find-protobuf.patch @@ -0,0 +1,23 @@ +Use the old cmake provided FindProtobuf() implementation for now. +A future cmake update will remove this module, but use it for now until +all packages are updated to the new system +--- +--- a/cmake/protobuf.cmake 2023-06-14 22:21:16.000000000 +0200 ++++ - 2023-07-10 21:05:41.114443796 +0200 +@@ -55,7 +55,7 @@ + set(gRPC_INSTALL FALSE) + endif() + elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package") +- find_package(Protobuf REQUIRED CONFIG) ++ find_package(Protobuf REQUIRED) + + if(Protobuf_FOUND OR PROTOBUF_FOUND) + if(TARGET protobuf::${_gRPC_PROTOBUF_LIBRARY_NAME}) +@@ -86,6 +86,6 @@ + set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE}) + endif() + endif() +- set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)") ++ set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf)") + endif() + endif() diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index f9d197a1c354..9c58c2509bee 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,14 +1,13 @@ # Template file for 'grpc' pkgname=grpc -version=1.49.1 -revision=3 +version=1.56.0 +revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package - -DgRPC_ABSL_PROVIDER=package -D_gRPC_RE2_LIBRARIES=-lre2 - -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" -hostmakedepends="which protobuf" + -DgRPC_ABSL_PROVIDER=package -DgRPC_RE2_PROVIDER=package" +hostmakedepends="protobuf pkg-config" _devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel abseil-cpp-devel" makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}" short_desc="High performance, open source, general RPC framework" @@ -16,11 +15,12 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/grpc/grpc" distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz" -checksum=5071b630e2a14707ad060636990f1b25b0984bd168c7ea1ab95e48a3bdc0081f +checksum=e034992a0b464042021f6d440f2090acc2422c103a322b0844e3921ccea981dc if [ "$CROSS_BUILD" ]; then # need host grpc_cpp_plugin hostmakedepends+=" grpc" + configure_args+=" -DProtobuf_PROTOC_EXECUTABLE=/usr/bin/protoc" fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then @@ -38,7 +38,8 @@ libgrpc_package() { grpc-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends} + protobuf-devel" pkg_install() { vmove usr/include vmove usr/lib/*.so From 8df7415731235e0c4c1b3e2b14ea5f53149d994e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 11:40:13 +0200 Subject: [PATCH 09/35] protobuf: update to 23.4. - switch to cmake buildstyle - grpc needs the .cmake files to find protobuf - newer version of protobuf will drop autoconf --- common/shlibs | 6 ++--- srcpkgs/protobuf/template | 46 ++++++++++++++------------------------- 2 files changed, 19 insertions(+), 33 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5adfa4d6e69f..3cd47fb4f486 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3115,9 +3115,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1 libm17n-gui.so.0 m17n-lib-1.7.0_1 libm17n-core.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1 -libprotobuf-lite.so.32 libprotobuf-lite-21.4_1 -libprotoc.so.32 libprotoc-21.4_1 -libprotobuf.so.32 libprotobuf-21.4_1 +libprotobuf-lite.so.23.4.0 libprotobuf-lite-23.4_1 +libprotoc.so.23.4.0 libprotoc-23.4_1 +libprotobuf.so.23.4.0 libprotobuf-23.4_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 libykclient.so.3 ykclient-2.15_1 diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 571f06487c85..91324a4da612 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,22 +1,22 @@ # Template file for 'protobuf' pkgname=protobuf -version=21.12 +version=23.4 revision=1 -create_wrksrc="yes" -build_wrksrc="${pkgname}-${version}" -build_style=gnu-configure -hostmakedepends="pkg-config automake libtool" -makedepends="zlib-devel" +build_style=cmake +hostmakedepends="pkg-config" +configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON + -Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package" +# XXX: Tests require that the abseil-cpp provides absl::scoped_mock_log +configure_args+=" -Dprotobuf_BUILD_TESTS=OFF" +makedepends="zlib-devel gtest-devel libatomic-devel + abseil-cpp-devel" short_desc="Protocol buffers compiler" maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://developers.google.com/protocol-buffers/" changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" -_googletest_commit="5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081" -distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz - https://github.com/google/googletest/archive/${_googletest_commit}.tar.gz" -checksum="22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de - 0e2f36e8e403c125fd0ab02171bdb786d3b6b3875b6ccf3b2eb7969be8faecd0" +distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" +checksum=a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971 # Switch to versioned package conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 @@ -26,24 +26,11 @@ replaces="${conflicts}" if [ "$CROSS_BUILD" ]; then # needs host protoc hostmakedepends+=" ${pkgname}" - configure_args+=" --with-protoc=/usr/bin/protoc" + configure_args+=" -Dprotobuf_PROTOC_EXE=/usr/bin/protoc" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" - LDFLAGS+=" -latomic" -fi - -post_extract() { - rmdir "${build_wrksrc}/third_party/googletest" - mv "googletest-${_googletest_commit}" "${build_wrksrc}/third_party/googletest" -} - -pre_configure() { - autoreconf -fi -} - post_install() { + rm -rf "${DESTDIR}/usr/lib/cmake" vlicense LICENSE } @@ -80,7 +67,6 @@ libprotoc-devel_package() { libprotoc26-devel>=0 libprotoc28-devel>=0" replaces="${conflicts}" pkg_install() { - vmove usr/lib/libprotoc.a vmove usr/lib/libprotoc.so vmove usr/include/google/protobuf/compiler } @@ -89,7 +75,8 @@ libprotoc-devel_package() { protobuf-devel_package() { depends="zlib-devel libprotobuf-${version}_${revision} - libprotobuf-lite-${version}_${revision}" + libprotobuf-lite-${version}_${revision} + abseil-cpp-devel" short_desc="Protocol buffers C++ library - development files" # Switch to versioned package conflicts="protobuf18-devel>=0 protobuf23-devel>=0 @@ -98,10 +85,9 @@ protobuf-devel_package() { replaces="${conflicts}" pkg_install() { vmove usr/include - vmove usr/lib/libprotobuf.a - vmove usr/lib/libprotobuf-lite.a vmove usr/lib/libprotobuf.so vmove usr/lib/libprotobuf-lite.so vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" } } From 9bccf6aee2e776be6b7e05a641821f5fec675a8f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 11:59:55 +0200 Subject: [PATCH 10/35] EternalTerminal: rebuild against protobuf-23.3_1 --- srcpkgs/EternalTerminal/patches/limits.patch | 10 ++++++++++ srcpkgs/EternalTerminal/template | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/EternalTerminal/patches/limits.patch diff --git a/srcpkgs/EternalTerminal/patches/limits.patch b/srcpkgs/EternalTerminal/patches/limits.patch new file mode 100644 index 000000000000..9226bd45001a --- /dev/null +++ b/srcpkgs/EternalTerminal/patches/limits.patch @@ -0,0 +1,10 @@ +--- a/EternalTerminal/external_imported/cxxopts/include/cxxopts.hpp 2022-05-05 17:20:44.000000000 +0200 ++++ - 2023-07-10 20:07:25.607948589 +0200 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #ifdef __cpp_lib_optional + #include diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index 1017a1b4a1ec..156eab6ce47e 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -1,7 +1,7 @@ # Template file for 'EternalTerminal' pkgname=EternalTerminal version=6.2.1 -revision=1 +revision=2 # revisions used for the specific versions of submodules. # they can be found in the external/ directory of the source code. _sanitizers_gitrev="99e159ec9bc8dd362b08d18436bd40ff0648417b" From 986df5b350313696ec57f400c5afac12cc4c9b55 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 11:59:55 +0200 Subject: [PATCH 11/35] vlc: rebuild against protobuf-23.3_1 --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 210762b0a7e2..651c94a1353a 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.18 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread From d0fed1c54435881af8c962c4c84cf617a7bfe5d6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 11:59:55 +0200 Subject: [PATCH 12/35] mixxx: rebuild against protobuf-23.3_1 --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 619ddca0d332..4b9ea00d3fb3 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.3.3 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=Release" hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel" From bdced854dc9e6c85ef36464d6b734bd8b96a6347 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 11:59:55 +0200 Subject: [PATCH 13/35] telegram-desktop: rebuild against protobuf-23.3_1 --- srcpkgs/telegram-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index f114b2341dc5..9db9f80c1a53 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=4.8.1 -revision=3 +revision=4 build_style=cmake build_helper="qemu" configure_args="-DTDESKTOP_API_ID=209235 From 1da68f2ac5c176c2a3edb23d58bcde0a218ea25a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:56 +0200 Subject: [PATCH 14/35] usbguard: rebuild against protobuf-23.3_1 --- srcpkgs/usbguard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index 8625c80a7eda..df4411202568 100644 --- a/srcpkgs/usbguard/template +++ b/srcpkgs/usbguard/template @@ -1,7 +1,7 @@ # Template file for 'usbguard' pkgname=usbguard version=1.1.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl" conf_files="/etc/usbguard/*" From 42aff316e19aa152a14aceeab691241350d13b07 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:57 +0200 Subject: [PATCH 15/35] nsjail: rebuild against protobuf-23.3_1 --- srcpkgs/nsjail/patches/cpp17.patch | 11 +++++++++ srcpkgs/nsjail/patches/kafel-bison.patch | 30 ------------------------ srcpkgs/nsjail/patches/ldflags.patch | 11 +++++++++ srcpkgs/nsjail/patches/log.patch | 24 +++++++++++++++++++ srcpkgs/nsjail/template | 13 +++++----- 5 files changed, 53 insertions(+), 36 deletions(-) create mode 100644 srcpkgs/nsjail/patches/cpp17.patch delete mode 100644 srcpkgs/nsjail/patches/kafel-bison.patch create mode 100644 srcpkgs/nsjail/patches/ldflags.patch create mode 100644 srcpkgs/nsjail/patches/log.patch diff --git a/srcpkgs/nsjail/patches/cpp17.patch b/srcpkgs/nsjail/patches/cpp17.patch new file mode 100644 index 000000000000..384ff7b51258 --- /dev/null +++ b/srcpkgs/nsjail/patches/cpp17.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2022-11-22 22:25:15.000000000 +0100 ++++ - 2023-07-08 16:35:16.308351723 +0200 +@@ -32,7 +32,7 @@ + -Ikafel/include + + CXXFLAGS += $(USER_DEFINES) $(COMMON_FLAGS) $(shell pkg-config --cflags protobuf) \ +- -std=c++14 -fno-exceptions -Wno-unused -Wno-unused-parameter ++ -std=c++17 -fno-exceptions -Wno-unused -Wno-unused-parameter + LDFLAGS += -pie -Wl,-z,noexecstack -lpthread $(shell pkg-config --libs protobuf) + + BIN = nsjail diff --git a/srcpkgs/nsjail/patches/kafel-bison.patch b/srcpkgs/nsjail/patches/kafel-bison.patch deleted file mode 100644 index 48eff0d36369..000000000000 --- a/srcpkgs/nsjail/patches/kafel-bison.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 32768d3cc8cecbc30d9020dbfa8d9ec541d057e4 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -Date: Wed, 17 Mar 2021 16:36:40 +0200 -Subject: [PATCH] Replace YYUSE call with void cast in src/parser.y - -The YYUSE macro was renamed to YY_USE in bison 3.7.5; we might as well -avoid using it altogether and cast the unused variable to void instead. - -Fixes the following linker error: - -/usr/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror': -arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE' ---- - src/parser.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git kafel/src/parser.y kafel/src/parser.y -index e0f109c..0e01373 100644 ---- a/kafel/src/parser.y -+++ b/kafel/src/parser.y -@@ -420,8 +420,8 @@ const_def - - void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner, - const char *msg) { -+ (void)scanner; /* suppress unused-parameter warning */ - if (!ctxt->lexical_error) { -- YYUSE(scanner); - if (loc->filename != NULL) { - append_error(ctxt, "%s:%d:%d: %s", loc->filename, loc->first_line, loc->first_column, msg); - } else { diff --git a/srcpkgs/nsjail/patches/ldflags.patch b/srcpkgs/nsjail/patches/ldflags.patch new file mode 100644 index 000000000000..c039ea09e237 --- /dev/null +++ b/srcpkgs/nsjail/patches/ldflags.patch @@ -0,0 +1,11 @@ +--- a/kafel/src/Makefile 2023-07-08 16:40:45.058218240 +0200 ++++ - 2023-07-08 16:54:04.459715051 +0200 +@@ -56,7 +56,7 @@ + $(CC) $(CFLAGS) -Wl,-soname,$@.${VERSION} -shared $^ -o $@ + + ${STATIC_TARGET}: ${OBJECTS} +- $(LD) $(LDFLAGS) -r ${OBJECTS} -o libkafel_r.o ++ $(LD) -r ${OBJECTS} -o libkafel_r.o + # Fix x86 PIC symbols + $(OBJDUMP) -t libkafel_r.o | grep '.hidden' | grep -v 'get_pc_thunk' | sed -e 's/^.*\.hidden //' > libkafel.localize_symbols + $(OBJCOPY) -w --localize-symbols=libkafel.localize_symbols libkafel_r.o libkafel.o diff --git a/srcpkgs/nsjail/patches/log.patch b/srcpkgs/nsjail/patches/log.patch new file mode 100644 index 000000000000..9e7f12368076 --- /dev/null +++ b/srcpkgs/nsjail/patches/log.patch @@ -0,0 +1,24 @@ +diff --git a/config.cc b/config.cc +index 5242ba4..bbb2b6d 100644 +--- a/config.cc ++++ b/config.cc +@@ -302,11 +302,6 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig& + return true; + } + +-static void LogHandler( +- google::protobuf::LogLevel level, const char* filename, int line, const std::string& message) { +- LOG_W("config.cc: '%s'", message.c_str()); +-} +- + bool parseFile(nsjconf_t* nsjconf, const char* file) { + LOG_D("Parsing configuration from '%s'", file); + +@@ -316,7 +311,6 @@ bool parseFile(nsjconf_t* nsjconf, const char* file) { + return false; + } + +- SetLogHandler(LogHandler); + google::protobuf::io::FileInputStream input(fd); + input.SetCloseOnDelete(true); + diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 346348fdf17b..5c5d0a508f38 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail -version=3.0 -revision=9 +version=3.3 +revision=1 create_wrksrc=yes build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf which" @@ -11,9 +11,9 @@ maintainer="Orphaned " license="Apache-2.0" homepage="http://nsjail.com" distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz - https://github.com/google/kafel/archive/8e69b8efae415cde3debffbb1e379d9e7a16835a.tar.gz" -checksum="cfa66d3ed136b2e221752287b95e544915e8a6760aa866f023b604d14a374919 - 4a6c9a1a70ed99bbed767adc106081b017a3090307ea88cc7e329b82daa1373b" + https://github.com/google/kafel/archive/1af0975af45ca4404f357b9a4e1636f53a01bfd3.tar.gz" +checksum="9c247d0cba565b4e3f91cc76e827ddf7f3ad499f54ba611edd25d4d7be4890c3 + e8c195a2a08daa70c7712adae3eaa01656b039dcc8cc1e5e8210006716761ad5" archs="aarch64* armv5tel* armv6l* armv7l* x86_64*" @@ -28,7 +28,8 @@ post_extract() { } post_patch() { - sed -i -e 's/-Werror\b//g' -e 's/\b\(\(C\(XX\)\?\|LD\)FLAGS\s*+=\)/override \1/g' Makefile kafel/build/Makefile.mk kafel/src/Makefile + vsed -e 's/-Werror\b//g' -i Makefile kafel/build/Makefile.mk + vsed -e 's/\b\(\(C\(XX\)\?\|LD\)FLAGS\s*+=\)/override \1/g' -i Makefile kafel/build/Makefile.mk kafel/src/Makefile } do_install() { From a660f86f0a3d2c26009014248077fd5784f2d719 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:57 +0200 Subject: [PATCH 16/35] netdata: rebuild against protobuf-23.3_1 --- srcpkgs/netdata/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index 18dbe4394a4e..781120b3f275 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,7 +1,7 @@ # Template file for 'netdata' pkgname=netdata version=1.37.1 -revision=1 +revision=2 build_style=gnu-configure build_helper=qemu configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no From 18a7b9026d1e56646affaf069287f22590b5b01e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:57 +0200 Subject: [PATCH 17/35] mumble: rebuild against protobuf-23.3_1 --- srcpkgs/mumble/patches/cpp17.patch | 11 +++++++++++ srcpkgs/mumble/patches/musl.patch | 14 ++++++++++++++ srcpkgs/mumble/template | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mumble/patches/cpp17.patch create mode 100644 srcpkgs/mumble/patches/musl.patch diff --git a/srcpkgs/mumble/patches/cpp17.patch b/srcpkgs/mumble/patches/cpp17.patch new file mode 100644 index 000000000000..7cb9c9a93355 --- /dev/null +++ b/srcpkgs/mumble/patches/cpp17.patch @@ -0,0 +1,11 @@ +--- mumble-1.4.287/CMakeLists.txt 2022-09-13 19:24:40.000000000 +0200 ++++ - 2023-07-10 20:12:27.869019033 +0200 +@@ -35,7 +35,7 @@ + set(3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/3rdparty") + set(PLUGINS_DIR "${CMAKE_SOURCE_DIR}/plugins") + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) + + list(APPEND CMAKE_MODULE_PATH diff --git a/srcpkgs/mumble/patches/musl.patch b/srcpkgs/mumble/patches/musl.patch new file mode 100644 index 000000000000..49d83a422b8e --- /dev/null +++ b/srcpkgs/mumble/patches/musl.patch @@ -0,0 +1,14 @@ +Newer musl expands NULL to nullptr, which is not a bool. +Either way, the check is always true with openssl 1.1+, so it can probably removed alltogether +--- +--- mumble-1.4.287/src/SSL.cpp 2022-09-13 19:24:40.000000000 +0200 ++++ - 2023-02-07 22:18:16.093759105 +0100 +@@ -33,7 +34,7 @@ + // If we detect that no locking callback is configured, we + // have to set it up ourselves to allow multi-threaded use + // of OpenSSL. +- if (!CRYPTO_get_locking_callback()) { ++ if (CRYPTO_get_locking_callback() == NULL) { + SSLLocks::initialize(); + } + } diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 35c2728c74ce..5c30d4ae64b4 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.4.287 -revision=3 +revision=4 build_style=cmake make_cmd=make configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF From ec299deaeb4d04c8a46fdfcf4ca50fac0c047829 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:57 +0200 Subject: [PATCH 18/35] mumble: rebuild against protobuf-23.3_1 --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 5c30d4ae64b4..3dc669705365 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.4.287 -revision=4 +revision=5 build_style=cmake make_cmd=make configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF From 94fe9a82bc1b9c82c35aeac5900575f510437d00 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:57 +0200 Subject: [PATCH 19/35] mozc: statically link against vendored prootbuf protobuf 23+ links against abseil, which conflicts with the vendored abseil version in mozc. The build system does not have a flag to use system abseil. --- srcpkgs/mozc/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 3fdb986b3213..e7735cb57f4f 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -3,16 +3,17 @@ pkgname=mozc # src/data/version/mozc_version_template.bzl # revision is always 102, template always says 100 ;) version=2.28.4800.102 -revision=1 +revision=2 _commit=056163a5fddbb261b258beb8444998e4882f0cc5 _abseil=20211102.0 +_protobuf_commit=cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97 _gyp=0.1+20220404git9ecf45e _jpn_dict=e5b3425575734c323e1d947009dd74709437b684 create_wrksrc=yes build_wrksrc=mozc/src -hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel +hostmakedepends="gettext ninja pkg-config python3-six which qt5-qmake qt5-host-tools" -makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel +makedepends="gtk+-devel ibus-devel libzinnia-devel qt5-devel fcitx-devel libfcitx5-devel" depends="tegaki-zinnia-japanese>=0.3 mozc-base-${version}_${revision}" short_desc="Japanese IME (Open Source version of Google Japanese Input)" @@ -22,11 +23,13 @@ homepage="https://github.com/google/mozc" distfiles=" https://github.com/fcitx/mozc/archive/$_commit.tar.gz https://github.com/abseil/abseil-cpp/archive/refs/tags/$_abseil.tar.gz + https://github.com/protocolbuffers/protobuf/archive/$_protobuf_commit.tar.gz ${DEBIAN_SITE}/main/g/gyp/gyp_$_gyp.orig.tar.xz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/$_jpn_dict.tar.gz " checksum="259d87bfd7535ad03bd554185677d7345a90166353a6db0b6a3606183ad2923d dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 + 863e27f6d24f40bce2bbfe5adcf365f2af5479ea917f254331ee60ce88f8c8a5 0325006f012db66dfa27bf7bb048f3fe38f96e512ebe065930cbc70bcdc06bc9 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1" @@ -47,7 +50,8 @@ post_extract() { # symlink "submodules" into place for _src_dest in gyp \ abseil-cpp \ - japanese-usage-dictionary:japanese_usage_dictionary + japanese-usage-dictionary:japanese_usage_dictionary \ + protobuf do _src=${_src_dest%:*} _dst=${_src_dest#*:} @@ -61,7 +65,6 @@ do_configure() { GYP_DEFINES=" document_dir=/usr/share/licenses/${pkgname} ibus_mozc_path=/usr/libexec/ibus-engine-mozc - use_libprotobuf=1 use_libzinnia=1 ${XBPS_TARGET_NO_ATOMIC8:+use_libatomic=1} " python3 build_mozc.py gyp --target_platform=Linux From caaf0b548295af185f5ca74c7c59c3cd8f298d9c Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:57 +0200 Subject: [PATCH 20/35] mosh: rebuild against protobuf-23.3_1 --- srcpkgs/mosh/patches/cpp17.patch | 14 ++++++++++++++ srcpkgs/mosh/template | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/mosh/patches/cpp17.patch diff --git a/srcpkgs/mosh/patches/cpp17.patch b/srcpkgs/mosh/patches/cpp17.patch new file mode 100644 index 000000000000..5463adc2718b --- /dev/null +++ b/srcpkgs/mosh/patches/cpp17.patch @@ -0,0 +1,14 @@ +--- a/configure.ac 2022-10-27 05:29:47.000000000 +0200 ++++ - 2023-07-08 13:19:05.270079012 +0200 +@@ -22,9 +22,9 @@ + # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + +-# Protobuf 3.6+ requires C++11. ++# Protobuf 3.6+ requires C++11., 4.2.2 with abseil requires C++17 + AS_IF([pkg-config --atleast-version 3.6.0 protobuf], +- [AX_CXX_COMPILE_STDCXX([11])]) ++ [AX_CXX_COMPILE_STDCXX([17])]) + + WARNING_CXXFLAGS="" + PICKY_CXXFLAGS="" diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 173ba14bcd47..d252a0c29755 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,9 +1,9 @@ # Template file for 'mosh' pkgname=mosh version=1.4.0 -revision=3 +revision=4 build_style=gnu-configure -hostmakedepends="perl pkg-config protobuf" +hostmakedepends="perl pkg-config protobuf autoconf automake" makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel" depends="perl-IO-Tty" short_desc="Mobile shell, remote terminal application that allows roaming" @@ -16,4 +16,5 @@ checksum=872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd pre_configure() { # make local.test always succeed. It fails due to missing X server in chroot. printf "%s\n" "#!/bin/sh" ":" > src/tests/local.test + autoreconf -fi } From 072119c314844f6e3afdd58cfc54b5cfab4c89a1 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:58 +0200 Subject: [PATCH 21/35] libcompizconfig: rebuild against protobuf-23.3_1 --- srcpkgs/libcompizconfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index 5b59eda97c78..3fb33698bfa6 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -1,7 +1,7 @@ # Template file for 'libcompizconfig' pkgname=libcompizconfig version=0.8.18 -revision=10 +revision=11 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake intltool libtool pkg-config protobuf" From d69a35fdcd31fb61587ecaa34139efacb810b090 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:58 +0200 Subject: [PATCH 22/35] libArcus: rebuild against protobuf-23.3_1 --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index d6fedecc5599..1cf1b866d650 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus version=4.13.1 -revision=4 +revision=5 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" From cf1ea6970ef2c39b9970bfd97fd971e52d1ee5ae Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:58 +0200 Subject: [PATCH 23/35] kismet: rebuild against protobuf-23.3_1 --- srcpkgs/kismet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index 48a0fc5fa6f1..46cbf7b31811 100644 --- a/srcpkgs/kismet/template +++ b/srcpkgs/kismet/template @@ -1,7 +1,7 @@ # Template file for 'kismet' pkgname=kismet version=2022.08.R1 -revision=2 +revision=3 _realver="${version//./-}" build_style=gnu-configure configure_args="--disable-python-tools" From 3f8cce658a16557bd550fde7a1b46abf05f2a0e5 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:58 +0200 Subject: [PATCH 24/35] cura-engine: rebuild against protobuf-23.3_1 --- srcpkgs/cura-engine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 4f3118d30252..1f23ddace749 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,7 +1,7 @@ # Template file for 'cura-engine' pkgname=cura-engine version=4.13.1 -revision=3 +revision=4 build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" hostmakedepends="protobuf git" From f6942005e204538b35c51d39707514e67bda7307 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:58 +0200 Subject: [PATCH 25/35] clementine: rebuild against protobuf-23.3_1 --- srcpkgs/clementine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index acd098124529..a1cacbb73d8e 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,11 +1,11 @@ # Template file for 'clementine' pkgname=clementine version=1.4.0rc1 -revision=10 +revision=11 _fullver=${version}-873-g3471134d5 build_style=cmake configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON - -DFORCE_GIT_REVISION=${_fullver}" + -DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17" hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf" makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel From 60a72615cc643f00225e9ef68541ee50931da30e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:59 +0200 Subject: [PATCH 26/35] bloaty: rebuild against protobuf-23.3_1 --- srcpkgs/bloaty/patches/cpp17.patch | 20 ++++++++ srcpkgs/bloaty/patches/system-abseil.patch | 58 ++++++++++++++++++++++ srcpkgs/bloaty/template | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bloaty/patches/cpp17.patch create mode 100644 srcpkgs/bloaty/patches/system-abseil.patch diff --git a/srcpkgs/bloaty/patches/cpp17.patch b/srcpkgs/bloaty/patches/cpp17.patch new file mode 100644 index 000000000000..ca458dd79fb6 --- /dev/null +++ b/srcpkgs/bloaty/patches/cpp17.patch @@ -0,0 +1,20 @@ +--- bloaty-1.1/CMakeLists.txt 2020-05-24 06:43:55.000000000 +0200 ++++ - 2023-07-08 12:51:24.115742363 +0200 +@@ -2,7 +2,7 @@ + cmake_policy(SET CMP0048 NEW) + project (Bloaty VERSION 1.0) + project (Bloaty VERSION 1.1) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + + # Options we define for users. + option(BLOATY_ENABLE_ASAN "Enable address sanitizer." OFF) +@@ -93,7 +93,7 @@ + include_directories("${CMAKE_CURRENT_BINARY_DIR}/src") + + # Baseline build flags. +-set(CMAKE_CXX_FLAGS "-std=c++11 -W -Wall -Wno-sign-compare") ++set(CMAKE_CXX_FLAGS "-W -Wall -Wno-sign-compare") + set(CMAKE_CXX_FLAGS_DEBUG "-g1") + set(CMAKE_CXX_FLAGS_RELEASE "-O2") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g1") diff --git a/srcpkgs/bloaty/patches/system-abseil.patch b/srcpkgs/bloaty/patches/system-abseil.patch new file mode 100644 index 000000000000..799e10a3b540 --- /dev/null +++ b/srcpkgs/bloaty/patches/system-abseil.patch @@ -0,0 +1,58 @@ +--- bloaty-1.1/CMakeLists.txt 2020-05-24 06:43:55.000000000 +0200 ++++ - 2023-07-08 13:07:06.559266321 +0200 +@@ -35,6 +35,12 @@ + MESSAGE(STATUS "pkg-config not found, using bundled dependencies") + endif(${PKG_CONFIG_FOUND}) + endif(UNIX) ++find_package(absl CONFIG) ++if(absl_FOUND) ++ MESSAGE(STATUS "System absl found, using") ++else() ++ MESSAGE(STATUS "System absl not found, using bundled version") ++endif() + + # Set default build type. + if(NOT CMAKE_BUILD_TYPE) +@@ -89,7 +95,6 @@ + + include_directories(.) + include_directories(src) +-include_directories(third_party/abseil-cpp) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/src") + + # Baseline build flags. +@@ -159,24 +164,6 @@ + src/macho.cc + src/range_map.cc + src/webassembly.cc +- # Until Abseil has a proper CMake build system +- third_party/abseil-cpp/absl/base/internal/raw_logging.cc # Grrrr... +- third_party/abseil-cpp/absl/base/internal/throw_delegate.cc +- third_party/abseil-cpp/absl/numeric/int128.cc +- third_party/abseil-cpp/absl/strings/ascii.cc +- third_party/abseil-cpp/absl/strings/charconv.cc +- third_party/abseil-cpp/absl/strings/escaping.cc +- third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc +- third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc +- third_party/abseil-cpp/absl/strings/internal/memutil.cc +- third_party/abseil-cpp/absl/strings/internal/utf8.cc +- third_party/abseil-cpp/absl/strings/match.cc +- third_party/abseil-cpp/absl/strings/numbers.cc +- third_party/abseil-cpp/absl/strings/str_cat.cc +- third_party/abseil-cpp/absl/strings/string_view.cc +- third_party/abseil-cpp/absl/strings/str_split.cc +- third_party/abseil-cpp/absl/strings/substitute.cc +- third_party/abseil-cpp/absl/types/bad_optional_access.cc + # One source file, no special build system needed. + third_party/demumble/third_party/libcxxabi/cxa_demangle.cpp + ) +@@ -214,6 +201,9 @@ + endif(${PROTOBUF_FOUND}) + endif(UNIX) + ++list(APPEND LIBBLOATY_LIBS absl::strings) ++list(APPEND LIBBLOATY_LIBS absl::optional) ++ + if(DEFINED ENV{LIB_FUZZING_ENGINE}) + message("LIB_FUZZING_ENGINE set, building fuzz_target instead of Bloaty") + add_executable(fuzz_target tests/fuzz_target.cc) diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template index 226d2f30ffcd..2a79fb502f99 100644 --- a/srcpkgs/bloaty/template +++ b/srcpkgs/bloaty/template @@ -1,7 +1,7 @@ # Template file for 'bloaty' pkgname=bloaty version=1.1 -revision=11 +revision=12 build_style=cmake hostmakedepends="pkg-config protobuf" makedepends="capstone-devel protobuf-devel re2-devel zlib-devel" From d38c667381a07f5d91aa3e547e549d3b7989f67e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:59 +0200 Subject: [PATCH 27/35] astroid: rebuild against protobuf-23.3_1 --- srcpkgs/astroid/patches/cpp17.patch | 11 +++++++++++ srcpkgs/astroid/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/astroid/patches/cpp17.patch diff --git a/srcpkgs/astroid/patches/cpp17.patch b/srcpkgs/astroid/patches/cpp17.patch new file mode 100644 index 000000000000..9ac9a9f952e6 --- /dev/null +++ b/srcpkgs/astroid/patches/cpp17.patch @@ -0,0 +1,11 @@ +--- astroid-0.16/CMakeLists.txt 2021-08-05 15:31:11.000000000 +0200 ++++ - 2023-07-03 21:53:30.304595787 +0200 +@@ -145,7 +145,7 @@ + # compile flags and options + # + +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + + include_directories ( + ${GTKMM3_INCLUDE_DIRS} diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 25d3da44e024..8fd1c032be2c 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.16 -revision=8 +revision=9 build_style=cmake build_helper=gir hostmakedepends="pkg-config scdoc protobuf gobject-introspection" From 3d7e2d810fe38566382a7418af773a23a6aeb088 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:02:59 +0200 Subject: [PATCH 28/35] android-tools: rebuild against protobuf-23.3_1 --- .../android-tools/patches/protobuf-23.patch | 31 +++++++++++++++++++ srcpkgs/android-tools/template | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/android-tools/patches/protobuf-23.patch diff --git a/srcpkgs/android-tools/patches/protobuf-23.patch b/srcpkgs/android-tools/patches/protobuf-23.patch new file mode 100644 index 000000000000..21012126ea9a --- /dev/null +++ b/srcpkgs/android-tools/patches/protobuf-23.patch @@ -0,0 +1,31 @@ +--- android-tools-34.0.1.orig/vendor/extras/libjsonpb/parse/jsonpb.cpp 2023-06-28 23:15:15.414236253 +0200 ++++ android-tools-34.0.1/vendor/extras/libjsonpb/parse/jsonpb.cpp 2023-06-28 23:34:21.672962973 +0200 +@@ -51,7 +51,7 @@ + #if GOOGLE_PROTOBUF_VERSION < 3016000 + return MakeError(status.error_message().as_string()); + #else +- return MakeError(status.message().as_string()); ++ return MakeError(std::string(status.message())); + #endif + } + return ErrorOr(std::move(json)); +@@ -68,7 +68,7 @@ + #if GOOGLE_PROTOBUF_VERSION < 3016000 + return MakeError(status.error_message().as_string()); + #else +- return MakeError(status.message().as_string()); ++ return MakeError(std::string(status.message())); + #endif + } + if (!message->ParseFromString(binary)) { +--- a/vendor/CMakeLists.partition.txt 2023-03-03 17:18:50.000000000 +0100 ++++ - 2023-07-10 23:06:19.290718502 +0200 +@@ -20,7 +20,7 @@ + + add_library(libjsonpbparse STATIC + extras/libjsonpb/parse/jsonpb.cpp) +-target_link_libraries(libjsonpbparse PRIVATE libbase) ++target_link_libraries(libjsonpbparse PRIVATE libbase absl_status) + target_include_directories(libjsonpbparse PUBLIC + extras/libjsonpb/parse/include) + diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 329674482b69..b813474eace0 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,7 +1,7 @@ # Template file for 'android-tools' pkgname=android-tools version=34.0.1 -revision=1 +revision=2 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake hostmakedepends="perl go protobuf pkg-config" From 86a7da9e9cfc761c6a5e6423725186d05aa04d17 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 27 Jun 2023 12:06:25 +0200 Subject: [PATCH 29/35] justbuild: rebuild against grpc-1.56.0_1 --- srcpkgs/justbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index ee36f6dae575..f933611d1283 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,7 +1,7 @@ # Template file for 'justbuild' pkgname=justbuild version=1.1.2 -revision=2 +revision=3 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget" makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++ From c17c2d26bbce39ceccd10b7e405b1d3f7ddf4d02 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 28 Jun 2023 11:07:13 +0200 Subject: [PATCH 30/35] sysdig: update to 0.31.5. --- srcpkgs/sysdig/files/libsinsp-zstd.patch | 22 + ...d9aab87801281e22898242e24e0bc63873b2.patch | 557 ++++++++++++++++++ .../falcosecurity-libs-nodownload.patch | 28 + srcpkgs/sysdig/template | 32 +- 4 files changed, 625 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/sysdig/files/libsinsp-zstd.patch create mode 100644 srcpkgs/sysdig/patches/35ded9aab87801281e22898242e24e0bc63873b2.patch create mode 100644 srcpkgs/sysdig/patches/falcosecurity-libs-nodownload.patch diff --git a/srcpkgs/sysdig/files/libsinsp-zstd.patch b/srcpkgs/sysdig/files/libsinsp-zstd.patch new file mode 100644 index 000000000000..e99e4f7c1207 --- /dev/null +++ b/srcpkgs/sysdig/files/libsinsp-zstd.patch @@ -0,0 +1,22 @@ +diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt +index 18e59b1..b23e890 100644 +--- a/userspace/libsinsp/CMakeLists.txt ++++ b/userspace/libsinsp/CMakeLists.txt +@@ -38,6 +38,7 @@ include(ExternalProject) + + if(NOT WIN32 AND NOT APPLE) + include(b64) ++ find_library(ZSTD_LIB NAMES zstd) + endif() + + include(jsoncpp) +@@ -246,7 +247,8 @@ if(NOT WIN32) + "${PROTOBUF_LIB}" + "${CARES_LIB}" + "${JQ_LIB}" +- "${B64_LIB}") ++ "${B64_LIB}" ++ "${ZSTD_LIB}") + + if(NOT MUSL_OPTIMIZED_BUILD) + list(APPEND SINSP_LIBRARIES diff --git a/srcpkgs/sysdig/patches/35ded9aab87801281e22898242e24e0bc63873b2.patch b/srcpkgs/sysdig/patches/35ded9aab87801281e22898242e24e0bc63873b2.patch new file mode 100644 index 000000000000..54c2ed8d0d98 --- /dev/null +++ b/srcpkgs/sysdig/patches/35ded9aab87801281e22898242e24e0bc63873b2.patch @@ -0,0 +1,557 @@ +From 3d22309a7317d500f75d053af6f9e5b5b5728b40 Mon Sep 17 00:00:00 2001 +From: Jason Dellaluce +Date: Mon, 22 May 2023 09:56:04 +0000 +Subject: [PATCH 1/6] update(cmake): bump driver to 5.0.0+driver + +Signed-off-by: Jason Dellaluce +--- + cmake/modules/driver.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake +index bee1926d3a..7fd35d7f99 100644 +--- a/cmake/modules/driver.cmake ++++ b/cmake/modules/driver.cmake +@@ -31,8 +31,8 @@ else() + # In case you want to test against another driver version (or branch, or commit) just pass the variable - + # ie., `cmake -DDRIVER_VERSION=dev ..` + if(NOT DRIVER_VERSION) +- set(DRIVER_VERSION "4.0.1+driver") +- set(DRIVER_CHECKSUM "SHA256=424d647aa6b6fa45b6701c4bbc9293c161ed00a08254d83eea419c0a736f280d") ++ set(DRIVER_VERSION "5.0.0+driver") ++ set(DRIVER_CHECKSUM "SHA256=c988ca7ac7d174f62d1bfbaaca49efd117f7b329f474d1b46b643635b2e35083") + endif() + + # cd /path/to/build && cmake /path/to/source + +From 847e602404dcee85f06dde5a1d8ad0c740c49c98 Mon Sep 17 00:00:00 2001 +From: Jason Dellaluce +Date: Mon, 22 May 2023 09:56:08 +0000 +Subject: [PATCH 2/6] update(cmake): bump libs to 0.11.0-rc1 + +Signed-off-by: Jason Dellaluce +--- + cmake/modules/falcosecurity-libs.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake +index b345c057ad..f30233b9e3 100644 +--- a/cmake/modules/falcosecurity-libs.cmake ++++ b/cmake/modules/falcosecurity-libs.cmake +@@ -32,8 +32,8 @@ else() + # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - + # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` + if(NOT FALCOSECURITY_LIBS_VERSION) +- set(FALCOSECURITY_LIBS_VERSION "0.10.5") +- set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=2a4b37c08bec4ba81326314831f341385aff267062e8d4483437958689662936") ++ set(FALCOSECURITY_LIBS_VERSION "0.11.0-rc1") ++ set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=bb6e57f66ae85dcda6e695226cd14082d9a1215902909cdde5b83f7abef44d8f") + endif() + + # cd /path/to/build && cmake /path/to/source + +From 1d1dbaf06265d8eefd4038e8474f71f7958ec840 Mon Sep 17 00:00:00 2001 +From: Jason Dellaluce +Date: Mon, 22 May 2023 10:43:27 +0000 +Subject: [PATCH 3/6] fix(cmake): solve c++17 compilation issues + +Signed-off-by: Jason Dellaluce +--- + CMakeLists.txt | 3 +++ + cmake/modules/falcosecurity-libs.cmake | 10 +++++----- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0309d66633..6d28c6c67d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,6 +146,9 @@ if(NOT DEFINED SYSDIG_COMPONENT_NAME) + set(SYSDIG_COMPONENT_NAME "${CMAKE_PROJECT_NAME}") + endif() + ++set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_EXTENSIONS OFF) ++ + include(falcosecurity-libs) + include(yaml-cpp) + include(nlohmann-json) +diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake +index f30233b9e3..fe5dacd7ad 100644 +--- a/cmake/modules/falcosecurity-libs.cmake ++++ b/cmake/modules/falcosecurity-libs.cmake +@@ -94,12 +94,12 @@ else() + endif() + + include(CheckCXXCompilerFlag) +-CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14) +-if(CREATE_TEST_TARGETS AND NOT WIN32 AND COMPILER_SUPPORTS_CXX14) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") ++CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17) ++if(CREATE_TEST_TARGETS AND NOT WIN32 AND COMPILER_SUPPORTS_CXX17) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + include(gtest) +-elseif(CREATE_TEST_TARGETS AND NOT COMPILER_SUPPORTS_CXX14) +- message(FATAL_ERROR "Your compiler doesn't support c++14: cannot include gtest and create test targets.") ++elseif(CREATE_TEST_TARGETS AND NOT COMPILER_SUPPORTS_CXX17) ++ message(FATAL_ERROR "Your compiler doesn't support c++17: cannot include gtest and create test targets.") + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") + +From d5fcbad2d5ea63e1439ab7174a5cfd9a7a2e1545 Mon Sep 17 00:00:00 2001 +From: Jason Dellaluce +Date: Mon, 22 May 2023 10:44:05 +0000 +Subject: [PATCH 4/6] update(userspace): sync sysdig and csysdig with latest + libs + +Signed-off-by: Jason Dellaluce +--- + userspace/sysdig/csysdig.cpp | 6 +-- + userspace/sysdig/sysdig.cpp | 9 +--- + userspace/sysdig/utils/plugin_utils.cpp | 37 ++++++++++----- + userspace/sysdig/utils/sinsp_opener.cpp | 18 ++++---- + userspace/sysdig/utils/supported_events.cpp | 50 +++++++++++---------- + userspace/sysdig/utils/supported_fields.cpp | 15 +++---- + 6 files changed, 70 insertions(+), 65 deletions(-) + +diff --git a/userspace/sysdig/csysdig.cpp b/userspace/sysdig/csysdig.cpp +index 9419882341..edd8129a0e 100644 +--- a/userspace/sysdig/csysdig.cpp ++++ b/userspace/sysdig/csysdig.cpp +@@ -39,11 +39,11 @@ limitations under the License. + #include "chisel.h" + #include "chisel_utils.h" + #endif +-#include "fields_info.h" + #include "chisel_table.h" + #include "utils.h" + #include "utils/plugin_utils.h" + #include "utils/sinsp_opener.h" ++#include "utils/supported_fields.h" + + #ifdef _WIN32 + #include "win32/getopt.h" +@@ -704,8 +704,8 @@ sysdig_init_res csysdig_init(int argc, char **argv) + // + if(list_flds) + { +- list_fields(false, false); +- ++ // todo(jasondellaluce): support source selection, verbosity, markdown ++ print_supported_fields(inspector, plugins, "", true, false); + res.m_res = EXIT_SUCCESS; + goto exit; + } +diff --git a/userspace/sysdig/sysdig.cpp b/userspace/sysdig/sysdig.cpp +index 40f2b39ef9..a978070d73 100644 +--- a/userspace/sysdig/sysdig.cpp ++++ b/userspace/sysdig/sysdig.cpp +@@ -43,7 +43,6 @@ limitations under the License. + #include "chisel_utils.h" + #include "chisel_fields_info.h" + #endif +-#include "fields_info.h" + #include "utils.h" + #include "plugin.h" + #include "plugin_manager.h" +@@ -455,8 +454,6 @@ void print_summary_table(sinsp* inspector, + std::vector &summary_table, + uint32_t nentries) + { +- sinsp_evttables* einfo = inspector->get_event_info_tables(); +- + std::cout << "----------------------\n"; + std::string tstr = std::string("Event"); + tstr.resize(16, ' '); +@@ -478,7 +475,7 @@ void print_summary_table(sinsp* inspector, + + if(e.m_is_unsupported_syscall) + { +- tstr = einfo->m_syscall_info_table[e.m_id / 2].name; ++ tstr = scap_get_ppm_sc_name((ppm_sc_code) (e.m_id / 2)); + tstr.resize(16, ' '); + + printf("%s%s%" PRIu64 "\n", +@@ -488,7 +485,7 @@ void print_summary_table(sinsp* inspector, + } + else + { +- tstr = einfo->m_event_info[e.m_id].name; ++ tstr = libsinsp::events::info((ppm_event_code) e.m_id)->name; + tstr.resize(16, ' '); + + printf("%s%s%" PRIu64 "\n", +@@ -1862,8 +1859,6 @@ sysdig_init_res sysdig_init(int argc, char **argv) + res.m_res = EXIT_FAILURE; + goto exit; + } +- +- inspector->filter_proc_table_when_saving(true); + } + else + { +diff --git a/userspace/sysdig/utils/plugin_utils.cpp b/userspace/sysdig/utils/plugin_utils.cpp +index ad69543b3e..b99de98b66 100644 +--- a/userspace/sysdig/utils/plugin_utils.cpp ++++ b/userspace/sysdig/utils/plugin_utils.cpp +@@ -146,6 +146,7 @@ void plugin_utils::plugin_entry::init(sinsp *inspector) + } + if (plugin->caps() & CAP_EXTRACTION) + { ++ // todo(jasondellaluce): manage field name conflicts + g_filterlist.add_filter_check(sinsp_plugin::new_filtercheck(plugin)); + } + inited = true; +@@ -185,13 +186,30 @@ void plugin_utils::plugin_entry::print_info(sinsp* inspector, std::ostringstream + os << "Capabilities: " << std::endl; + if(plugin->caps() & CAP_SOURCING) + { +- os << " - Event Sourcing (ID=" << plugin->id(); +- os << ", source='" << plugin->event_source() << "')" << std::endl; ++ os << " - Event Sourcing"; ++ if (plugin->id() != 0) ++ { ++ os << " (ID=" << plugin->id(); ++ os << ", source='" << plugin->event_source() << "')"; ++ } ++ else ++ { ++ os << " (system events)"; ++ } ++ os << std::endl; + } + if(plugin->caps() & CAP_EXTRACTION) + { + os << " - Field Extraction" << std::endl; + } ++ if(plugin->caps() & CAP_PARSING) ++ { ++ os << " - Event Parsing" << std::endl; ++ } ++ if(plugin->caps() & CAP_ASYNC) ++ { ++ os << " - Async Events" << std::endl; ++ } + } + + void plugin_utils::add_dir(std::string dirname, bool front_add) +@@ -609,7 +627,7 @@ std::vector plugin_utils::get_event_sources(sinsp *inspector) + // the plugin, in case it was not registered already + pl.get_plugin(inspector); + } +- return inspector->get_plugin_manager()->sources(); ++ return inspector->event_sources(); + } + + std::vector> plugin_utils::get_filterchecks(sinsp *inspector, const std::string& source) +@@ -617,16 +635,13 @@ std::vector> plugin_utils::get_filterchecks( + std::vector> list; + list.push_back(std::unique_ptr(inspector->new_generic_filtercheck())); + +- // todo(jasondellaluce): remove this once we support extracting plugin fields from syscalls +- if (source != s_syscall_source) ++ for (auto &pl : m_plugins) + { +- for (auto &pl : m_plugins) ++ auto plugin = pl.get_plugin(inspector); ++ if (plugin->caps() & CAP_EXTRACTION ++ && sinsp_plugin::is_source_compatible(plugin->extract_event_sources(), source)) + { +- auto plugin = pl.get_plugin(inspector); +- if (plugin->caps() & CAP_EXTRACTION && plugin->is_source_compatible(source)) +- { +- list.push_back(std::unique_ptr(sinsp_plugin::new_filtercheck(plugin))); +- } ++ list.push_back(std::unique_ptr(sinsp_plugin::new_filtercheck(plugin))); + } + } + return list; +diff --git a/userspace/sysdig/utils/sinsp_opener.cpp b/userspace/sysdig/utils/sinsp_opener.cpp +index eafdb631d3..7315b99c7d 100644 +--- a/userspace/sysdig/utils/sinsp_opener.cpp ++++ b/userspace/sysdig/utils/sinsp_opener.cpp +@@ -50,14 +50,12 @@ void sinsp_opener::open(sinsp* inspector) const + + #if defined(HAS_CAPTURE) + /* Populate syscalls of interest */ +- std::unordered_set sc_of_interest = inspector->get_all_ppm_sc(); ++ auto sc_of_interest = libsinsp::events::all_sc_set(); + +- /* Populate tracepoints of interest */ +- std::unordered_set tp_of_interest = inspector->get_all_tp(); + if(!options.page_faults) + { +- tp_of_interest.erase(PAGE_FAULT_USER); +- tp_of_interest.erase(PAGE_FAULT_KERN); ++ sc_of_interest.remove(ppm_sc_code::PPM_SC_PAGE_FAULT_USER); ++ sc_of_interest.remove(ppm_sc_code::PPM_SC_PAGE_FAULT_KERNEL); + } + + if(udig.enabled) +@@ -77,7 +75,7 @@ void sinsp_opener::open(sinsp* inspector) const + #ifdef HAS_MODERN_BPF + if(bpf.modern) + { +- inspector->open_modern_bpf(DEFAULT_DRIVER_BUFFER_BYTES_DIM, bpf.cpus_for_each_syscall_buffer, true, sc_of_interest, tp_of_interest); ++ inspector->open_modern_bpf(DEFAULT_DRIVER_BUFFER_BYTES_DIM, bpf.cpus_for_each_syscall_buffer, true, sc_of_interest); + return; + } + #endif +@@ -95,7 +93,7 @@ void sinsp_opener::open(sinsp* inspector) const + + try + { +- inspector->open_bpf(probe, DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest, tp_of_interest); ++ inspector->open_bpf(probe, DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest); + } + catch(const sinsp_exception& e) + { +@@ -103,7 +101,7 @@ void sinsp_opener::open(sinsp* inspector) const + { + fprintf(stderr, "Unable to load the BPF probe\n"); + } +- inspector->open_bpf(probe, DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest, tp_of_interest); ++ inspector->open_bpf(probe, DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest); + } + + // Enable gathering the CPU from the kernel module +@@ -114,7 +112,7 @@ void sinsp_opener::open(sinsp* inspector) const + // default to kernel module if no other option is specified + try + { +- inspector->open_kmod(DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest, tp_of_interest); ++ inspector->open_kmod(DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest); + } + catch(const sinsp_exception& e) + { +@@ -124,7 +122,7 @@ void sinsp_opener::open(sinsp* inspector) const + { + fprintf(stderr, "Unable to load the driver\n"); + } +- inspector->open_kmod(DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest, tp_of_interest); ++ inspector->open_kmod(DEFAULT_DRIVER_BUFFER_BYTES_DIM, sc_of_interest); + } + + // Enable gathering the CPU from the kernel module +diff --git a/userspace/sysdig/utils/supported_events.cpp b/userspace/sysdig/utils/supported_events.cpp +index 1442911209..7f0d630011 100644 +--- a/userspace/sysdig/utils/supported_events.cpp ++++ b/userspace/sysdig/utils/supported_events.cpp +@@ -27,25 +27,25 @@ struct event_entry + { + bool is_enter; + std::string name; +- struct ppm_event_info info; ++ const ppm_event_info* info; + }; + +-static std::vector get_event_entries(sinsp* inspector, bool include_generics) ++static std::vector get_event_entries(bool include_generics) + { + event_entry entry; + std::vector events; +- const struct ppm_event_info* etable = inspector->get_event_info_tables()->m_event_info; + + // skip generic events +- for(uint32_t evt = PPME_GENERIC_X + 1; evt < PPM_EVENT_MAX; evt++) ++ for(const auto& evt : libsinsp::events::all_event_set()) + { +- if (!sinsp::is_old_version_event(evt) +- && !sinsp::is_unused_event(evt) +- && !sinsp::is_unknown_event(evt)) ++ if (!libsinsp::events::is_generic(evt) ++ && !libsinsp::events::is_old_version_event(evt) ++ && !libsinsp::events::is_unused_event(evt) ++ && !libsinsp::events::is_unknown_event(evt)) + { + entry.is_enter = PPME_IS_ENTER(evt); +- entry.name = etable[evt].name; +- entry.info = etable[evt]; ++ entry.info = libsinsp::events::info(evt); ++ entry.name = entry.info->name; + events.push_back(entry); + } + } +@@ -53,17 +53,19 @@ static std::vector get_event_entries(sinsp* inspector, bool include + if (include_generics) + { + // append generic events +- const auto generic_syscalls = inspector->get_events_names({PPME_GENERIC_E}); +- for (const auto& name : generic_syscalls) +- { +- for(uint32_t evt = PPME_GENERIC_E; evt <= PPME_GENERIC_X; evt++) +- { +- entry.is_enter = PPME_IS_ENTER(evt); +- entry.name = name; +- entry.info = etable[evt]; +- events.push_back(entry); +- } +- } ++ const auto names = libsinsp::events::event_set_to_names({ppm_event_code::PPME_GENERIC_E}); ++ for (const auto& name : names) ++ { ++ entry.is_enter = PPME_IS_ENTER(ppm_event_code::PPME_GENERIC_E); ++ entry.info = libsinsp::events::info(ppm_event_code::PPME_GENERIC_E); ++ entry.name = name; ++ events.push_back(entry); ++ ++ entry.is_enter = PPME_IS_ENTER(ppm_event_code::PPME_GENERIC_X); ++ entry.info = libsinsp::events::info(ppm_event_code::PPME_GENERIC_X); ++ entry.name = name; ++ events.push_back(entry); ++ } + } + + return events; +@@ -71,7 +73,7 @@ static std::vector get_event_entries(sinsp* inspector, bool include + + void print_supported_events(sinsp* inspector, bool markdown) + { +- const auto events = get_event_entries(inspector, true); ++ const auto events = get_event_entries(true); + + if(markdown) + { +@@ -91,15 +93,15 @@ void print_supported_events(sinsp* inspector, bool markdown) + printf("%c %s(", dir, e.name.c_str()); + } + +- for(uint32_t k = 0; k < e.info.nparams; k++) ++ for(uint32_t k = 0; k < e.info->nparams; k++) + { + if(k != 0) + { + printf(", "); + } + +- printf("%s %s", param_type_to_string(e.info.params[k].type), +- e.info.params[k].name); ++ printf("%s %s", param_type_to_string(e.info->params[k].type), ++ e.info->params[k].name); + } + printf(")\n"); + } +diff --git a/userspace/sysdig/utils/supported_fields.cpp b/userspace/sysdig/utils/supported_fields.cpp +index 6e2575b030..3127fb7220 100644 +--- a/userspace/sysdig/utils/supported_fields.cpp ++++ b/userspace/sysdig/utils/supported_fields.cpp +@@ -35,11 +35,9 @@ void print_supported_fields(sinsp* inspector, plugin_utils& plugins, const std:: + { + std::vector field_infos; + std::vector> filtecheck_lists; // only used to retain memory until we finish +- std::vector sources = { s_syscall_source }; ++ std::vector sources = plugins.get_event_sources(inspector); + + // add event sources defined by the loaded plugins +- const auto& plugin_sources = plugins.get_event_sources(inspector); +- sources.insert(sources.end(), plugin_sources.begin(), plugin_sources.end()); + if (!source.empty()) + { + bool found = false; +@@ -66,7 +64,6 @@ void print_supported_fields(sinsp* inspector, plugin_utils& plugins, const std:: + } + + std::vector filterchecks; +- // todo(jasondellaluce): change this once we support extracting plugin fields from syscalls + if (src == s_syscall_source) + { + std::vector all_checks; +@@ -81,13 +78,11 @@ void print_supported_fields(sinsp* inspector, plugin_utils& plugins, const std:: + } + } + } +- else ++ ++ for (auto& check: plugins.get_filterchecks(inspector, src)) + { +- for (auto& check: plugins.get_filterchecks(inspector, src)) +- { +- filterchecks.push_back(check->get_fields()); +- filtecheck_lists.push_back(std::move(check)); +- } ++ filterchecks.push_back(check->get_fields()); ++ filtecheck_lists.push_back(std::move(check)); + } + + const auto classes = sinsp_filter_factory::check_infos_to_fieldclass_infos(filterchecks); + +From c8b0d055aec4d2378b7934dd9436fd4500d1021e Mon Sep 17 00:00:00 2001 +From: Jason Dellaluce +Date: Mon, 22 May 2023 14:15:23 +0000 +Subject: [PATCH 5/6] fix: solve compilation issues on windows + +Signed-off-by: Jason Dellaluce +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d28c6c67d..5afd967f27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,6 +148,9 @@ endif() + + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_EXTENSIONS OFF) ++if(MSVC OR WIN32) ++ add_compile_definitions(_HAS_STD_BYTE=0) ++endif() + + include(falcosecurity-libs) + include(yaml-cpp) + +From 954e6fc6238f21d4870a491395d68a7dd3062aa9 Mon Sep 17 00:00:00 2001 +From: Roberto Scolaro +Date: Mon, 5 Jun 2023 10:34:03 +0000 +Subject: [PATCH 6/6] update(cmake): bump libs 0.11.0 + driver 5.0.1 + +Signed-off-by: Roberto Scolaro +--- + CMakeLists.txt | 2 +- + cmake/modules/driver.cmake | 4 ++-- + cmake/modules/falcosecurity-libs.cmake | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5afd967f27..f3f23b5e9a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,7 +90,7 @@ if(NOT WIN32) + endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_COMMON_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_COMMON_FLAGS} -std=c++0x") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_COMMON_FLAGS} -std=c++17") + + set(CMAKE_C_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}") +diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake +index 7fd35d7f99..ca1e56718c 100644 +--- a/cmake/modules/driver.cmake ++++ b/cmake/modules/driver.cmake +@@ -31,8 +31,8 @@ else() + # In case you want to test against another driver version (or branch, or commit) just pass the variable - + # ie., `cmake -DDRIVER_VERSION=dev ..` + if(NOT DRIVER_VERSION) +- set(DRIVER_VERSION "5.0.0+driver") +- set(DRIVER_CHECKSUM "SHA256=c988ca7ac7d174f62d1bfbaaca49efd117f7b329f474d1b46b643635b2e35083") ++ set(DRIVER_VERSION "5.0.1+driver") ++ set(DRIVER_CHECKSUM "SHA256=8b197b916b6419dac8fb41807aa05d822164c7bfd2c3eef66d20d060a05a485a") + endif() + + # cd /path/to/build && cmake /path/to/source +diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake +index fe5dacd7ad..c626d7944e 100644 +--- a/cmake/modules/falcosecurity-libs.cmake ++++ b/cmake/modules/falcosecurity-libs.cmake +@@ -32,8 +32,8 @@ else() + # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - + # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` + if(NOT FALCOSECURITY_LIBS_VERSION) +- set(FALCOSECURITY_LIBS_VERSION "0.11.0-rc1") +- set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=bb6e57f66ae85dcda6e695226cd14082d9a1215902909cdde5b83f7abef44d8f") ++ set(FALCOSECURITY_LIBS_VERSION "0.11.0") ++ set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=90414d00591986e94f2c49e7d65eef5c2dedee266354dd3db8234bb3b06c86fa") + endif() + + # cd /path/to/build && cmake /path/to/source diff --git a/srcpkgs/sysdig/patches/falcosecurity-libs-nodownload.patch b/srcpkgs/sysdig/patches/falcosecurity-libs-nodownload.patch new file mode 100644 index 000000000000..467cffacba2f --- /dev/null +++ b/srcpkgs/sysdig/patches/falcosecurity-libs-nodownload.patch @@ -0,0 +1,28 @@ +diff --git a/cmake/modules/driver-repo/CMakeLists.txt b/cmake/modules/driver-repo/CMakeLists.txt +index 479611a..5238121 100644 +--- a/cmake/modules/driver-repo/CMakeLists.txt ++++ b/cmake/modules/driver-repo/CMakeLists.txt +@@ -25,8 +25,7 @@ message(STATUS "Driver version: ${DRIVER_VERSION}") + + ExternalProject_Add( + driver +- URL "https://github.com/falcosecurity/libs/archive/${DRIVER_VERSION}.tar.gz" +- URL_HASH "${DRIVER_CHECKSUM}" ++ URL "${CMAKE_CURRENT_SOURCE_DIR}/../../../../libs-${DRIVER_VERSION}" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" +diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt +index 2059547..74e78e2 100644 +--- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt ++++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt +@@ -25,8 +25,7 @@ message(STATUS "Libs version: ${FALCOSECURITY_LIBS_VERSION}") + + ExternalProject_Add( + falcosecurity-libs +- URL "https://github.com/falcosecurity/libs/archive/${FALCOSECURITY_LIBS_VERSION}.tar.gz" +- URL_HASH "${FALCOSECURITY_LIBS_CHECKSUM}" ++ URL "${CMAKE_CURRENT_SOURCE_DIR}/../../../../libs-${FALCOSECURITY_LIBS_VERSION}" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 4a04e762468c..d088357125b8 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,43 +1,47 @@ # Template file for 'sysdig' pkgname=sysdig -version=0.28.0 -revision=8 +version=0.31.5 +revision=1 +_falcover=0.11.0 build_style=cmake +build_wrksrc="sysdig-${version}" configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF -DLUA_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/luajit-2.1 - -DLUA_LIBRARY=/usr/lib/libluajit-5.1.so -DCREATE_TEST_TARGETS=OFF" -make_cmd=make + -DLUA_LIBRARY=/usr/lib/libluajit-5.1.so -DCREATE_TEST_TARGETS=OFF + -DUSE_BUNDLED_TBB=OFF -DBUILD_LIBSCAP_EXAMPLES=OFF + -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF + -DDRIVER_VERSION=${_falcover}" hostmakedepends="wget pkg-config protobuf" -makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel +makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel - tbb-devel zlib-devel" + tbb-devel zlib-devel yaml-cpp-devel json-c++" depends="dkms" short_desc="Open source system-level exploration and troubleshooting tool" maintainer="Orphaned " license="Apache-2.0, MIT, GPL-2.0-only" homepage="http://www.sysdig.org/" changelog="https://github.com/draios/sysdig/releases" -distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz" -checksum=817e595d501acf3fe11dc659a154aadbba848dd87ae801f5bf34a42e84979f37 -disable_parallel_build=yes +distfiles="https://github.com/draios/sysdig/archive/${version}.tar.gz + https://github.com/falcosecurity/libs/archive/${_falcover}.tar.gz" +checksum="9af98cae7c38273f7429ba0df628c9745bd92c949f444e180b9dd800af14c6dd + 90414d00591986e94f2c49e7d65eef5c2dedee266354dd3db8234bb3b06c86fa" dkms_modules="scap 2160111cd088aea9ae2235d3385ecb0b1ab6623c" nocross=yes +patch_args="-Np1 --directory=${build_wrksrc}" case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -DMUSL_OPTIMIZED_BUILD=On" esac -export CMAKE_GENERATOR="Unix Makefiles" - # Avoid excessive warnings spam to the log CXXFLAGS="-Wno-deprecated-declarations" -CXXFLAGS+=" -I/usr/include/grpc_absl" +post_patch() { + patch -d "${wrksrc}/libs-${_falcover}" -Np1 < "${FILESDIR}/libsinsp-zstd.patch" -post_extract() { vsed -e 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' -i scripts/CMakeLists.txt - vsed -e 's|-std=c++0x||' -i CMakeLists.txt + vsed -e 's|-std=c++0x||' -i CMakeLists.txt -i "${wrksrc}/libs-${_falcover}/cmake/modules/CompilerFlags.cmake" } post_install() { From 18652c885518a0500ac2a96e725bf0d0e2339cff Mon Sep 17 00:00:00 2001 From: John Date: Sun, 2 Jul 2023 13:36:29 +0200 Subject: [PATCH 31/35] protobuf-c: rebuild against 23.3 --- ...4f3fd85a205eb7c90b790477d5415364209e.patch | 44 +++ srcpkgs/protobuf-c/patches/66a0b0d2.patch | 308 ++++++++++++++++++ srcpkgs/protobuf-c/template | 8 +- 3 files changed, 358 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch create mode 100644 srcpkgs/protobuf-c/patches/66a0b0d2.patch diff --git a/srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch b/srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch new file mode 100644 index 000000000000..7d1e97032d32 --- /dev/null +++ b/srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch @@ -0,0 +1,44 @@ +From 66574f3fd85a205eb7c90b790477d5415364209e Mon Sep 17 00:00:00 2001 +From: Steve Peters +Date: Sat, 24 Jun 2023 22:15:42 -0700 +Subject: [PATCH] Use FileDescriptorLegacy for deprecated syntax() + +--- + protoc-c/c_file.cc | 2 +- + protoc-c/c_helpers.h | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc +index 59c1824e..4b60b889 100644 +--- a/protoc-c/c_file.cc ++++ b/protoc-c/c_file.cc +@@ -119,7 +119,7 @@ void FileGenerator::GenerateHeader(io::Printer* printer) { + + int min_header_version = 1000000; + #if defined(HAVE_PROTO3) +- if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) { ++ if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) { + min_header_version = 1003000; + } + #endif +diff --git a/protoc-c/c_helpers.h b/protoc-c/c_helpers.h +index 7598a4e1..87deea24 100644 +--- a/protoc-c/c_helpers.h ++++ b/protoc-c/c_helpers.h +@@ -67,6 +67,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -172,7 +173,7 @@ int compare_name_indices_by_name(const void*, const void*); + // This wrapper is needed to be able to compile against protobuf2. + inline int FieldSyntax(const FieldDescriptor* field) { + #ifdef HAVE_PROTO3 +- return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2; ++ return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2; + #else + return 2; + #endif diff --git a/srcpkgs/protobuf-c/patches/66a0b0d2.patch b/srcpkgs/protobuf-c/patches/66a0b0d2.patch new file mode 100644 index 000000000000..790db6329120 --- /dev/null +++ b/srcpkgs/protobuf-c/patches/66a0b0d2.patch @@ -0,0 +1,308 @@ +From 66a0b0d205224f63f19dd8f96abf9dcdc2112331 Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Wed, 29 Mar 2023 14:25:17 +0800 +Subject: [PATCH] add support of protobuf 4.22.x + +after upgrade the protobuf to 4.22.x, the protobuf-c cannot compile anymore (#544) due to following changes: +1.protobuf using c++14, that cause the command_line_interface.h report error +2.protobuf using abseil-cpp library instead the trace API with GOOGLE_ header +3. removed GOOGLE_DISALLOW_EVIL_CONSTRUCTORS +--- + Makefile.am | 2 +- + configure.ac | 8 ++++++++ + protoc-c/c_bytes_field.h | 1 - + protoc-c/c_enum.h | 1 - + protoc-c/c_enum_field.h | 1 - + protoc-c/c_extension.h | 1 - + protoc-c/c_field.cc | 2 +- + protoc-c/c_field.h | 3 --- + protoc-c/c_file.h | 1 - + protoc-c/c_generator.h | 2 -- + protoc-c/c_helpers.cc | 4 ++-- + protoc-c/c_message.cc | 4 ++-- + protoc-c/c_message.h | 1 - + protoc-c/c_message_field.h | 3 --- + protoc-c/c_primitive_field.cc | 6 +++--- + protoc-c/c_primitive_field.h | 3 --- + protoc-c/c_service.h | 1 - + protoc-c/c_string_field.h | 1 - + 18 files changed, 17 insertions(+), 28 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c7339efe..3b0d1d66 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ AM_CPPFLAGS = \ + -I${top_builddir} \ + -I${top_srcdir} + AM_CFLAGS = ${my_CFLAGS} +-AM_LDFLAGS = ++AM_LDFLAGS = ${ABSL_LOG_INTERNAL_CHECK_OP_LIBS} ${ABSL_LOG_RAW_HASH_SET_LIBS} + + # code coverage + +diff --git a/configure.ac b/configure.ac +index f5a0261e..8ed549ac 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,6 +78,14 @@ if test "x$enable_protoc" != "xno"; then + + AX_CXX_COMPILE_STDCXX(11, noext, mandatory) + ++# now checking 4.22.x protobuf, if so, set cxx as 17 ++ AS_IF([pkg-config --atleast-version 4.22.0 protobuf],[AX_CXX_COMPILE_STDCXX(17, noext, mandatory)]) ++ ++ AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op], ++ [PKG_CHECK_MODULES([ABSL_LOG_RAW_HASH_SET], [absl_raw_hash_set], [], [AC_MSG_ERROR([Missing absl_raw_hash_set library.])])], ++ [AC_MSG_ERROR([Missing absl_log_internal_check_op library.])])]) ++ + PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], + [proto3_supported=yes], + [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])] +diff --git a/protoc-c/c_bytes_field.h b/protoc-c/c_bytes_field.h +index bf873f0f..8fc63d35 100644 +--- a/protoc-c/c_bytes_field.h ++++ b/protoc-c/c_bytes_field.h +@@ -88,7 +88,6 @@ class BytesFieldGenerator : public FieldGenerator { + private: + std::map variables_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(BytesFieldGenerator); + }; + + +diff --git a/protoc-c/c_enum.h b/protoc-c/c_enum.h +index 9c34b697..d5e58f0a 100644 +--- a/protoc-c/c_enum.h ++++ b/protoc-c/c_enum.h +@@ -107,7 +107,6 @@ class EnumGenerator { + const EnumDescriptor* descriptor_; + std::string dllexport_decl_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_enum_field.h b/protoc-c/c_enum_field.h +index 3f8c005d..03eb4028 100644 +--- a/protoc-c/c_enum_field.h ++++ b/protoc-c/c_enum_field.h +@@ -86,7 +86,6 @@ class EnumFieldGenerator : public FieldGenerator { + private: + std::map variables_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator); + }; + + +diff --git a/protoc-c/c_extension.h b/protoc-c/c_extension.h +index 95413885..9c5797d6 100644 +--- a/protoc-c/c_extension.h ++++ b/protoc-c/c_extension.h +@@ -99,7 +99,6 @@ class ExtensionGenerator { + std::string type_traits_; + std::string dllexport_decl_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_field.cc b/protoc-c/c_field.cc +index 0716744a..4abdc6d3 100644 +--- a/protoc-c/c_field.cc ++++ b/protoc-c/c_field.cc +@@ -231,7 +231,7 @@ FieldGeneratorMap::~FieldGeneratorMap() {} + + const FieldGenerator& FieldGeneratorMap::get( + const FieldDescriptor* field) const { +- GOOGLE_CHECK_EQ(field->containing_type(), descriptor_); ++ ABSL_CHECK_EQ(field->containing_type(), descriptor_); + return *field_generators_[field->index()]; + } + +diff --git a/protoc-c/c_field.h b/protoc-c/c_field.h +index 3cad35d3..76d3b0bc 100644 +--- a/protoc-c/c_field.h ++++ b/protoc-c/c_field.h +@@ -104,8 +104,6 @@ class FieldGenerator { + const std::string &descriptor_addr) const; + const FieldDescriptor *descriptor_; + +- private: +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator); + }; + + // Convenience class which constructs FieldGenerators for a Descriptor. +@@ -122,7 +120,6 @@ class FieldGeneratorMap { + + static FieldGenerator* MakeGenerator(const FieldDescriptor* field); + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap); + }; + + } // namespace c +diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h +index 8dfd8ba0..ec55906e 100644 +--- a/protoc-c/c_file.h ++++ b/protoc-c/c_file.h +@@ -104,7 +104,6 @@ class FileGenerator { + std::unique_ptr[]> service_generators_; + std::unique_ptr[]> extension_generators_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_generator.h b/protoc-c/c_generator.h +index ac1ffafe..92601164 100644 +--- a/protoc-c/c_generator.h ++++ b/protoc-c/c_generator.h +@@ -94,8 +94,6 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator { + OutputDirectory* output_directory, + std::string* error) const; + +- private: +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc +index 6fd0cd3a..1eaeeb42 100644 +--- a/protoc-c/c_helpers.cc ++++ b/protoc-c/c_helpers.cc +@@ -286,7 +286,7 @@ const char* const kKeywordList[] = { + + std::set MakeKeywordsMap() { + std::set result; +- for (int i = 0; i < GOOGLE_ARRAYSIZE(kKeywordList); i++) { ++ for (int i = 0; i < ABSL_ARRAYSIZE(kKeywordList); i++) { + result.insert(kKeywordList[i]); + } + return result; +@@ -548,7 +548,7 @@ std::string CEscape(const std::string& src) { + std::unique_ptr dest(new char[dest_length]); + const int len = CEscapeInternal(src.data(), src.size(), + dest.get(), dest_length, false); +- GOOGLE_DCHECK_GE(len, 0); ++ ABSL_DCHECK_GE(len, 0); + return std::string(dest.get(), len); + } + +diff --git a/protoc-c/c_message.cc b/protoc-c/c_message.cc +index 37e8bf8b..c7e85155 100755 +--- a/protoc-c/c_message.cc ++++ b/protoc-c/c_message.cc +@@ -499,7 +499,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool gen_init) { + // NOTE: not supported by protobuf + vars["maybe_static"] = ""; + vars["field_dv_ctype"] = "{ ... }"; +- GOOGLE_LOG(DFATAL) << "Messages can't have default values!"; ++ ABSL_LOG(FATAL) << "Messages can't have default values!"; + break; + case FieldDescriptor::CPPTYPE_STRING: + if (fd->type() == FieldDescriptor::TYPE_BYTES || opt.string_as_bytes()) +@@ -521,7 +521,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool gen_init) { + break; + } + default: +- GOOGLE_LOG(DFATAL) << "Unknown CPPTYPE"; ++ ABSL_LOG(FATAL) << "Unknown CPPTYPE"; + break; + } + if (!already_defined) +diff --git a/protoc-c/c_message.h b/protoc-c/c_message.h +index ea1c3ab3..e90782bf 100644 +--- a/protoc-c/c_message.h ++++ b/protoc-c/c_message.h +@@ -137,7 +137,6 @@ class MessageGenerator { + std::unique_ptr[]> enum_generators_; + std::unique_ptr[]> extension_generators_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_message_field.h b/protoc-c/c_message_field.h +index 39b8d999..42efe368 100644 +--- a/protoc-c/c_message_field.h ++++ b/protoc-c/c_message_field.h +@@ -83,9 +83,6 @@ class MessageFieldGenerator : public FieldGenerator { + std::string GetDefaultValue(void) const; + void GenerateStaticInit(io::Printer* printer) const; + +- private: +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator); + }; + + +diff --git a/protoc-c/c_primitive_field.cc b/protoc-c/c_primitive_field.cc +index 6990893f..d5a7b60c 100644 +--- a/protoc-c/c_primitive_field.cc ++++ b/protoc-c/c_primitive_field.cc +@@ -99,7 +99,7 @@ void PrimitiveFieldGenerator::GenerateStructMembers(io::Printer* printer) const + case FieldDescriptor::TYPE_STRING : + case FieldDescriptor::TYPE_BYTES : + case FieldDescriptor::TYPE_GROUP : +- case FieldDescriptor::TYPE_MESSAGE : GOOGLE_LOG(FATAL) << "not a primitive type"; break; ++ case FieldDescriptor::TYPE_MESSAGE : ABSL_LOG(FATAL) << "not a primitive type"; break; + + // No default because we want the compiler to complain if any new + // types are added. +@@ -143,7 +143,7 @@ std::string PrimitiveFieldGenerator::GetDefaultValue() const + case FieldDescriptor::CPPTYPE_BOOL: + return descriptor_->default_value_bool() ? "1" : "0"; + default: +- GOOGLE_LOG(DFATAL) << "unexpected CPPTYPE in c_primitive_field"; ++ ABSL_LOG(FATAL) << "unexpected CPPTYPE in c_primitive_field"; + return "UNEXPECTED_CPPTYPE"; + } + } +@@ -197,7 +197,7 @@ void PrimitiveFieldGenerator::GenerateDescriptorInitializer(io::Printer* printer + case FieldDescriptor::TYPE_STRING : + case FieldDescriptor::TYPE_BYTES : + case FieldDescriptor::TYPE_GROUP : +- case FieldDescriptor::TYPE_MESSAGE : GOOGLE_LOG(FATAL) << "not a primitive type"; break; ++ case FieldDescriptor::TYPE_MESSAGE : ABSL_LOG(FATAL) << "not a primitive type"; break; + + // No default because we want the compiler to complain if any new + // types are added. +diff --git a/protoc-c/c_primitive_field.h b/protoc-c/c_primitive_field.h +index a9eb893b..d2bb7243 100644 +--- a/protoc-c/c_primitive_field.h ++++ b/protoc-c/c_primitive_field.h +@@ -83,9 +83,6 @@ class PrimitiveFieldGenerator : public FieldGenerator { + std::string GetDefaultValue(void) const; + void GenerateStaticInit(io::Printer* printer) const; + +- private: +- +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_service.h b/protoc-c/c_service.h +index 27125a60..4737ff3b 100644 +--- a/protoc-c/c_service.h ++++ b/protoc-c/c_service.h +@@ -101,7 +101,6 @@ class ServiceGenerator { + const ServiceDescriptor* descriptor_; + std::map vars_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator); + }; + + } // namespace c +diff --git a/protoc-c/c_string_field.h b/protoc-c/c_string_field.h +index 513cea75..ba258e44 100644 +--- a/protoc-c/c_string_field.h ++++ b/protoc-c/c_string_field.h +@@ -88,7 +88,6 @@ class StringFieldGenerator : public FieldGenerator { + private: + std::map variables_; + +- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator); + }; + + diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index 7d1b529d8936..e703b138152d 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,10 +1,10 @@ # Template file for 'protobuf-c' pkgname=protobuf-c version=1.4.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable protoc)" -hostmakedepends="pkg-config protobuf protobuf-devel" +hostmakedepends="pkg-config protobuf protobuf-devel automake libtool" makedepends="protobuf-devel boost-devel $(vopt_if protoc libprotoc-devel)" short_desc="C implementation of the Google Protocol Buffers" maintainer="Enno Boland " @@ -17,6 +17,10 @@ build_options="protoc" build_options_default="protoc" desc_option_protoc="Build protoc-c compiler" +pre_configure() { + autoreconf -if +} + post_install() { vlicense LICENSE } From 06ce9eef2c589e3fa80db753cb1abeaf733c39a7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 2 Jul 2023 21:07:55 +0200 Subject: [PATCH 32/35] netdata: update to 1.40.1. --- srcpkgs/netdata/patches/cpp17.patch | 11 +++++++++++ srcpkgs/netdata/template | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/netdata/patches/cpp17.patch diff --git a/srcpkgs/netdata/patches/cpp17.patch b/srcpkgs/netdata/patches/cpp17.patch new file mode 100644 index 000000000000..b197ccd57bd9 --- /dev/null +++ b/srcpkgs/netdata/patches/cpp17.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2023-06-27 16:25:03.364605041 +0200 ++++ - 2023-07-02 21:27:31.113408278 +0200 +@@ -237,7 +237,7 @@ + # C++ version check + + # Check for C++17 support (optional) +-# AX_CXX_COMPILE_STDCXX(17, noext, optional) ++AX_CXX_COMPILE_STDCXX(17, noext, optional) + + if test "x$HAVE_CXX17" != "x1"; then + # Check for C++11 support (optional) diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index 781120b3f275..9065c5140361 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,14 +1,14 @@ # Template file for 'netdata' pkgname=netdata -version=1.37.1 -revision=2 +version=1.40.1 +revision=1 build_style=gnu-configure build_helper=qemu configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no $(vopt_if cloud --enable-cloud --disable-cloud) $(vopt_if ipmi --enable-plugin-freeipmi) $(vopt_if xen --enable-plugin-xenstat) $(vopt_if cups --enable-plugin-cups)" hostmakedepends="pkg-config autoconf automake $(vopt_if cloud "protobuf protobuf-devel")" -makedepends="json-c-devel libcap-devel liblz4-devel libmnl-devel +makedepends="json-c-devel libcap-devel liblz4-devel libmnl-devel libyaml-devel libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel snappy-devel $(vopt_if cloud protobuf-devel) $(vopt_if ipmi freeipmi-devel) $(vopt_if xen "xen-devel yajl-devel") $(vopt_if cups cups-devel)" @@ -18,7 +18,7 @@ maintainer="Michael Aldridge " license="GPL-3.0-or-later" homepage="https://www.netdata.cloud/" distfiles="https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz" -checksum=2caa042d43ca61007a61294a5ececa037d83a1973bd38032233760341eb1706b +checksum=cc86172acd5e6ec05bc0fa86a50d967502a264d8adf7f79293923ccd8febb251 python_version=3 make_dirs=" /var/lib/netdata 0755 _netdata _netdata @@ -43,6 +43,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi pre_configure() { + vsed -e 's/#define info(/#define netdata_log_info(/g' -i libnetdata/log/log.h + vsed -e 's/^\([ ]*\)info[ ]*(/\1netdata_log_info(/g' -i $(grep -rl '^[ ]*info *(' ./) + vsed -e 's/^\([ ]*\)else info(/\1else netdata_log_info(/g' -i $(grep -rl '^[ ]*else info(' ./) + vsed -e 's/^\([ ]*\)if(\([^)]*\))[ ]*info(/\1if(\2) netdata_log_info(/g' -i $(grep -rl '^[ ]*if.*info(' ./) + if [ "$CROSS_BUILD" ]; then sed -i "s| \$(builddir)/judyltablesgen\$(EXEEXT)| qemu-${XBPS_TARGET_QEMU_MACHINE}-static \$(builddir)/judyltablesgen\$(EXEEXT)|g" Makefile.am fi From 96ef51008edaef3bcedf0f718b1afba4675b1032 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 8 Jul 2023 12:47:51 +0200 Subject: [PATCH 33/35] strawberry: rebuild against protobuf-23.3_1 --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index b42efa1b89b2..91f2e07a0ec0 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=1.0.17 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config protobuf gettext" makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel From 46dc260376731d4f508d32fed9f2ffb641bc1905 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 8 Jul 2023 12:47:51 +0200 Subject: [PATCH 34/35] libphonenumber: rebuild against protobuf-23.3_1 --- srcpkgs/libphonenumber/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template index f554714b3c7a..058939459f6a 100644 --- a/srcpkgs/libphonenumber/template +++ b/srcpkgs/libphonenumber/template @@ -1,7 +1,7 @@ # Template file for 'libphonenumber' pkgname=libphonenumber version=8.12.39 -revision=12 +revision=13 build_wrksrc=cpp build_style=cmake build_helper=qemu From 7080395e2bb9200d0168a2cb33d188c4a5f6161a Mon Sep 17 00:00:00 2001 From: John Date: Tue, 11 Jul 2023 09:10:32 +0200 Subject: [PATCH 35/35] fixup! sysdig: update to 0.31.5. --- srcpkgs/sysdig/files/libsinsp-absl-protobuf.patch | 11 +++++++++++ srcpkgs/sysdig/template | 1 + 2 files changed, 12 insertions(+) create mode 100644 srcpkgs/sysdig/files/libsinsp-absl-protobuf.patch diff --git a/srcpkgs/sysdig/files/libsinsp-absl-protobuf.patch b/srcpkgs/sysdig/files/libsinsp-absl-protobuf.patch new file mode 100644 index 000000000000..387be65954e6 --- /dev/null +++ b/srcpkgs/sysdig/files/libsinsp-absl-protobuf.patch @@ -0,0 +1,11 @@ +--- a/userspace/libsinsp/CMakeLists.txt 2023-06-05 10:25:32.000000000 +0200 ++++ - 2023-07-11 09:03:42.496439385 +0200 +@@ -289,7 +289,7 @@ + endif() + endif() # NOT WIN32 + +- ++LIST(APPEND SINSP_LIBRARIES absl_log_internal_message absl_log_internal_nullguard) + target_link_libraries(sinsp ${SINSP_LIBRARIES}) + + if(APPLE) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index d088357125b8..0f2260a928ed 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -39,6 +39,7 @@ CXXFLAGS="-Wno-deprecated-declarations" post_patch() { patch -d "${wrksrc}/libs-${_falcover}" -Np1 < "${FILESDIR}/libsinsp-zstd.patch" + patch -d "${wrksrc}/libs-${_falcover}" -Np1 < "${FILESDIR}/libsinsp-absl-protobuf.patch" vsed -e 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' -i scripts/CMakeLists.txt vsed -e 's|-std=c++0x||' -i CMakeLists.txt -i "${wrksrc}/libs-${_falcover}/cmake/modules/CompilerFlags.cmake"