Adding metadata

5 files changed, 82 insertions, 21 deletions

diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index 0a92c9352d62..25b3f2203774 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,4 +1,4 @@
 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.tar.gz 417904 BLAKE2B ec64c443e1126fb0dd4189a10ca09af88f514be319a877ca3ddc621601037337e38e1618a8ce9d81709accc9457146d7a67c039486b90177c30997941a5ad3e8 SHA512 8e6b28aad2a8f78d61d70a09f125c7d002c328799a8611202debe73978008484fee8d8dd90b8deaff214059f02e042ccf68436185c4299b7dce814daad1311ab
+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
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.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild
index 5045419b15e5..c22c61f0dc1f 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.8.0.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild
@@ -1,7 +1,9 @@
-# Copyright 2021 Liguros Authors
+# 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,3,4} luajit )
 MY_PN_AUX="lua-auxiliar"
@@ -13,26 +15,24 @@ 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/${PV}-0.tar.gz -> ${P}.tar.gz
+	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}/${P}-0"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT openssl PHP-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl test"
+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
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	dev-libs/openssl:0=[-bindist(-)]
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -49,6 +49,10 @@ src_prepare() {
 	# 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
diff --git a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild
index 6ac9818a8e76..36fff608a88c 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=7
 
 EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
@@ -13,9 +14,8 @@ 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/${PV}-0.tar.gz -> ${P}.tar.gz
+	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
 "
@@ -23,16 +23,15 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT openssl PHP-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl test"
+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
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	dev-libs/openssl:0=[-bindist(-)]
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -43,12 +42,18 @@ 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 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
diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml
index 16a29b0ec3d0..ac7c1fd01732 100644
--- a/dev-lua/lua-openssl/metadata.xml
+++ b/dev-lua/lua-openssl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
  <maintainer type="person">
   <email>conikost@gentoo.org</email>
   <name>Conrad Kostecki</name>
@@ -18,5 +14,5 @@
   <name>Patrick McLean</name>
  </maintainer>
  
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file