public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-openssl/, dev-lua/lua-openssl/files/
Date: Wed,  9 Aug 2023 20:07:21 +0000 (UTC)	[thread overview]
Message-ID: <1691611545.038f5dd88d37008c4cd12fa7153602dbdc0e97d2.conikost@gentoo> (raw)

commit:     038f5dd88d37008c4cd12fa7153602dbdc0e97d2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 20:05:45 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 20:05:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=038f5dd8

dev-lua/lua-openssl: fix clang16, block tests

Closes: https://bugs.gentoo.org/911845
Closes: https://bugs.gentoo.org/881139
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/lua-openssl-0.8.3-clang16.patch          | 45 ++++++++++++++++++++++
 ....3_p2.ebuild => lua-openssl-0.8.3_p2-r1.ebuild} |  4 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch b/dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch
new file mode 100644
index 000000000000..64482c97673a
--- /dev/null
+++ b/dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch
@@ -0,0 +1,45 @@
+From 3451462230082e6eae9d82833a547a3a73df5ef9 Mon Sep 17 00:00:00 2001
+From: zhaozg <zhaozg@gmail.com>
+Date: Mon, 7 Aug 2023 17:47:23 +0800
+Subject: [PATCH] partially fix #265
+
+---
+ src/ocsp.c    | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/ocsp.c b/src/ocsp.c
+index 29f5b153..e1672fcf 100644
+--- a/src/ocsp.c
++++ b/src/ocsp.c
+@@ -183,8 +183,15 @@ static int openssl_ocsp_request_read(lua_State *L)
+   BIO *bio = load_bio_object(L, 1);
+   int pem = lua_gettop(L) > 1 ? auxiliar_checkboolean(L, 2) : 0;
+ 
++#if defined(__clang__)
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored"-Wincompatible-function-pointer-types"
++#endif
+   OCSP_REQUEST *req = pem ? PEM_read_bio_OCSP_REQUEST(bio, NULL, NULL)
+                           : d2i_OCSP_REQUEST_bio(bio, NULL);
++#if defined(__clang__)
++#pragma clang diagnostic pop
++#endif
+   BIO_free(bio);
+ 
+   if (req)
+@@ -352,8 +359,15 @@ static int openssl_ocsp_response_read(lua_State *L)
+   int pem = lua_gettop(L) > 1 ? auxiliar_checkboolean(L, 2) : 0;
+   int ret = 0;
+ 
++#if defined(__clang__)
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored"-Wincompatible-function-pointer-types"
++#endif
+   OCSP_RESPONSE *res = pem ? PEM_read_bio_OCSP_RESPONSE(bio, NULL, NULL)
+                            : d2i_OCSP_RESPONSE_bio(bio, NULL);
++#if defined(__clang__)
++#pragma clang diagnostic pop
++#endif
+   if (res)
+   {
+     PUSH_OBJECT(res, "openssl.ocsp_response");

diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild
similarity index 97%
rename from dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild
rename to dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild
index 8b1181de43af..82d587831be4 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	!dev-lua/luaossl
@@ -40,6 +40,8 @@ BDEPEND="
 	test? ( ${RDEPEND} )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.8.3-clang16.patch" )
+
 src_prepare() {
 	default
 


             reply	other threads:[~2023-08-09 20:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-09 20:07 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-23 23:51 [gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-openssl/, dev-lua/lua-openssl/files/ Conrad Kostecki
2022-01-20 23:56 Conrad Kostecki
2021-08-07 22:49 Conrad Kostecki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1691611545.038f5dd88d37008c4cd12fa7153602dbdc0e97d2.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox