From d8e832445899a9a8ba4d8dc6f61f5feca79a3b85 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 10 Aug 2023 03:31:29 +0100 Subject: gentoo auto-resync : 10:08:2023 - 03:31:29 --- dev-lua/lua-openssl/Manifest | 3 +- .../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 -------------------- 4 files changed, 173 insertions(+), 125 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/Manifest b/dev-lua/lua-openssl/Manifest index 92a76956fa9b..123968d14422 100644 --- a/dev-lua/lua-openssl/Manifest +++ b/dev-lua/lua-openssl/Manifest @@ -1,5 +1,6 @@ +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.ebuild 2676 BLAKE2B bff2effc23c995385546d3ddcdd2be827657d926aa9525bd1724b398dc2930750b776c5d4dc81fadb9e752108415992179a735c5bf579ef9473942b12009b7cd SHA512 9430d386fc93c7bc2530039ed9b4a70ab7dc9c8eb5f22d00277b902506a7a771e4241ed1bf57a6d6eadfe90fd8344f8ec3eda95460c4a47fb95a5c7719e6aca9 +EBUILD lua-openssl-0.8.3_p2-r1.ebuild 2718 BLAKE2B 05489395c6d43e7667547fb80099d4949f4cac337e3dedd29ad56a996727d8feef3c335c72c6465885900681e47209055570f9639c6526694df088975bc6032d SHA512 be29f0ea0c91fec865f8017cc207fe93bf8ec1e7597e66a72bdefa5bf6d5a9407a96dd16c25c3074b82fd6b9b57a97a3d81d8d881e60727b58de629d978e452d 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 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