From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02197158649 for ; Thu, 11 May 2023 21:05:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CEA8E0877; Thu, 11 May 2023 21:05:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B9B7E0863 for ; Thu, 11 May 2023 21:05:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BEC033BE4E for ; Thu, 11 May 2023 21:05:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5557990 for ; Thu, 11 May 2023 21:05:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1683839116.c91cafb9e46fa580f698a54eecf1752aab89ab2a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/serf/files/, net-libs/serf/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/serf/files/serf-1.3.9-libressl.patch net-libs/serf/serf-1.3.9-r3.ebuild net-libs/serf/serf-1.3.9-r4.ebuild X-VCS-Directories: net-libs/serf/ net-libs/serf/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c91cafb9e46fa580f698a54eecf1752aab89ab2a X-VCS-Branch: master Date: Thu, 11 May 2023 21:05:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f68395d5-5787-43fc-8445-dbbba3cf3527 X-Archives-Hash: 16316eb5a9c9f0e35dc3c4245520275e commit: c91cafb9e46fa580f698a54eecf1752aab89ab2a Author: orbea riseup net> AuthorDate: Thu May 11 14:37:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 11 21:05:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91cafb9 net-libs/serf: fix dev-vcs/subversion build fail With the previous backported LibreSSL patch the build in dev-vcs/subversion fails with an undefined reference to CRYPTO_malloc_init() which should be used with LibreSSL and not OpenSSL. To avoid this unintended issue the patch is changed to check only for LIBRESSL_VERSION_NUMBER. When the next serf release happens this patch can be removed and the new upstream cmake build system may be preferable. Closes: https://bugs.gentoo.org/906123 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/30992 Signed-off-by: Sam James gentoo.org> net-libs/serf/files/serf-1.3.9-libressl.patch | 28 +++++----------------- .../{serf-1.3.9-r3.ebuild => serf-1.3.9-r4.ebuild} | 2 +- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch index 1c437e81bc05..bfb07bd5a0ad 100644 --- a/net-libs/serf/files/serf-1.3.9-libressl.patch +++ b/net-libs/serf/files/serf-1.3.9-libressl.patch @@ -1,3 +1,8 @@ +This backported patch avoids the upstream scons check to prevent unintended +issues and can be removed next release bump where it may be preferable to +use the newer cmake build system. + +https://bugs.gentoo.org/906123 https://bugs.gentoo.org/903001 https://github.com/apache/serf/commit/df0d2d0dbdf88576f26da9c71df3ab6249d351dc @@ -14,28 +19,7 @@ Subject: [PATCH] Fix another build problem with LibreSSL. of USE_LEGACY_OPENSSL. git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68 ---- - SConstruct | 6 ++++++ - buckets/ssl_buckets.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) -diff --git a/SConstruct b/SConstruct -index 4358a23..115f409 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -373,6 +373,12 @@ else: - env.Append(CPPPATH=['$OPENSSL/include']) - env.Append(LIBPATH=['$OPENSSL/lib']) - -+ # Check for OpenSSL functions which are only available in some of -+ # the versions we support. Also handles forks like LibreSSL. -+ conf = Configure(env) -+ if conf.CheckFunc('OPENSSL_malloc_init'): -+ env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT']) -+ env = conf.Finish() - - # If build with gssapi, get its information and define SERF_HAVE_GSSAPI - if gssapi and CALLOUT_OKAY: diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c index b01e535..27c84c7 100644 --- a/buckets/ssl_buckets.c @@ -45,7 +29,7 @@ index b01e535..27c84c7 100644 #endif -#ifdef USE_OPENSSL_1_1_API -+#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT ++#ifndef LIBRESSL_VERSION_NUMBER OPENSSL_malloc_init(); #else CRYPTO_malloc_init(); diff --git a/net-libs/serf/serf-1.3.9-r3.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild similarity index 97% rename from net-libs/serf/serf-1.3.9-r3.ebuild rename to net-libs/serf/serf-1.3.9-r4.ebuild index 7464e14dba6d..8ea7ea9652d6 100644 --- a/net-libs/serf/serf-1.3.9-r3.ebuild +++ b/net-libs/serf/serf-1.3.9-r4.ebuild @@ -34,7 +34,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.9-python3-check.patch "${FILESDIR}"/${PN}-1.3.9-openssl-3-bio-ctrl.patch "${FILESDIR}"/${PN}-1.3.9-openssl-3-errgetfunc.patch - "${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001 + "${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001, 906123 ) src_prepare() {