From 038f5dd88d37008c4cd12fa7153602dbdc0e97d2 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Wed, 9 Aug 2023 22:05:45 +0200 Subject: 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 --- .../files/lua-openssl-0.8.3-clang16.patch | 45 ++++++++ dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild | 126 +++++++++++++++++++++ dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild | 124 -------------------- 3 files changed, 171 insertions(+), 124 deletions(-) create mode 100644 dev-lua/lua-openssl/files/lua-openssl-0.8.3-clang16.patch create mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild (limited to 'dev-lua/lua-openssl') 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 +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 new file mode 100644 index 000000000000..82d587831be4 --- /dev/null +++ b/dev-lua/lua-openssl/lua-openssl-0.8.3_p2-r1.ebuild @@ -0,0 +1,126 @@ +# 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 +} 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.ebuild deleted file mode 100644 index 8b1181de43af..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.8.3_p2.ebuild +++ /dev/null @@ -1,124 +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? ( test )" - -RDEPEND=" - !dev-lua/luaossl - !dev-lua/luasec - dev-libs/openssl:0=[-bindist(-)] - ${LUA_DEPS} -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( ${RDEPEND} ) -" - -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 -} -- cgit v1.2.3