summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2024-01-24 00:48:30 +0100
committerConrad Kostecki <conikost@gentoo.org>2024-01-24 00:50:46 +0100
commit8fe3cfc6ec7cb69327e17d2dcaa2015d8a5a3024 (patch)
treee55fc25b07b07549216616ce9326e170c84ef51b /dev-lua
parentdev-lua/lua-openssl: add 0.9.0_p0 (diff)
downloadgentoo-8fe3cfc6ec7cb69327e17d2dcaa2015d8a5a3024.tar.gz
gentoo-8fe3cfc6ec7cb69327e17d2dcaa2015d8a5a3024.tar.bz2
gentoo-8fe3cfc6ec7cb69327e17d2dcaa2015d8a5a3024.zip
dev-lua/lua-openssl: drop 0.8.3_p2-r1
Closes: https://bugs.gentoo.org/920643 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'dev-lua')
-rw-r--r--dev-lua/lua-openssl/Manifest1
-rw-r--r--dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch45
-rw-r--r--dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild126
3 files changed, 0 insertions, 172 deletions
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 9039b7620195..a002c80a9b76 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,4 +1,3 @@
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
DIST lua-openssl-0.9.0_p0.tar.gz 415793 BLAKE2B 74fd4565ecbca90d9ca141bd909d403e2d16f68df089b86f747e7c37e6b57c81f1f94e468180f99f564e613afec5fe6aeb18de78d88aa2f41b6395fba2e7c884 SHA512 146231335c036f9dc0c4c5c40d93aa59e47f761afc5d1ee695c336d1b881c51d52cec3d1903cda6bc3c57224e041e17faab3be61dee6b1a154db22b47f9cc303
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.8.3_p2-r1.ebuild
deleted file mode 100644
index 82d587831be4..000000000000
--- a/dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PN_AUX="lua-auxiliar"
-MY_PN_COMPAT="lua-compat-5.3"
-MY_PV="${PV//_p/-}"
-MY_PV_COMPAT="0.10"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="OpenSSL binding for Lua"
-HOMEPAGE="https://github.com/zhaozg/lua-openssl"
-SRC_URI="
- https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
- https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT openssl PHP-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
- !dev-lua/luaossl
- !dev-lua/luasec
- dev-libs/openssl:0=[-bindist(-)]
- ${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- test? ( ${RDEPEND} )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.3-clang16.patch" )
-
-src_prepare() {
- default
-
- # Allow override of LUA* variables
- sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
-
- # Disable TestCMS test suite, as it fails
- # See: https://github.com/zhaozg/lua-openssl/issues/230
- sed -e '/6.cms.lua/d' -i test/test.lua || die
-
- # Prepare needed dependencies (source code files only)
- rm -r deps/{auxiliar,lua-compat} || die
- mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
- mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die
-
- lua_copy_sources
-}
-
-lua_src_compile() {
- pushd "${BUILD_DIR}" || die
-
- local myemakeargs=(
- "AR=$(tc-getAR)"
- "CC=$(tc-getCC)"
- "LUA="
- "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)"
- "LUA_LIBS=${LDFLAGS}"
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
- "TARGET_SYS=${CTARGET:-${CHOST}}"
- )
-
- emake "${myemakeargs[@]}"
-
- popd
-}
-
-src_compile() {
- lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
- pushd "${BUILD_DIR}" || die
-
- local myemakeargs=(
- "LUA=${ELUA}"
- "LUA_CFLAGS="
- "LUA_LIBS="
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
- "TARGET_SYS=${CTARGET:-${CHOST}}"
- )
-
- emake "${myemakeargs[@]}" test
-
- popd
-}
-
-src_test() {
- lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
- pushd "${BUILD_DIR}" || die
-
- local myemakeargs=(
- "LUA="
- "LUA_CFLAGS="
- "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
- "LUA_LIBS="
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
- "TARGET_SYS=${CTARGET:-${CHOST}}"
- )
-
- emake "${myemakeargs[@]}" install
-
- popd
-}
-
-src_install() {
- lua_foreach_impl lua_src_install
-
- einstalldocs
-}