From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- dev-lua/lua-openssl/Manifest | 7 +- .../lua-openssl-0.8.0_p6-testcrl-openssl.patch | 56 --------- .../lua-openssl/lua-openssl-0.8.0_p20210815.ebuild | 130 -------------------- dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild | 131 --------------------- dev-lua/lua-openssl/lua-openssl-0.8.1_p1.ebuild | 129 ++++++++++++++++++++ 5 files changed, 131 insertions(+), 322 deletions(-) delete mode 100644 dev-lua/lua-openssl/files/lua-openssl-0.8.0_p6-testcrl-openssl.patch delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild create mode 100644 dev-lua/lua-openssl/lua-openssl-0.8.1_p1.ebuild (limited to 'dev-lua/lua-openssl') diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest index 22711d3eafda..15716b660953 100644 --- a/dev-lua/lua-openssl/Manifest +++ b/dev-lua/lua-openssl/Manifest @@ -1,8 +1,5 @@ -AUX lua-openssl-0.8.0_p6-testcrl-openssl.patch 1672 BLAKE2B 26948de2c48edbab94edf95e963d0250232545d54934d596212cfc23289f6022038dc5da0cb593dca91f9459db09536a6d324af61c2376249a2da4da32b3b392 SHA512 525baec48f36ff67c66bfac0476d6ac29aaf821817a9a88ef80c445828f234ebd7168dd2b28177f4a07dfc0485d223302c902f365401693e291445b2bf14fe36 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.0_p20210815.tar.gz 421946 BLAKE2B 6e7c0414f4ff3391db24b666f9801ab42a8cdeb3953d675535416cfe049c7429f032dff44bb41aef0cfd16f5c20d8ad29254dfa4a038dc6d5c8f6f5c032d7fa2 SHA512 e6b5cce94969a097d507e697a0b14f88d039ce65ebedf9256f4666728f9bb8cef4d53446f9d559e7a626be6e827b39148b24ddf1df1bbaec1f869a4e1d1dfd76 -DIST lua-openssl-0.8.0_p6.tar.gz 418000 BLAKE2B 34474c607f6e39985c17f142b1067f2438b51c7e6f62861f65fa8c471722b56dee05a7a45eae277b368ee643a1820334de03c08f09c88a17e851925d575df6d4 SHA512 56125b8a88783b48bbeabd56be4732afe22ef54224b3f03f16e3cbc1ce94f554d6d8dea8236bff34786aad2720b53cbd05dcba85ca41497db61f339014fa3b95 -EBUILD lua-openssl-0.8.0_p20210815.ebuild 2827 BLAKE2B 1c3ddcff5e8dc11a56fbd5a9f178dbf0d442c60fa0521a804ccb3afa2ff604caeafee7de26cd0b64edcd19dc235464299b84d0a46df6fcae8444dc2f72e83647 SHA512 a0bbecc785f1a3129947567c65115512ab85649a5a32bde4b072c3970a976f4d52090021327d7ae1f31aac776754eafa03e9c086a08ab09f7a8367c2a3222c38 -EBUILD lua-openssl-0.8.0_p6-r1.ebuild 2834 BLAKE2B 6c72c8f660d9b689cd6c735a3c3770b60873d69a5476bde969d0c9edc5f6572a79aee476e0b0839fa500ecf5df1f3c72d580fb6effa60cdce9007aa1712260fa SHA512 682928a84284f4c62cde7a9fc12b42a843fa3db9e19f651fb920570438626a3f4808c6405993d25637977dd600080831b41620f3d9344b74b4202d4bc0b6b2f6 +DIST lua-openssl-0.8.1_p1.tar.gz 425188 BLAKE2B bf3171e921e144c4a13d78df9d69d89b350d4cd4358640ae8d6eb22faea302f0f0cd7687250ff70a8798e7e02c4656964ebfd90f7e98ea2eff051ad3c562029e SHA512 92be296ed18fa1ef982b70c982151cb223402cb92eb7ff8ae92009553e93f8cd24555aa1b653e20772d74b3fc7a7d4f5fc7fb923e54fec130ff6550d64ef909f +EBUILD lua-openssl-0.8.1_p1.ebuild 2760 BLAKE2B 0831ef478ba31d99ba130ad9b66cc36bdc9ac9b01347da4b663e670f0b31ab728b3ee5041a5ac065af7700a0591f0594587659b9ec82cf0bcf5a1fdcfc3e904b SHA512 12a12384057292d3bd06da518665b203cb96c5ff19ca096773efbe811469363a7d88082441283224518c084409e3b19f67e16f84187d0dfecf7e1d5c552ce439 MISC metadata.xml 570 BLAKE2B 06322c0fe99c059d025b625bdace98c34fce4a59a4b4e8f8daec67ba9b1303b576216873514b834929446decb541df1ab4927a12092f74ce2bf0222afcfee941 SHA512 5a2a5837995d403a2056caeec07e0e7a729e0699d1b73cb8d00e3a2a3426d829cfe89d1522770d13edf479d0c2eb0becaff0e3446fca4c2947df97df008f7184 diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.8.0_p6-testcrl-openssl.patch b/dev-lua/lua-openssl/files/lua-openssl-0.8.0_p6-testcrl-openssl.patch deleted file mode 100644 index 370df75c4d97..000000000000 --- a/dev-lua/lua-openssl/files/lua-openssl-0.8.0_p6-testcrl-openssl.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 3fbe31a6d6e76ddac08d5da8eaa1c00fa54060e7 Mon Sep 17 00:00:00 2001 -From: zhaozg -Date: Sun, 1 Aug 2021 18:50:43 +0800 -Subject: [PATCH] update openssl.crl - ---- - src/crl.c | 9 +++++---- - test/5.x509_crl.lua | 3 ++- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/crl.c b/src/crl.c -index d35e3e0..091c31e 100644 ---- a/src/crl.c -+++ b/src/crl.c -@@ -525,13 +525,14 @@ static LUA_FUNCTION(openssl_crl_nextUpdate) - /*** - get updateTime time - @function updateTime --@treturn string lastUpdate -+@treturn asn1_time lastUpdate -+@treturn asn1_time nextUpdate - */ - /*** - set updateTime time - @function updateTime - @tparam[opt=os.time()] lastUpdate, default use current time --@tparam number periord periord how long time(seconds) -+@tparam number period period how long time(seconds) - @treturn boolean result - */ - static LUA_FUNCTION(openssl_crl_updateTime) -@@ -561,8 +562,8 @@ static LUA_FUNCTION(openssl_crl_updateTime) - else - { - last = luaL_checkint(L, 2); -- next = last + luaL_checkint(L, 3); -- luaL_argcheck(L, next > last, 3, "value must after #2"); -+ next = luaL_checkint(L, 3); -+ next = last + next; - } - - ltm = ASN1_TIME_new(); -diff --git a/test/5.x509_crl.lua b/test/5.x509_crl.lua -index 747fb0e..d0686c9 100644 ---- a/test/5.x509_crl.lua -+++ b/test/5.x509_crl.lua -@@ -45,7 +45,8 @@ function TestCRL:testNew() - assert(other:verify(ca.cacert)) - local pem = other:export() - -- assert(other:updateTime(os.time(), os.time()+3600)) -+ assert(other:updateTime(3600)) -+ assert(other:updateTime(os.time(), 3600)) - - assert(other:extensions({ - openssl.x509.extension.new_extension( diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild deleted file mode 100644 index acec78d6e14c..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="770242f24b9f449c42afd7c9205361870a3df61f" -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/${EGIT_COMMIT}.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}-${EGIT_COMMIT}" - -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} ) -" - -DOCS=( "README.md" "samples/." ) - -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 - - insinto "$(lua_get_lmod_dir)" - doins -r "lib/." - - popd -} - -src_install() { - lua_foreach_impl lua_src_install - - einstalldocs -} diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild deleted file mode 100644 index 47fb802ba0d3..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/refs/tags/${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} ) -" - -DOCS=( "README.md" "samples/." ) - -PATCHES=( "${FILESDIR}/${PN}-0.8.0_p6-testcrl-openssl.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 - - insinto "$(lua_get_lmod_dir)" - doins -r "lib/." - - popd -} - -src_install() { - lua_foreach_impl lua_src_install - - einstalldocs -} diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.1_p1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.1_p1.ebuild new file mode 100644 index 000000000000..002170168ee4 --- /dev/null +++ b/dev-lua/lua-openssl/lua-openssl-0.8.1_p1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2022 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} ) +" + +DOCS=( "README.md" "samples/." ) + +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 + + insinto "$(lua_get_lmod_dir)" + doins -r "lib/." + + popd +} + +src_install() { + lua_foreach_impl lua_src_install + + einstalldocs +} -- cgit v1.2.3