gentoo resync : 17.08.2021

6 files changed, 134 insertions, 102 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index d92b63d83d10..ba7dc030306d 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 d88379e4642a..95cb3c31bcdb 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,6 +1,8 @@
 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
 MISC metadata.xml 569 BLAKE2B 80e5dc0b568cfe18741e12d2df60301a9a8424a3043899bcada19052fb240b4207a9bd6bbbbb2b6c6cd7940e5af3c04ed4126dc89cfb40d3934403a442bcaa5d SHA512 e17108732d270894cb9ab3d99db60da6af3860604256f44a8ba86af7457fd8f94452ce333c7e86dcfc99c6edc652d58ad19bfcd5c081968dd2af24f9d0e591dd
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
new file mode 100644
index 000000000000..acec78d6e14c
--- /dev/null
+++ b/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild
@@ -0,0 +1,130 @@
+# 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/luasec/Manifest b/dev-lua/luasec/Manifest
index 57090c9394ff..e8a4dabfe9e3 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
-AUX luasec-1.0.1_openssl3.patch 3126 BLAKE2B 8b50179b5c76aa332803c0d71539d6118ee7b4c539748dc1161804437263a4dca5ae24ada4208efd32bc9e967f1d1a80bee3db1c750843d04261fa93b0951aa5 SHA512 6de91108288cc336ac7ce2e23f68e9e720d34036507c6183f0ef59007c42bbd223ae3c717fb098f3bf1b4ebbb229ad238f010d68960d8227d7189ea9ba86ab0c
 DIST luasec-1.0.1.tar.gz 52370 BLAKE2B 4e90adafc5091fe462f2413f54aae9d3baf699471fad287ee58cc033140587a93e15baddea6fd6bbf7a90378e99f6fa12e63eeecab24d31c91a1ee2f9924df70 SHA512 21ae200e40f13a35eebca95cdac25ae13532a3008b2f9ec97a079033b9efde69e81954354453623eb77340368f482d3c69adb26881a6c0d7c4897df31301af93
-EBUILD luasec-1.0.1-r1.ebuild 1592 BLAKE2B 9148ae4f79fc3fbe9910df494e46f019f3f2dbfac263508cbfc8babba7c04ed1ea3e69fc8e82a84b3951decbd7eb344db4020686fecf6e2a1c4af365742c10ba SHA512 018a7b49a803fb4b513879c0e75164c5e1074a197befa112bc76eeaa0284eb89c7353280346baa7476422335b6d2736ca8dadbd7568913b28ed81073d34f0fb4
+DIST luasec-1.0.2.tar.gz 52838 BLAKE2B 41bfaf8af6be56bb46c747b2bf3e938a164f43d2f39cde7386d5795811a555ebad3146344ef491412489de7679f82948bb9fb862e3ae98ab9b73f4116218a5ac SHA512 a873d8217b1ec9e66f50d7319ea0fa467b92b5855e7514dbd00429a26be3546e69fdfc985ac79a80d86f3c6845910b2e14a2198951dcad249b2d1c7d6855453f
 EBUILD luasec-1.0.1.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0
+EBUILD luasec-1.0.2.ebuild 1544 BLAKE2B 001b5a72a4fff6ab8b09b502a05f49de57127d3e2cfeebedd04026252c79522d434e29af5b232e84cde81c64321051ab51963cb3d21e5ab201ed551eff9cea15 SHA512 f254c9c487f08ca7298b76201b78a32a566e453a15c555a885b4db22da2640c4ca170996352389027e2be0133221acb9f3108bfa48d70b8ae81f55d81c6b8f9b
 MISC metadata.xml 596 BLAKE2B 0116422318c66247af5add321ba97b4d48a27b5871a2edb2eab81f03611ddad4f6e616c16070e89f8df7ef1dba6fdc94a070325e24f90df6f6095c2afb0af9f7 SHA512 97f09d268b8bb90d82707f6a39a2339a8cdab827b4fbf70292904e580f15b3503d0473855dfb9141c9384579339df4073ad2926662ff8839ffbe73ce009b3402
diff --git a/dev-lua/luasec/files/luasec-1.0.1_openssl3.patch b/dev-lua/luasec/files/luasec-1.0.1_openssl3.patch
deleted file mode 100644
index 6fc161bfbe32..000000000000
--- a/dev-lua/luasec/files/luasec-1.0.1_openssl3.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 79bbc0bc3ed50303d0887f44137a1104ede3ea8f Mon Sep 17 00:00:00 2001
-From: Bruno Silvestre <brunoos@inf.ufg.br>
-Date: Mon, 2 Aug 2021 17:02:44 -0300
-Subject: [PATCH] Ignore SSL_OP_BIT(n) macro and update option.c #178
-
----
- src/options.c   | 20 +++++++++++++++++++-
- src/options.lua |  9 ++++++---
- 2 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/src/options.c b/src/options.c
-index 24fd2c9..7c6f21e 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -13,13 +13,16 @@
- 
- 
- /* 
--  OpenSSL version: OpenSSL 1.1.1
-+  OpenSSL version: OpenSSL 3.0.0-beta2
- */
- 
- static lsec_ssl_option_t ssl_options[] = {
- #if defined(SSL_OP_ALL)
-   {"all", SSL_OP_ALL},
- #endif
-+#if defined(SSL_OP_ALLOW_CLIENT_RENEGOTIATION)
-+  {"allow_client_renegotiation", SSL_OP_ALLOW_CLIENT_RENEGOTIATION},
-+#endif
- #if defined(SSL_OP_ALLOW_NO_DHE_KEX)
-   {"allow_no_dhe_kex", SSL_OP_ALLOW_NO_DHE_KEX},
- #endif
-@@ -32,21 +35,33 @@ static lsec_ssl_option_t ssl_options[] = {
- #if defined(SSL_OP_CISCO_ANYCONNECT)
-   {"cisco_anyconnect", SSL_OP_CISCO_ANYCONNECT},
- #endif
-+#if defined(SSL_OP_CLEANSE_PLAINTEXT)
-+  {"cleanse_plaintext", SSL_OP_CLEANSE_PLAINTEXT},
-+#endif
- #if defined(SSL_OP_COOKIE_EXCHANGE)
-   {"cookie_exchange", SSL_OP_COOKIE_EXCHANGE},
- #endif
- #if defined(SSL_OP_CRYPTOPRO_TLSEXT_BUG)
-   {"cryptopro_tlsext_bug", SSL_OP_CRYPTOPRO_TLSEXT_BUG},
- #endif
-+#if defined(SSL_OP_DISABLE_TLSEXT_CA_NAMES)
-+  {"disable_tlsext_ca_names", SSL_OP_DISABLE_TLSEXT_CA_NAMES},
-+#endif
- #if defined(SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)
-   {"dont_insert_empty_fragments", SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS},
- #endif
-+#if defined(SSL_OP_ENABLE_KTLS)
-+  {"enable_ktls", SSL_OP_ENABLE_KTLS},
-+#endif
- #if defined(SSL_OP_ENABLE_MIDDLEBOX_COMPAT)
-   {"enable_middlebox_compat", SSL_OP_ENABLE_MIDDLEBOX_COMPAT},
- #endif
- #if defined(SSL_OP_EPHEMERAL_RSA)
-   {"ephemeral_rsa", SSL_OP_EPHEMERAL_RSA},
- #endif
-+#if defined(SSL_OP_IGNORE_UNEXPECTED_EOF)
-+  {"ignore_unexpected_eof", SSL_OP_IGNORE_UNEXPECTED_EOF},
-+#endif
- #if defined(SSL_OP_LEGACY_SERVER_CONNECT)
-   {"legacy_server_connect", SSL_OP_LEGACY_SERVER_CONNECT},
- #endif
-@@ -89,6 +104,9 @@ static lsec_ssl_option_t ssl_options[] = {
- #if defined(SSL_OP_NO_ENCRYPT_THEN_MAC)
-   {"no_encrypt_then_mac", SSL_OP_NO_ENCRYPT_THEN_MAC},
- #endif
-+#if defined(SSL_OP_NO_EXTENDED_MASTER_SECRET)
-+  {"no_extended_master_secret", SSL_OP_NO_EXTENDED_MASTER_SECRET},
-+#endif
- #if defined(SSL_OP_NO_QUERY_MTU)
-   {"no_query_mtu", SSL_OP_NO_QUERY_MTU},
- #endif
-diff --git a/src/options.lua b/src/options.lua
-index a757c8b..678e8d5 100644
---- a/src/options.lua
-+++ b/src/options.lua
-@@ -60,9 +60,12 @@ local function loadoptions(file)
-   local options = {}
-   local f = assert(io.open(file, "r"))
-   for line in f:lines() do
--    local op = string.match(line, "define%s+(SSL_OP_%S+)")
--    if op then
--      table.insert(options, op)
-+    local op = string.match(line, "define%s+(SSL_OP_BIT%()")
-+    if not op then
-+      op = string.match(line, "define%s+(SSL_OP_%S+)")
-+      if op then
-+        table.insert(options, op)
-+      end
-     end
-   end
-   table.sort(options, function(a,b) return a<b end)
diff --git a/dev-lua/luasec/luasec-1.0.1-r1.ebuild b/dev-lua/luasec/luasec-1.0.2.ebuild
index 5cbfb8b1bd03..a78d18ac1077 100644
--- a/dev-lua/luasec/luasec-1.0.1-r1.ebuild
+++ b/dev-lua/luasec/luasec-1.0.2.ebuild
@@ -25,10 +25,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}_openssl3.patch"
-)
-
 lua_src_prepare() {
 	pushd "${BUILD_DIR}" || die