From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] thrift: update (openssl3)
Date: Fri, 02 Jun 2023 18:04:22 +0200 [thread overview]
Message-ID: <20230602160422.FHNl8Coh9iPWnwunmHBkTcB49orWYHwyr95e4D9nHIM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41967@inbox.vuxu.org>
[-- 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
}
}
next prev parent reply other threads:[~2023-06-02 16:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2023-01-30 18:16 ` Duncaen
2023-01-30 18:18 ` [PR PATCH] [Updated] " dkwo
2023-01-30 18:18 ` [PR REVIEW] " dkwo
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
2023-02-01 16:10 ` kruceter
2023-02-01 16:10 ` kruceter
2023-02-01 16:12 ` Duncaen
2023-02-01 16:33 ` dkwo
2023-02-01 16:33 ` [PR REVIEW] " dkwo
2023-02-01 16:34 ` dkwo
2023-02-01 16:35 ` [PR PATCH] [Updated] " dkwo
2023-02-01 16:35 ` dkwo
2023-02-03 23:20 ` kruceter
2023-02-03 23:26 ` [PR REVIEW] " paper42
2023-02-04 16:26 ` [PR PATCH] [Updated] " dkwo
2023-02-04 16:27 ` [PR REVIEW] " dkwo
2023-02-05 15:43 ` [PR PATCH] [Updated] " dkwo
2023-02-05 18:05 ` dkwo
2023-03-06 18:20 ` [PR PATCH] [Updated] " dkwo
2023-03-14 21:18 ` dkwo
2023-06-02 15:16 ` [PR PATCH] [Updated] " dkwo
2023-06-02 15:58 ` dkwo
2023-06-02 16:04 ` dkwo [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230602160422.FHNl8Coh9iPWnwunmHBkTcB49orWYHwyr95e4D9nHIM@z \
--to=dkwo@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).