mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

serf: upgrade 1.3.9 -> 1.3.10

Browse Source 
As serf is undead, we need to reassess all the remaining patches.

(From OE-Core rev: 775cbcc876edcb6c339f342a3253f5afcf6ef163)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-06-14 11:29:08 +02:00
committed by Richard Purdie
parent 2b9ef6d640
commit 98ed91039a
5 changed files with 2 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch
View File

@@ -1,29 +0,0 @@
From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 3 Sep 2018 10:50:08 -0700
Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building
with most recent scons version.
* SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python
3.0 and 2.7.
Upstream-Status: Backport
[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
SConstruct | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index 1670459..18a45fa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
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'])

28
meta/recipes-support/serf/serf/0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch
View File

@@ -1,28 +0,0 @@
From 2f45711a66ff99886b6e4a5708e2db01a63e5af4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 10 Sep 2021 11:05:10 +0200
Subject: [PATCH] buckets/ssl_buckets.c: do not use ERR_GET_FUNC
Upstream removed it in
https://github.com/openssl/openssl/pull/16004
Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
buckets/ssl_buckets.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
index b01e535..9801f87 100644
--- a/buckets/ssl_buckets.c
+++ b/buckets/ssl_buckets.c
@@ -1325,8 +1325,7 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey)
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);

29
meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
View File

@@ -1,29 +0,0 @@
From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 3 Sep 2018 11:12:38 -0700
Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and
Python3
* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
TypeError: cannot use a string pattern on a bytes-like object
Upstream-Status: Backport
[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
SConstruct | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index 877731e..7678bb1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -169,7 +169,7 @@ env.Append(BUILDERS = {
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))

2
meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch
View File

@@ -31,7 +31,7 @@ ERROR: scons install execution failed.
and the installed paths (including the paths inside libserf*.pc)
look correct
Upstream-Status: Inactive-Upstream [lastrelease: 2015, lastcommit: 2019]
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

6
meta/recipes-support/serf/serf_1.3.9.bb → meta/recipes-support/serf/serf_1.3.10.bb
View File

@@ -7,16 +7,12 @@ HOMEPAGE = "http://serf.apache.org/"
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://norpath.patch \
file://env.patch \
file://0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch \
file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \
file://0003-gen_def.patch \
file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \
file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \
file://0001-buckets-ssl_buckets.c-do-not-use-ERR_GET_FUNC.patch \
"
SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57"
SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"
SRC_URI[sha256sum] = "be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"