gentoo resync : 11.08.2021

3 files changed, 62 insertions, 4 deletions

diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 92797d7e4f11..d88379e4642a 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,5 +1,6 @@
+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_p6.tar.gz 418000 BLAKE2B 34474c607f6e39985c17f142b1067f2438b51c7e6f62861f65fa8c471722b56dee05a7a45eae277b368ee643a1820334de03c08f09c88a17e851925d575df6d4 SHA512 56125b8a88783b48bbeabd56be4732afe22ef54224b3f03f16e3cbc1ce94f554d6d8dea8236bff34786aad2720b53cbd05dcba85ca41497db61f339014fa3b95
-EBUILD lua-openssl-0.8.0_p6-r1.ebuild 2862 BLAKE2B 685e6636cd195f441e6967cd4c39a2d9ec9bf53f8a22c636db5679771b7dd15f6f8ce479fe9f72683104ce6737c9ef9674f0de85314979f4a329b89979115681 SHA512 b45dd578aed439c7c710b63eabb535eb605cd48919882d6ccf967267c740ce58cc099e436e6edf5026ae41ca48285b27c353dea46f37c9329075004fdfa3330f
+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/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
new file mode 100644
index 000000000000..370df75c4d97
--- /dev/null
+++ b/dev-lua/lua-openssl/files/lua-openssl-0.8.0_p6-testcrl-openssl.patch
@@ -0,0 +1,56 @@
+From 3fbe31a6d6e76ddac08d5da8eaa1c00fa54060e7 Mon Sep 17 00:00:00 2001
+From: zhaozg <zhaozg@gmail.com>
+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_p6-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild
index c91859384d35..47fb802ba0d3 100644
--- 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
@@ -42,16 +42,17 @@ BDEPEND="
 
 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 and TestCRL test suite, as it fails
+	# Disable TestCMS test suite, as it fails
 	# See: https://github.com/zhaozg/lua-openssl/issues/230
-	# See: https://github.com/zhaozg/lua-openssl/issues/231
-	sed -e '/6.cms.lua/d' -e '/5.x509_crl.lua/d' -i test/test.lua || die
+	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