ricochet: Safety rebuild for protobuf

**Summary** Safety rebuild for protobuf. Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
getsolus · Mar 22, 2024 · 3df6ee9 · 3df6ee9
1 parent e3ed4e1
commit 3df6ee9
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 102 deletions.
diff --git a/packages/r/ricochet/abi_libs b/packages/r/ricochet/abi_libs
@@ -0,0 +1 @@
+ricochet
diff --git a/packages/r/ricochet/abi_symbols b/packages/r/ricochet/abi_symbols
@@ -0,0 +1,67 @@
+ricochet:__interceptor_sigaction
+ricochet:__interceptor_signal
+ricochet:__sanitizer_acquire_crash_state
+ricochet:__sanitizer_cov_dump
+ricochet:__sanitizer_cov_reset
+ricochet:__sanitizer_dump_coverage
+ricochet:__sanitizer_dump_trace_pc_guard_coverage
+ricochet:__sanitizer_get_module_and_offset_for_pc
+ricochet:__sanitizer_get_report_path
+ricochet:__sanitizer_install_malloc_and_free_hooks
+ricochet:__sanitizer_print_stack_trace
+ricochet:__sanitizer_set_death_callback
+ricochet:__sanitizer_set_report_fd
+ricochet:__sanitizer_set_report_path
+ricochet:__sanitizer_symbolize_global
+ricochet:__sanitizer_symbolize_pc
+ricochet:__ubsan_get_current_report_data
+ricochet:__ubsan_handle_add_overflow
+ricochet:__ubsan_handle_add_overflow_abort
+ricochet:__ubsan_handle_alignment_assumption
+ricochet:__ubsan_handle_alignment_assumption_abort
+ricochet:__ubsan_handle_builtin_unreachable
+ricochet:__ubsan_handle_cfi_bad_type
+ricochet:__ubsan_handle_cfi_check_fail
+ricochet:__ubsan_handle_cfi_check_fail_abort
+ricochet:__ubsan_handle_divrem_overflow
+ricochet:__ubsan_handle_divrem_overflow_abort
+ricochet:__ubsan_handle_dynamic_type_cache_miss
+ricochet:__ubsan_handle_dynamic_type_cache_miss_abort
+ricochet:__ubsan_handle_float_cast_overflow
+ricochet:__ubsan_handle_float_cast_overflow_abort
+ricochet:__ubsan_handle_function_type_mismatch_v1
+ricochet:__ubsan_handle_function_type_mismatch_v1_abort
+ricochet:__ubsan_handle_implicit_conversion
+ricochet:__ubsan_handle_implicit_conversion_abort
+ricochet:__ubsan_handle_invalid_builtin
+ricochet:__ubsan_handle_invalid_builtin_abort
+ricochet:__ubsan_handle_invalid_objc_cast
+ricochet:__ubsan_handle_invalid_objc_cast_abort
+ricochet:__ubsan_handle_load_invalid_value
+ricochet:__ubsan_handle_load_invalid_value_abort
+ricochet:__ubsan_handle_missing_return
+ricochet:__ubsan_handle_mul_overflow
+ricochet:__ubsan_handle_mul_overflow_abort
+ricochet:__ubsan_handle_negate_overflow
+ricochet:__ubsan_handle_negate_overflow_abort
+ricochet:__ubsan_handle_nonnull_arg
+ricochet:__ubsan_handle_nonnull_arg_abort
+ricochet:__ubsan_handle_nonnull_return_v1
+ricochet:__ubsan_handle_nonnull_return_v1_abort
+ricochet:__ubsan_handle_nullability_arg
+ricochet:__ubsan_handle_nullability_arg_abort
+ricochet:__ubsan_handle_nullability_return_v1
+ricochet:__ubsan_handle_nullability_return_v1_abort
+ricochet:__ubsan_handle_out_of_bounds
+ricochet:__ubsan_handle_out_of_bounds_abort
+ricochet:__ubsan_handle_pointer_overflow
+ricochet:__ubsan_handle_pointer_overflow_abort
+ricochet:__ubsan_handle_shift_out_of_bounds
+ricochet:__ubsan_handle_shift_out_of_bounds_abort
+ricochet:__ubsan_handle_sub_overflow
+ricochet:__ubsan_handle_sub_overflow_abort
+ricochet:__ubsan_handle_type_mismatch_v1
+ricochet:__ubsan_handle_type_mismatch_v1_abort
+ricochet:__ubsan_handle_vla_bound_not_positive
+ricochet:__ubsan_handle_vla_bound_not_positive_abort
+ricochet:__ubsan_vptr_type_cache
diff --git a/packages/r/ricochet/abi_used_libs b/packages/r/ricochet/abi_used_libs
@@ -5,9 +5,12 @@ libQt5Network.so.5
 libQt5Qml.so.5
 libQt5Quick.so.5
 libQt5Widgets.so.5
+libabsl_log_internal_check_op.so.2308.0.0
+libabsl_log_internal_message.so.2308.0.0
 libc.so.6
 libcrypto.so.3
 libgcc_s.so.1
-libprotobuf.so.32
+libm.so.6
+libprotobuf.so.25.3.0
+libresolv.so.2
 libstdc++.so.6
-libubsan.so.1
diff --git a/packages/r/ricochet/abi_used_symbols b/packages/r/ricochet/abi_used_symbols
diff --git a/packages/r/ricochet/files/0001-Use-C-17.patch b/packages/r/ricochet/files/0001-Use-C-17.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Evan Maddock <maddock.evan@vivaldi.net>
+Date: Wed, 20 Mar 2024 19:39:00 -0400
+Subject: [PATCH] Use C++17
+
+Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
+---
+ ricochet.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ricochet.pro b/ricochet.pro
+index 03ac281..0237805 100644
+--- a/ricochet.pro
++++ b/ricochet.pro
+@@ -36,7 +36,7 @@ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,1) {
+ TARGET = ricochet
+ TEMPLATE = app
+ QT += core gui network quick widgets multimedia
+-CONFIG += c++11
++CONFIG += c++17
+
+ VERSION = 1.1.4
+
diff --git a/packages/r/ricochet/package.yml b/packages/r/ricochet/package.yml
@@ -1,26 +1,29 @@
 name       : ricochet
 version    : 1.1.4
-release    : 18
+release    : 19
 source     :
     - https://github.com/ricochet-im/ricochet/archive/v1.1.4.tar.gz : 4eb9000bc3f6c6a18659479015af980c16f971d468d10410ebeac8ada720d2cd
+homepage   : https://github.com/ricochet-im/ricochet
 license    : BSD-3-Clause
 component  : network.im
 summary    : Anonymous metadata-resistant instant messaging that just works.
 description: |
     Ricochet is an experimental kind of instant messaging that doesn't trust anyone with your identity, your contact list, or your communications.
 builddeps  :
-    - pkgconfig(gl)
-    - pkgconfig(openssl)
-    - pkgconfig(protobuf)
     - pkgconfig(Qt5Help)
     - pkgconfig(Qt5Multimedia)
     - pkgconfig(Qt5Quick)
     - pkgconfig(Qt5Svg)
+    - pkgconfig(gl)
+    - pkgconfig(openssl)
+    - pkgconfig(protobuf)
 rundeps    :
     - qt5-multimedia
     - qt5-quickcontrols
     - tor
 setup      : |
+    %patch -p1 -i $pkgfiles/0001-Use-C-17.patch
+
     %qmake DEFINES+=RICOCHET_NO_PORTABLE ricochet.pro
 build      : |
     %make

diff --git a/packages/r/ricochet/pspec_x86_64.xml b/packages/r/ricochet/pspec_x86_64.xml
@@ -1,16 +1,17 @@
 <PISI>
     <Source>
         <Name>ricochet</Name>
+        <Homepage>https://github.com/ricochet-im/ricochet</Homepage>
         <Packager>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Evan Maddock</Name>
+            <Email>maddock.evan@vivaldi.net</Email>
         </Packager>
         <License>BSD-3-Clause</License>
         <PartOf>network.im</PartOf>
         <Summary xml:lang="en">Anonymous metadata-resistant instant messaging that just works.</Summary>
         <Description xml:lang="en">Ricochet is an experimental kind of instant messaging that doesn&apos;t trust anyone with your identity, your contact list, or your communications.
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://sources.getsol.us/README.Solus</Archive>
     </Source>
     <Package>
         <Name>ricochet</Name>
@@ -26,12 +27,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="18">
-            <Date>2023-08-21</Date>
+        <Update release="19">
+            <Date>2024-03-20</Date>
             <Version>1.1.4</Version>
             <Comment>Packaging update</Comment>
-            <Name>Reilly Brogan</Name>
-            <Email>solus@reillybrogan.com</Email>
+            <Name>Evan Maddock</Name>
+            <Email>maddock.evan@vivaldi.net</Email>
         </Update>
     </History>
 </PISI>