From 84e446d926821a7d715d6b02d0df1e6fcd9e479c Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 1 Jun 2023 20:58:10 +0200 Subject: [PATCH] up to 1.3.10 --- bio-ctrl.patch | 21 --------------------- openssl3.patch | 12 ------------ python3.patch | 27 --------------------------- serf.spec | 12 +++--------- 4 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 bio-ctrl.patch delete mode 100644 openssl3.patch delete mode 100644 python3.patch diff --git a/bio-ctrl.patch b/bio-ctrl.patch deleted file mode 100644 index b679edf..0000000 --- a/bio-ctrl.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c -index b01e5359db08..3c8b7e2a685f 100644 ---- a/buckets/ssl_buckets.c -+++ b/buckets/ssl_buckets.c -@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio) - - static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) - { -- long ret = 1; -+ long ret = 0; - - switch (cmd) { - default: -@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr) - break; - case BIO_CTRL_FLUSH: - /* At this point we can't force a flush. */ -+ ret = 1; - break; - case BIO_CTRL_PUSH: - case BIO_CTRL_POP: diff --git a/openssl3.patch b/openssl3.patch deleted file mode 100644 index 329bb3e..0000000 --- a/openssl3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- serf-1.3.9/buckets/ssl_buckets.c~ 2016-06-30 17:45:07.000000000 +0200 -+++ serf-1.3.9/buckets/ssl_buckets.c 2021-09-29 22:19:11.602245223 +0200 -@@ -1325,8 +1325,7 @@ - return 0; - } - else { -- printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err), -- ERR_GET_FUNC(err), -+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err), - ERR_GET_REASON(err)); - PKCS12_free(p12); - bio_meth_free(biom); diff --git a/python3.patch b/python3.patch deleted file mode 100644 index e555e18..0000000 --- a/python3.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix: - -TypeError: cannot use a string pattern on a bytes-like object: -https://github.com/apache/serf/commit/9d30108b630b77f732ef94d1642b159066ffd890 - -SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)? -https://github.com/apache/serf/commit/1c0241847e845a8da265aa89f297d3db6ae483b1 ---- SConstruct.orig 2015-09-17 07:46:24.000000000 -0500 -+++ SConstruct 2022-08-09 18:04:36.000000000 -0500 -@@ -167,7 +167,7 @@ - match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' - 'SERF_MINOR_VERSION ([0-9]+).*' - 'SERF_PATCH_VERSION ([0-9]+)', -- env.File('serf.h').get_contents(), -+ env.File('serf.h').get_contents().decode('utf-8'), - re.DOTALL) - MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] - env.Append(MAJOR=str(MAJOR)) -@@ -184,7 +184,7 @@ - - unknown = opts.UnknownVariables() - if unknown: -- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) -+ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) - - apr = str(env['APR']) - apu = str(env['APU']) diff --git a/serf.spec b/serf.spec index 9ff159e..878834c 100644 --- a/serf.spec +++ b/serf.spec @@ -6,16 +6,13 @@ Summary: A high-performance asynchronous HTTP client library Summary(pl.UTF-8): Wysokowydajna biblioteka asynchronicznego klienta HTTP Name: serf -Version: 1.3.9 -Release: 6 +Version: 1.3.10 +Release: 1 License: Apache v2.0 Group: Libraries Source0: https://downloads.apache.org/serf/%{name}-%{version}.tar.bz2 -# Source0-md5: 370a6340ff20366ab088012cd13f2b57 +# Source0-md5: 5320087299084c297eff8e1dacfab1af Patch0: %{name}-scons.patch -Patch1: openssl3.patch -Patch2: bio-ctrl.patch -Patch3: python3.patch URL: https://serf.apache.org/ BuildRequires: apr-devel BuildRequires: apr-util-devel @@ -70,9 +67,6 @@ Statyczne biblioteki serf. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 %build %scons \ -- 2.44.0