gentoo auto-resync : 24:01:2024 - 04:45:52

4 files changed, 8 insertions, 52 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index cdcb51251d94..f60751062234 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 123968d14422..51791b7e99e5 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,6 +1,5 @@
-AUX lua-openssl-0.8.3-clang16.patch 1453 BLAKE2B de977cf48809cb9ca98f077c1b519d610fa64fba88f31db34abb976fcb2ed3b1f35e6114b06b1cece2076a217bd0ecc03b0b4778bde8b6055a96cf6c37372ec7 SHA512 776ac0878331050490df4b8b3e0fc97d2baa6595fdf472eb14e801848a40047b6a96d932263efeae192bd8c5e1a7e6677cd005279d7d517bb87bf52ed3e5290c
 DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-DIST lua-openssl-0.8.3_p2.tar.gz 401761 BLAKE2B 3efd8049806e03e8a6a7f77a06d8c1f7d98f2133143d7dc28eb6d0abf7821a93446df6334e906559dec5cb758719157ba75502215aff7081b9e7c977d35f45f4 SHA512 024edd5c88beb267f829c26f746731045fe8f713beca1caf2325ae5a4ee179d220a3ebd3af9c3efb574f16f0bff717d7357756d14a4ff41bd73e56ccc37cedf8
-EBUILD lua-openssl-0.8.3_p2-r1.ebuild 2718 BLAKE2B 05489395c6d43e7667547fb80099d4949f4cac337e3dedd29ad56a996727d8feef3c335c72c6465885900681e47209055570f9639c6526694df088975bc6032d SHA512 be29f0ea0c91fec865f8017cc207fe93bf8ec1e7597e66a72bdefa5bf6d5a9407a96dd16c25c3074b82fd6b9b57a97a3d81d8d881e60727b58de629d978e452d
+DIST lua-openssl-0.9.0_p0.tar.gz 415793 BLAKE2B 74fd4565ecbca90d9ca141bd909d403e2d16f68df089b86f747e7c37e6b57c81f1f94e468180f99f564e613afec5fe6aeb18de78d88aa2f41b6395fba2e7c884 SHA512 146231335c036f9dc0c4c5c40d93aa59e47f761afc5d1ee695c336d1b881c51d52cec3d1903cda6bc3c57224e041e17faab3be61dee6b1a154db22b47f9cc303
+EBUILD lua-openssl-0.9.0_p0.ebuild 2826 BLAKE2B eb06c39f2875021d521d19f2f6592139af554f585a49e0a32acead04700dc238ec032c56b3c93529df3f43dfc43f3d0c117d27016f7e7b47b2607db0f9cddeff SHA512 74677851b7d651695b5c838f95dd0512ab53152a2353f363ea2aac792753fbc3ae564d4ea113238bcbddff8ab10e02b1505170367e63c1880a961f6951d05bbb
 MISC metadata.xml 570 BLAKE2B 06322c0fe99c059d025b625bdace98c34fce4a59a4b4e8f8daec67ba9b1303b576216873514b834929446decb541df1ab4927a12092f74ce2bf0222afcfee941 SHA512 5a2a5837995d403a2056caeec07e0e7a729e0699d1b73cb8d00e3a2a3426d829cfe89d1522770d13edf479d0c2eb0becaff0e3446fca4c2947df97df008f7184
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
deleted file mode 100644
index 64482c97673a..000000000000
--- a/dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.9.0_p0.ebuild
index 82d587831be4..80f2eb53b56a 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.9.0_p0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ MY_PN_COMPAT="lua-compat-5.3"
 MY_PV="${PV//_p/-}"
 MY_PV_COMPAT="0.10"
 
-inherit lua toolchain-funcs
+inherit flag-o-matic lua toolchain-funcs
 
 DESCRIPTION="OpenSSL binding for Lua"
 HOMEPAGE="https://github.com/zhaozg/lua-openssl"
@@ -40,8 +40,6 @@ BDEPEND="
 	test? ( ${RDEPEND} )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.8.3-clang16.patch" )
-
 src_prepare() {
 	default
 
@@ -63,6 +61,10 @@ src_prepare() {
 lua_src_compile() {
 	pushd "${BUILD_DIR}" || die
 
+	# See https://bugs.gentoo.org/920643
+	# See https://github.com/zhaozg/lua-openssl/issues/305
+	append-cflags -Wno-error=incompatible-pointer-types
+
 	local myemakeargs=(
 		"AR=$(tc-getAR)"
 		"CC=$(tc-getCC)"