aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Gansterer <paroga@paroga.com>2021-02-13 18:47:06 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-02-13 20:15:15 +0000
commit7b6923004ce43bcb554321dbcad1300eebfc0d45 (patch)
treeb04b59e35a9378dbc3f58d38cbd718a20ce0e042
parent5130b687a871fc2c9baeee9bbbe7d1882530b76e (diff)
downloadaports-7b6923004ce43bcb554321dbcad1300eebfc0d45.tar.gz
aports-7b6923004ce43bcb554321dbcad1300eebfc0d45.tar.bz2
aports-7b6923004ce43bcb554321dbcad1300eebfc0d45.tar.xz
testing/thrift: upgrade to 0.14.0
-rw-r--r--testing/thrift/APKBUILD12
-rw-r--r--testing/thrift/fix-type-limits-warning.patch12
2 files changed, 21 insertions, 3 deletions
diff --git a/testing/thrift/APKBUILD b/testing/thrift/APKBUILD
index 30b435781b..118076d0b9 100644
--- a/testing/thrift/APKBUILD
+++ b/testing/thrift/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Patrick Gansterer <paroga@paroga.com>
pkgname=thrift
-pkgver=0.13.0
-pkgrel=1
+pkgver=0.14.0
+pkgrel=0
pkgdesc="Language-independent software stack for RPC implementation"
url="https://thrift.apache.org/"
arch="all !armhf" # multiple failing tests
@@ -10,9 +10,14 @@ makedepends="autoconf automake bison boost-dev boost-static flex
libevent-dev libtool openssl-dev zlib-dev"
subpackages="$pkgname-libs-cpp:libscpp $pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/apache/thrift/archive/v$pkgver.tar.gz
+ fix-type-limits-warning.patch
missing-signal-h.patch
"
+# secfixes:
+# 0.14.0-r0:
+# - CVE-2020-13949
+
prepare() {
default_prepare
./bootstrap.sh
@@ -47,5 +52,6 @@ libscpp() {
mv "$pkgdir"/usr/lib/*-*.so "$subpkgdir"/usr/lib
}
-sha512sums="1c310f87836c5da16964cff6ab463db00e86a0ba3dd978f601f042eb92a393abca5cd56602bf63e912e2a9b4b6ebfd1b16c1bf578e3f48e0769108cff2dc2f6d thrift-0.13.0.tar.gz
+sha512sums="01db630d4b6bfcae1da7cdb89da79a07d86d5b31f56c0a949826dfc7360f1874506a883a58b7de3317a8e54571c829e4dba93e96087c2a104a96768d7db5f7fd thrift-0.14.0.tar.gz
+e06680fc8148c3a7de7983da23dd1e82840d4f53f1d73e5f34d16034477246088295e1dcaaceec41d3de34925e5c289195435fa4f9eb3e665ad494f3ab7386da fix-type-limits-warning.patch
72db52532e03ab2c8bca03f61b427632eb0f7bf0bb29a2e90f2fab2a3775d589791083848236ed88b23eecb8c6a134b335669997df66f11483f2b614d946bd5b missing-signal-h.patch"
diff --git a/testing/thrift/fix-type-limits-warning.patch b/testing/thrift/fix-type-limits-warning.patch
new file mode 100644
index 0000000000..943d4def98
--- /dev/null
+++ b/testing/thrift/fix-type-limits-warning.patch
@@ -0,0 +1,12 @@
+Fix type-limits warning
+--- a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
++++ b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
+@@ -1063,7 +1063,7 @@ std::string t_delphi_generator::make_pascal_string_literal(std::string value) {
+
+ result << "'";
+ for (char const &c: value) {
+- if( (c >= 0) && (c < 32)) { // convert ctrl chars, but leave UTF-8 alone
++ if (c < 32) { // convert ctrl chars, but leave UTF-8 alone
+ result << "#" << (int)c;
+ } else if (c == '\'') {
+ result << "''"; // duplicate any single quotes we find