* Re: [PR PATCH] [Updated] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
@ 2023-01-30 17:08 ` dkwo
2023-01-30 17:12 ` dkwo
` (31 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 17:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update distfiles, bump for openssl
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5536 bytes --]
From ff8a3afd38bcc584191292f8076007452dbe6eaa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update, patch
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 21 +++++----
4 files changed, 98 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..304eb047b2bb 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,24 +1,29 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
-makedepends="boost-devel openssl-devel"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON \
+ -DWITH_AS3=OFF \
+ -DWITH_JAVA=OFF \
+ -DWITH_JAVASCRIPT=OFF \
+ -DWITH_NODEJS=OFF \
+ -DWITH_PYTHON=OFF"
+makedepends="boost-devel openssl-devel flex"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
2023-01-30 17:08 ` [PR PATCH] [Updated] " dkwo
@ 2023-01-30 17:12 ` dkwo
2023-01-30 17:13 ` dkwo
` (30 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update distfiles, bump for openssl
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5561 bytes --]
From 8aade36870851de3c404c39ce69ecb0b44aa3819 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update, patch
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 22 ++++++----
4 files changed, 99 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..184e81816879 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,24 +1,30 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
-makedepends="boost-devel openssl-devel"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON \
+ -DWITH_AS3=OFF \
+ -DWITH_JAVA=OFF \
+ -DWITH_JAVASCRIPT=OFF \
+ -DWITH_NODEJS=OFF \
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
+makedepends="boost-devel openssl-devel flex"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
2023-01-30 17:08 ` [PR PATCH] [Updated] " dkwo
2023-01-30 17:12 ` dkwo
@ 2023-01-30 17:13 ` dkwo
2023-01-30 18:15 ` [PR REVIEW] " Duncaen
` (29 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1409005306
Comment:
actually update it
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (2 preceding siblings ...)
2023-01-30 17:13 ` dkwo
@ 2023-01-30 18:15 ` Duncaen
2023-01-30 18:16 ` Duncaen
` (28 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Duncaen @ 2023-01-30 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1090983051
Comment:
indent with single space.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (3 preceding siblings ...)
2023-01-30 18:15 ` [PR REVIEW] " Duncaen
@ 2023-01-30 18:16 ` Duncaen
2023-01-30 18:18 ` [PR PATCH] [Updated] " dkwo
` (27 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Duncaen @ 2023-01-30 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1090983285
Comment:
`\` is not needed in double quotes.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (4 preceding siblings ...)
2023-01-30 18:16 ` Duncaen
@ 2023-01-30 18:18 ` dkwo
2023-01-30 18:18 ` [PR REVIEW] " dkwo
` (26 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 18:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update distfiles, bump for openssl
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5770 bytes --]
From c591c26dda9113a249c121eaf759e7cc571ea2ea Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update, patch
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 23 ++++++----
4 files changed, 99 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..de9a6f5f4282 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,24 +1,30 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
-makedepends="boost-devel openssl-devel"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON \
+ -DWITH_AS3=OFF \
+ -DWITH_JAVA=OFF \
+ -DWITH_JAVASCRIPT=OFF \
+ -DWITH_NODEJS=OFF \
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
+makedepends="boost-devel openssl-devel flex"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
@@ -35,7 +41,6 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (5 preceding siblings ...)
2023-01-30 18:18 ` [PR PATCH] [Updated] " dkwo
@ 2023-01-30 18:18 ` dkwo
2023-01-30 18:21 ` [PR PATCH] [Updated] " dkwo
` (25 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 18:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1090986346
Comment:
done.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (6 preceding siblings ...)
2023-01-30 18:18 ` [PR REVIEW] " dkwo
@ 2023-01-30 18:21 ` dkwo
2023-01-30 18:22 ` dkwo
` (24 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update distfiles, bump for openssl
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5760 bytes --]
From 427a380246040766ac5730b417e70c0ac16b9b11 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update, patch
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 23 ++++++----
4 files changed, 99 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..9d4d10deaa37 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,24 +1,30 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
-makedepends="boost-devel openssl-devel"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
+makedepends="boost-devel openssl-devel flex"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
@@ -35,7 +41,6 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update distfiles, bump for openssl
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (7 preceding siblings ...)
2023-01-30 18:21 ` [PR PATCH] [Updated] " dkwo
@ 2023-01-30 18:22 ` dkwo
2023-02-01 16:10 ` [PR REVIEW] thrift: update (openssl3) kruceter
` (23 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-01-30 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update distfiles, bump for openssl
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5760 bytes --]
From b42f89e3974e42d4501d74a47974ce230b3eb868 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update, patch
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 23 ++++++----
4 files changed, 99 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..c89c5a506eaf 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,24 +1,30 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
-makedepends="boost-devel openssl-devel"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
+makedepends="boost-devel openssl-devel flex"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=54c30b6ac27d62aee29e8d07831c1c785bf7ed8cd351e84130abe7d4f564335d
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
@@ -35,7 +41,6 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (8 preceding siblings ...)
2023-01-30 18:22 ` dkwo
@ 2023-02-01 16:10 ` kruceter
2023-02-01 16:10 ` kruceter
` (22 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: kruceter @ 2023-02-01 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1093420825
Comment:
Is `flex` really necessary for `makedepends`?
At first I assumed it has to do something with cross, but alas - it builds with just `flex` in `hostmakedepends`.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (9 preceding siblings ...)
2023-02-01 16:10 ` [PR REVIEW] thrift: update (openssl3) kruceter
@ 2023-02-01 16:10 ` kruceter
2023-02-01 16:10 ` kruceter
` (21 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: kruceter @ 2023-02-01 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1093418253
Comment:
Please triple-check the checkum value because it mismatched locally. Github *loves* to make life unbearable.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (10 preceding siblings ...)
2023-02-01 16:10 ` kruceter
@ 2023-02-01 16:10 ` kruceter
2023-02-01 16:12 ` Duncaen
` (20 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: kruceter @ 2023-02-01 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1093427537
Comment:
```suggestion
configure_args="-DBUILD_SHARED_LIBS=ON -DWITH_AS3=OFF -DWITH_JAVA=OFF
-DWITH_JAVASCRIPT=OFF -DWITH_NODEJS=OFF -DWITH_PYTHON=OFF"
```
I do not think every option should be splattered one per line; correct me if I am wrong though.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (11 preceding siblings ...)
2023-02-01 16:10 ` kruceter
@ 2023-02-01 16:12 ` Duncaen
2023-02-01 16:33 ` dkwo
` (19 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Duncaen @ 2023-02-01 16:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1093439250
Comment:
This is fine imho, I do the same.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (12 preceding siblings ...)
2023-02-01 16:12 ` Duncaen
@ 2023-02-01 16:33 ` dkwo
2023-02-01 16:33 ` [PR REVIEW] " dkwo
` (18 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-01 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1412356489
Comment:
> There is also a `sed` command in the template which should be replaced to `vsed`, but I myself am not sure who ever build on ppc64* these days.
I'll do as you say, but I did not check the ppc builds.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (13 preceding siblings ...)
2023-02-01 16:33 ` dkwo
@ 2023-02-01 16:33 ` dkwo
2023-02-01 16:34 ` dkwo
` (17 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-01 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1093465196
Comment:
ok, let me try
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (14 preceding siblings ...)
2023-02-01 16:33 ` [PR REVIEW] " dkwo
@ 2023-02-01 16:34 ` dkwo
2023-02-01 16:35 ` [PR PATCH] [Updated] " dkwo
` (16 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-01 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1093466195
Comment:
yes, github changed something two or more times the other day..
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (15 preceding siblings ...)
2023-02-01 16:34 ` dkwo
@ 2023-02-01 16:35 ` dkwo
2023-02-01 16:35 ` dkwo
` (15 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-01 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5943 bytes --]
From 33490b743842fb29e78dd3a5ae8f3d1ea6487846 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.17.0, patch for openssl3
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 23 ++++++----
4 files changed, 99 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..03ea5ee334fa 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,7 +41,6 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (16 preceding siblings ...)
2023-02-01 16:35 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-01 16:35 ` dkwo
2023-02-03 23:20 ` kruceter
` (14 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-01 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5943 bytes --]
From b6ea3e9140018de31561ff4dd5862c4deb3bd494 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.17.0, patch for openssl3
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 23 ++++++----
4 files changed, 99 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..03ea5ee334fa 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,7 +41,6 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (17 preceding siblings ...)
2023-02-01 16:35 ` dkwo
@ 2023-02-03 23:20 ` kruceter
2023-02-03 23:26 ` [PR REVIEW] " paper42
` (13 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: kruceter @ 2023-02-03 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1416519568
Comment:
@Vaelatern, if you may?
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (18 preceding siblings ...)
2023-02-03 23:20 ` kruceter
@ 2023-02-03 23:26 ` paper42
2023-02-04 16:26 ` [PR PATCH] [Updated] " dkwo
` (12 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2023-02-03 23:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1096377901
Comment:
```suggestion
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
```
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (19 preceding siblings ...)
2023-02-03 23:26 ` [PR REVIEW] " paper42
@ 2023-02-04 16:26 ` dkwo
2023-02-04 16:27 ` [PR REVIEW] " dkwo
` (11 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-04 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5970 bytes --]
From d1ba2cb019afa5e05934473bf2cf44f8987938e6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.17.0, patch for openssl3
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 24 ++++++----
4 files changed, 100 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..2b4b29b48b84 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,8 +41,8 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (20 preceding siblings ...)
2023-02-04 16:26 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-04 16:27 ` dkwo
2023-02-05 15:43 ` [PR PATCH] [Updated] " dkwo
` (10 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-04 16:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#discussion_r1096556513
Comment:
Done
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (21 preceding siblings ...)
2023-02-04 16:27 ` [PR REVIEW] " dkwo
@ 2023-02-05 15:43 ` dkwo
2023-02-05 18:05 ` dkwo
` (9 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-05 15:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5970 bytes --]
From f84da687c4863e421eb7439ccbeca81f38802a2f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.17.0, patch for openssl3
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 24 ++++++----
4 files changed, 100 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..2b4b29b48b84 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,8 +41,8 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (22 preceding siblings ...)
2023-02-05 15:43 ` [PR PATCH] [Updated] " dkwo
@ 2023-02-05 18:05 ` dkwo
2023-03-06 18:20 ` [PR PATCH] [Updated] " dkwo
` (8 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-02-05 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1418203294
Comment:
This test was passing before on x86:
```
383/408 Test #383: TServerIntegrationTest ...........***Exception: SegFault 3.85 sec
terminate called after throwing an instance of 'std::system_error'
what(): Resource temporarily unavailable
Running 13 test cases...
unknown location(0): fatal error: in "constructors/test_threaded_stress": signal: SIGABRT (application abort requested)
/builddir/thrift-0.17.0/lib/cpp/test/TServerIntegrationTest.cpp(373): last checkpoint: "test_threaded_stress" test entry
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
terminate called recursively
unknown location(0): fatal error: in "constructors/test_threadpool_factory": signal: SIGABRT (application abort requested)
/builddir/thrift-0.17.0/lib/cpp/test/TServerIntegrationTest.cpp(378): last checkpoint: "test_threadpool_factory" test entry
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
terminate called recursively
unknown location(0): fatal error: in "constructors/test_threadpool": signal: SIGABRT (application abort requested)
/builddir/thrift-0.17.0/lib/cpp/test/TServerIntegrationTest.cpp(393): last checkpoint: "test_threadpool" test entry
```
Could the failure be triggered by some change in the containers?
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (23 preceding siblings ...)
2023-02-05 18:05 ` dkwo
@ 2023-03-06 18:20 ` dkwo
2023-03-14 21:18 ` dkwo
` (7 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-03-06 18:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5970 bytes --]
From 5257370cc7934a6b35b104b7150f46eb65402ab2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.17.0, patch for openssl3
---
srcpkgs/thrift/patches/missing-signal-h.patch | 17 +++++++
srcpkgs/thrift/patches/musl-libc-locale.patch | 24 ++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 24 ++++++----
4 files changed, 100 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/missing-signal-h.patch
create mode 100644 srcpkgs/thrift/patches/musl-libc-locale.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/missing-signal-h.patch b/srcpkgs/thrift/patches/missing-signal-h.patch
new file mode 100644
index 000000000000..ec1ea196b0e8
--- /dev/null
+++ b/srcpkgs/thrift/patches/missing-signal-h.patch
@@ -0,0 +1,17 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/missing-signal-h.patch
+
+Add missing include for signal.h
+--- a/lib/cpp/test/TNonblockingSSLServerTest.cpp
++++ b/lib/cpp/test/TNonblockingSSLServerTest.cpp
+@@ -30,6 +30,10 @@
+
+ #include <event.h>
+
++#ifdef __linux__
++#include <signal.h>
++#endif
++
+ using namespace apache::thrift;
+ using apache::thrift::concurrency::Guard;
+ using apache::thrift::concurrency::Monitor;
+
diff --git a/srcpkgs/thrift/patches/musl-libc-locale.patch b/srcpkgs/thrift/patches/musl-libc-locale.patch
new file mode 100644
index 000000000000..2480c687d6dc
--- /dev/null
+++ b/srcpkgs/thrift/patches/musl-libc-locale.patch
@@ -0,0 +1,24 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/musl-libc-locale.patch
+
+Skip tests using locale functionality
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("en-US.UTF-8"));
+ #else
+- std::locale::global(std::locale("en_US.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+ }
+@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+ #ifdef _WIN32
+ std::locale::global(std::locale("de-DE.UTF-8"));
+ #else
+- std::locale::global(std::locale("de_DE.UTF-8"));
++ // musl libc has no locale support
+ #endif
+ BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+ BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..2b4b29b48b84 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.17.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=f5888bcd3b8de40c2c2ab86896867ad9b18510deb412cba3e5da76fb4c604c29
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,8 +41,8 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (24 preceding siblings ...)
2023-03-06 18:20 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-14 21:18 ` dkwo
2023-06-02 15:16 ` [PR PATCH] [Updated] " dkwo
` (6 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-03-14 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1418203294
Comment:
This test was passing before on x86:
```
383/408 Test #383: TServerIntegrationTest ...........***Exception: SegFault 3.85 sec
terminate called after throwing an instance of 'std::system_error'
what(): Resource temporarily unavailable
Running 13 test cases...
unknown location(0): fatal error: in "constructors/test_threaded_stress": signal: SIGABRT (application abort requested)
/builddir/thrift-0.17.0/lib/cpp/test/TServerIntegrationTest.cpp(373): last checkpoint: "test_threaded_stress" test entry
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
terminate called recursively
unknown location(0): fatal error: in "constructors/test_threadpool_factory": signal: SIGABRT (application abort requested)
/builddir/thrift-0.17.0/lib/cpp/test/TServerIntegrationTest.cpp(378): last checkpoint: "test_threadpool_factory" test entry
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
Thrift: Sun Feb 5 15:50:46 2023 TSocket::open() connect() <Host: 127.0.0.1 Port: 32931>: Connection refused
terminate called recursively
unknown location(0): fatal error: in "constructors/test_threadpool": signal: SIGABRT (application abort requested)
/builddir/thrift-0.17.0/lib/cpp/test/TServerIntegrationTest.cpp(393): last checkpoint: "test_threadpool" test entry
```
Could the failure be triggered by some change in the containers?
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (25 preceding siblings ...)
2023-03-14 21:18 ` dkwo
@ 2023-06-02 15:16 ` dkwo
2023-06-02 15:58 ` dkwo
` (5 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-06-02 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 3920 bytes --]
From d5e8d9da70d7e0981dc954f71c51209b6f6273c3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.18.1, patch out old tls tests
---
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 24 ++++++----
2 files changed, 59 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..1912cfb7ed33 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.18.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=9cea30b9700153329ae1926cc05a20bbe3e8451ae270b0c8c5c5fe9929924cb3
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,8 +41,8 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (26 preceding siblings ...)
2023-06-02 15:16 ` [PR PATCH] [Updated] " dkwo
@ 2023-06-02 15:58 ` dkwo
2023-06-02 16:04 ` [PR PATCH] [Updated] " dkwo
` (4 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-06-02 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 797 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1573963937
Comment:
updated to 0.18, removed patches, now one glibc test fails:
```
17/44 Test #17: UnitTests ........................***Failed 1.32 sec
Running 60 test cases...
unknown location(0): fatal error: in "ToStringTest/locale_de_DE_floating_point_to_string": std::runtime_error: locale::facet::_S_create_c_locale name not valid
/builddir/thrift-0.18.1/lib/cpp/test/ToStringTest.cpp(57): last checkpoint: "locale_de_DE_floating_point_to_string" test entry
An error message from getaddrinfo on the console is expected:
Thrift: Fri Jun 2 15:23:52 2023 getaddrinfo() -> -2; Name or service not known
*** 1 failure is detected in the test module "thrift"
```
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (27 preceding siblings ...)
2023-06-02 15:58 ` dkwo
@ 2023-06-02 16:04 ` dkwo
2023-06-02 16:13 ` dkwo
` (3 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-06-02 16:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages O3thrift
https://github.com/void-linux/void-packages/pull/41967
thrift: update (openssl3)
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
A patch file from https://github.com/void-linux/void-packages/pull/41967.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3thrift-41967.patch --]
[-- Type: text/x-diff, Size: 5631 bytes --]
From 42856c8606edaaee4b6266f9b2778babd284b729 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 14:03:20 -0500
Subject: [PATCH] thrift: update to 0.18.1, patch out old tls and broken tests
---
srcpkgs/thrift/patches/network-tests.patch | 39 ++++++++++++++++
.../thrift/patches/skip-old-tls-tests.patch | 44 +++++++++++++++++++
srcpkgs/thrift/template | 24 ++++++----
3 files changed, 98 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/thrift/patches/network-tests.patch
create mode 100644 srcpkgs/thrift/patches/skip-old-tls-tests.patch
diff --git a/srcpkgs/thrift/patches/network-tests.patch b/srcpkgs/thrift/patches/network-tests.patch
new file mode 100644
index 000000000000..49aa667752b7
--- /dev/null
+++ b/srcpkgs/thrift/patches/network-tests.patch
@@ -0,0 +1,39 @@
+From https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/thrift/files/thrift-0.16.0-network-tests.patch
+
+diff --git a/lib/cpp/test/ToStringTest.cpp b/lib/cpp/test/ToStringTest.cpp
+index 736b33c0a..f66909873 100644
+--- a/lib/cpp/test/ToStringTest.cpp
++++ b/lib/cpp/test/ToStringTest.cpp
+@@ -41,31 +41,6 @@ BOOST_AUTO_TEST_CASE(base_types_to_string) {
+ BOOST_CHECK_EQUAL(to_string("abc"), "abc");
+ }
+
+-// NOTE: Currently (as of 2021.08.12) the locale-based tests do not work on
+-// Windows in the AppVeyor Thrift CI build correctly. Therefore disabled on
+-// Windows:
+-#ifndef _WIN32
+-BOOST_AUTO_TEST_CASE(locale_en_US_int_to_string) {
+-#ifdef _WIN32
+- std::locale::global(std::locale("en-US.UTF-8"));
+-#else
+- std::locale::global(std::locale("en_US.UTF-8"));
+-#endif
+- BOOST_CHECK_EQUAL(to_string(1000000), "1000000");
+-}
+-
+-BOOST_AUTO_TEST_CASE(locale_de_DE_floating_point_to_string) {
+-#ifdef _WIN32
+- std::locale::global(std::locale("de-DE.UTF-8"));
+-#else
+- std::locale::global(std::locale("de_DE.UTF-8"));
+-#endif
+- BOOST_CHECK_EQUAL(to_string(1.5), "1.5");
+- BOOST_CHECK_EQUAL(to_string(1.5f), "1.5");
+- BOOST_CHECK_EQUAL(to_string(1.5L), "1.5");
+-}
+-#endif
+-
+ BOOST_AUTO_TEST_CASE(empty_vector_to_string) {
+ std::vector<int> l;
+ BOOST_CHECK_EQUAL(to_string(l), "[]");
+
diff --git a/srcpkgs/thrift/patches/skip-old-tls-tests.patch b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
new file mode 100644
index 000000000000..dafb5abe6e28
--- /dev/null
+++ b/srcpkgs/thrift/patches/skip-old-tls-tests.patch
@@ -0,0 +1,44 @@
+From: https://git.alpinelinux.org/aports/plain/community/thrift/skip-old-tls-tests.patch
+
+Skip TLSv1_0 and TLSv1_1 test cases
+--- a/lib/cpp/test/SecurityFromBufferTest.cpp
++++ b/lib/cpp/test/SecurityFromBufferTest.cpp
+@@ -224,6 +224,16 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) {
+ }
+ #endif
+
++ if (si == 3 || ci == 3) {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4) {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%") % protocol2str(si)
+--- a/lib/cpp/test/SecurityTest.cpp
++++ b/lib/cpp/test/SecurityTest.cpp
+@@ -250,6 +250,18 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
+ }
+ #endif
+
++ if (si == 3 || ci == 3)
++ {
++ // Skip all TLSv1_0 cases - protocol not supported
++ continue;
++ }
++
++ if (si == 4 || ci == 4)
++ {
++ // Skip all TLSv1_1 cases - protocol not supported
++ continue;
++ }
++
+ boost::mutex::scoped_lock lock(mMutex);
+
+ BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")
+
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 9ac4bb481c30..1912cfb7ed33 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,31 +1,37 @@
# Template file for 'thrift'
pkgname=thrift
-version=0.13.0
-revision=6
-build_style=gnu-configure
-configure_args="--without-python"
+version=0.18.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON
+ -DWITH_AS3=OFF
+ -DWITH_JAVA=OFF
+ -DWITH_JAVASCRIPT=OFF
+ -DWITH_NODEJS=OFF
+ -DWITH_PYTHON=OFF"
+hostmakedepends="flex"
makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://thrift.apache.org/"
-distfiles="http://www-us.apache.org/dist/thrift/${version}/thrift-${version}.tar.gz"
-checksum=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
+distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz"
+checksum=9cea30b9700153329ae1926cc05a20bbe3e8451ae270b0c8c5c5fe9929924cb3
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
if [ "$CROSS_BUILD" ]; then
- configure_args+=" --disable-tests --disable-tutorial"
+ configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF"
fi
post_configure() {
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
ppc*)
- sed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
+ vsed -i '/libthrift_la_LIBADD/s/$/ -latomic/' lib/cpp/Makefile
;;
esac
}
@@ -35,8 +41,8 @@ thrift-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (28 preceding siblings ...)
2023-06-02 16:04 ` [PR PATCH] [Updated] " dkwo
@ 2023-06-02 16:13 ` dkwo
2023-06-28 20:42 ` dkwo
` (2 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-06-02 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1573984911
Comment:
working now
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (29 preceding siblings ...)
2023-06-02 16:13 ` dkwo
@ 2023-06-28 20:42 ` dkwo
2023-06-28 20:48 ` Bnyro
2023-06-28 20:52 ` [PR PATCH] [Merged]: " Duncaen
32 siblings, 0 replies; 34+ messages in thread
From: dkwo @ 2023-06-28 20:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1612078121
Comment:
@Duncaen Can this be merged?
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (30 preceding siblings ...)
2023-06-28 20:42 ` dkwo
@ 2023-06-28 20:48 ` Bnyro
2023-06-28 20:52 ` [PR PATCH] [Merged]: " Duncaen
32 siblings, 0 replies; 34+ messages in thread
From: Bnyro @ 2023-06-28 20:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New comment by Bnyro on void-packages repository
https://github.com/void-linux/void-packages/pull/41967#issuecomment-1612086077
Comment:
(also addresses https://github.com/void-linux/void-packages/issues/42403)
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Merged]: thrift: update (openssl3)
2023-01-30 15:26 [PR PATCH] thrift: update distfiles, bump for openssl dkwo
` (31 preceding siblings ...)
2023-06-28 20:48 ` Bnyro
@ 2023-06-28 20:52 ` Duncaen
32 siblings, 0 replies; 34+ messages in thread
From: Duncaen @ 2023-06-28 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
There's a merged pull request on the void-packages repository
thrift: update (openssl3)
https://github.com/void-linux/void-packages/pull/41967
Description:
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
required to build with openssl3 #37681
^ permalink raw reply [flat|nested] 34+ messages in thread