From 48fbabe35fc65168a696e0748384c371e7044146 Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 1 Apr 2020 12:10:31 +0200 Subject: [PATCH 1/3] libsignal-protocol-c: update to 2.3.3 --- .../patches/00-new-commits.patch | 98 ------------------- srcpkgs/libsignal-protocol-c/template | 6 +- 2 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 srcpkgs/libsignal-protocol-c/patches/00-new-commits.patch diff --git a/srcpkgs/libsignal-protocol-c/patches/00-new-commits.patch b/srcpkgs/libsignal-protocol-c/patches/00-new-commits.patch deleted file mode 100644 index 76666f81c44..00000000000 --- a/srcpkgs/libsignal-protocol-c/patches/00-new-commits.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git CMakeLists.txt CMakeLists.txt -index b31796d..d95fd3f 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -19,6 +19,7 @@ SET(INSTALL_PKGCONFIG_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "Installatio - - INCLUDE(CheckSymbolExists) - INCLUDE(CheckCCompilerFlag) -+INCLUDE(TestBigEndian) - - CHECK_SYMBOL_EXISTS(memset_s "string.h" HAVE_MEMSET_S) - -@@ -50,6 +51,11 @@ IF(HAVE_MEMSET_S) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MEMSET_S=1") - ENDIF(HAVE_MEMSET_S) - -+TEST_BIG_ENDIAN(WORDS_BIGENDIAN) -+IF(WORDS_BIGENDIAN) -+ ADD_DEFINITIONS(-DWORDS_BIGENDIAN) -+ENDIF(WORDS_BIGENDIAN) -+ - IF(COVERAGE) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") - SET(LINK_FLAGS "${LINK_FLAGS} -fprofile-arcs -ftest-coverage") -diff --git tests/test_common.c tests/test_common.c -index f15003c..03f95ee 100644 ---- tests/test_common.c -+++ tests/test_common.c -@@ -845,3 +845,11 @@ void setup_test_sender_key_store(signal_protocol_store_context *context, signal_ - - signal_protocol_store_context_set_sender_key_store(context, &store); - } -+ -+#ifndef __OpenBSD__ -+void srand_deterministic(unsigned int seed) -+{ -+ srand(seed); -+} -+#endif -+ -diff --git tests/test_common.h tests/test_common.h -index 66ddc6a..db54c12 100644 ---- tests/test_common.h -+++ tests/test_common.h -@@ -84,4 +84,10 @@ int test_sender_key_store_load_sender_key(signal_buffer **record, signal_buffer - void test_sender_key_store_destroy(void *user_data); - void setup_test_sender_key_store(signal_protocol_store_context *context, signal_context *global_context); - -+/* Portability */ -+#ifndef __OpenBSD__ -+/* OpenBSD extension */ -+void srand_deterministic(unsigned int seed); -+#endif -+ - #endif /* TEST_COMMON_H */ -diff --git tests/test_common_openssl.c tests/test_common_openssl.c -index abcb208..ab5dc9b 100644 ---- tests/test_common_openssl.c -+++ tests/test_common_openssl.c -@@ -1,5 +1,6 @@ - #include "test_common.h" - -+#include - #include - #include - #include -diff --git tests/test_session_builder.c tests/test_session_builder.c -index 5c475c6..cc388cd 100644 ---- tests/test_session_builder.c -+++ tests/test_session_builder.c -@@ -1426,9 +1426,9 @@ void run_interaction(signal_protocol_store_context *alice_store, signal_protocol - } - - time_t seed = time(0); -- srand(seed); -+ srand_deterministic(seed); - shuffle_buffers(alice_ooo_plaintext, 10); -- srand(seed); -+ srand_deterministic(seed); - shuffle_buffers(alice_ooo_ciphertext, 10); - fprintf(stderr, "Shuffled Alice->Bob messages created\n"); - -diff --git tests/test_session_cipher.c tests/test_session_cipher.c -index e761fda..419f87a 100644 ---- tests/test_session_cipher.c -+++ tests/test_session_cipher.c -@@ -206,9 +206,9 @@ void generate_test_message_collections(session_cipher *cipher, signal_buffer **p - - /* Randomize the two arrays using the same seed */ - time_t seed = time(0); -- srand(seed); -+ srand_deterministic(seed); - shuffle_buffers(plaintext_messages, size); -- srand(seed); -+ srand_deterministic(seed); - shuffle_buffers(ciphertext_messages, size); - } - diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template index 2df9268c33f..2f60b284e44 100644 --- a/srcpkgs/libsignal-protocol-c/template +++ b/srcpkgs/libsignal-protocol-c/template @@ -1,7 +1,7 @@ # Template file for 'libsignal-protocol-c' pkgname=libsignal-protocol-c -version=2.3.2 -revision=2 +version=2.3.3 +revision=1 build_style=cmake configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE=ON" makedepends="libressl-devel" @@ -11,7 +11,7 @@ maintainer="teldra " license="GPL-3.0-or-later" homepage="https://www.whispersystems.org/" distfiles="https://github.com/signalapp/libsignal-protocol-c/archive/v${version}.tar.gz" -checksum=f3826f3045352e14027611c95449bfcfe39bfd3d093d578c70f70eee0c85000d +checksum=c22e7690546e24d46210ca92dd808f17c3102e1344cd2f9a370136a96d22319d if [ "${XBPS_CHECK_PKGS}" ]; then configure_args+=" -DBUILD_TESTING=1" From 8f546e4ed729d5e65a62908ad971872c460198eb Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 1 Apr 2020 12:11:22 +0200 Subject: [PATCH 2/3] dino: revbump for libsignal-protocol-c --- srcpkgs/dino/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template index e80f36a9785..2b51a06331a 100644 --- a/srcpkgs/dino/template +++ b/srcpkgs/dino/template @@ -1,7 +1,7 @@ # Template file for 'dino' pkgname=dino version=0.1.0 -revision=1 +revision=2 build_style=cmake configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON" make_cmd=ninja From 56945b2931230abd9fdc6208c0e5213b101816ba Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 1 Apr 2020 12:11:22 +0200 Subject: [PATCH 3/3] profanity: revbump for libsignal-protocol-c --- srcpkgs/profanity/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template index 2dccec1bd38..a034dcc59dc 100644 --- a/srcpkgs/profanity/template +++ b/srcpkgs/profanity/template @@ -1,7 +1,7 @@ # Template file for 'profanity' pkgname=profanity version=0.8.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable notify notifications) $(vopt_enable otr) $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)