ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-08-16 11:31:19 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

(#11215) serf: Update to support Visual Studio 2022 and openssl 3.x

Browse Source 
* serf: Update to support Visual Studio 2022

0003-1.3.9-scons-msvc.patch - update patch for msvc-2022 version 14.3

* serf: bump zlib

* serf: update to openssl/3.0.3

0005-1.3.9-serf-openssl-3.x.patch
add new patch replacing ERR_GET_FUNC with ERR_GET_REASON
(ERR_GET_FUNC was removed in openssl 3.x)

patch adapted from debian 1.3.9-11, see debian bug #1006572

Co-authored-by: James McCoy <jamessan@debian.org>

Co-authored-by: Srivatsala Kotakonda <kotakondasrivatsala@johndeere.com>
Co-authored-by: James McCoy <jamessan@debian.org>
This commit is contained in:
Kevin Puetz
2022-06-22 03:44:14 -05:00
committed by GitHub
parent 345b1f7d57
commit 26d0a1ebc7
4 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/serf/all/conandata.yml
View File

@@ -15,3 +15,5 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/0004-1.3.9-scons-python-spaces.patch"
base_path: "source_subfolder"
- patch_file: "patches/0005-1.3.9-serf-openssl-3.x.patch"
base_path: "source_subfolder"

6
recipes/serf/all/conanfile.py
View File

@@ -40,11 +40,11 @@ class SerfConan(ConanFile):
def requirements(self):
self.requires("apr-util/1.6.1")
self.requires("zlib/1.2.11")
self.requires("openssl/1.1.1g")
self.requires("zlib/1.2.12")
self.requires("openssl/3.0.3")
def build_requirements(self):
self.build_requires("scons/3.1.2")
self.build_requires("scons/4.3.0")
def source(self):
tools.get(**self.conan_data["sources"][self.version])

2
recipes/serf/all/patches/0003-1.3.9-scons-msvc.patch
View File

@@ -5,7 +5,7 @@
"Visual C++ to use for building (E.g. 11.0, 9.0)",
None,
- allowed_values=('14.0', '12.0',
+ allowed_values=('14.2', "14.1", '14.0', '12.0',
+ allowed_values=('14.3', '14.2', '14.1', '14.0', '12.0',
'11.0', '10.0', '9.0', '8.0', '6.0')
),

30
recipes/serf/all/patches/0005-1.3.9-serf-openssl-3.x.patch Normal file
View File

@@ -0,0 +1,30 @@
Subject: Fix build with OpenSSL 3
Author: James McCoy <jamessan@debian.org>
Origin: https://salsa.debian.org/jamessan/serf/-/blob/500faae58ca4a8f84c2c4a485c81ed4867be57a6/debian/patches/openssl-3.x
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006572
Remove use of ERR_GET_FUNC when it's not defined, as is the case with OpenSSL >= 3.
See https://www.openssl.org/news/cl30.txt
* The ERR_GET_FUNC() function was removed. With the loss of meaningful
function codes, this function can only cause problems for calling
applications.
--- buckets/ssl_buckets.c
+++ buckets/ssl_buckets.c
@@ -1325,9 +1325,14 @@ static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey)
return 0;
}
else {
+#ifdef ERR_GET_FUNC
printf("OpenSSL cert error: %d %d %d\n", ERR_GET_LIB(err),
ERR_GET_FUNC(err),
ERR_GET_REASON(err));
+#else
+ printf("OpenSSL cert error: %d %d\n", ERR_GET_LIB(err),
+ ERR_GET_REASON(err));
+#endif
PKCS12_free(p12);
bio_meth_free(biom);
}