diff options
| author |   Conrad Kostecki <conikost@gentoo.org> | 2023-08-09 22:05:45 +0200 |
|---|---|---|
| committer | Conrad Kostecki <conikost@gentoo.org> | 2023-08-09 22:05:45 +0200 |
| commit | 038f5dd88d37008c4cd12fa7153602dbdc0e97d2 (patch) | |
| tree | 210485a350f2b23f8c409896c84ff191395e384b /dev-lua/lua-openssl | |
| parent | media-libs/libsvgtiny-pixbuf: new package, add 0.0.2 (diff) | |
| download | gentoo-038f5dd88d37008c4cd12fa7153602dbdc0e97d2.tar.gz gentoo-038f5dd88d37008c4cd12fa7153602dbdc0e97d2.tar.bz2 gentoo-038f5dd88d37008c4cd12fa7153602dbdc0e97d2.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-lua/lua-openssl')
| -rw-r--r-- | dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch | 45 | ||||
| -rw-r--r-- | dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild (renamed from dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild) | 4 |
2 files changed, 48 insertions, 1 deletions
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 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 |