1 |
commit: 6c8d5218d6414457b57409ebfa06d2dd74f1a313 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 20 23:36:45 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 20 23:56:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8d5218 |
7 |
|
8 |
dev-lua/lua-openssl: drop 0.8.0_p6-r1, 0.8.0_p20210815 |
9 |
|
10 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
11 |
|
12 |
dev-lua/lua-openssl/Manifest | 2 - |
13 |
.../lua-openssl-0.8.0_p6-testcrl-openssl.patch | 56 --------- |
14 |
.../lua-openssl/lua-openssl-0.8.0_p20210815.ebuild | 130 -------------------- |
15 |
dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild | 131 --------------------- |
16 |
4 files changed, 319 deletions(-) |
17 |
|
18 |
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest |
19 |
index 75262db48131..28ff38f97ab0 100644 |
20 |
--- a/dev-lua/lua-openssl/Manifest |
21 |
+++ b/dev-lua/lua-openssl/Manifest |
22 |
@@ -1,5 +1,3 @@ |
23 |
DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952 |
24 |
DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d |
25 |
-DIST lua-openssl-0.8.0_p20210815.tar.gz 421946 BLAKE2B 6e7c0414f4ff3391db24b666f9801ab42a8cdeb3953d675535416cfe049c7429f032dff44bb41aef0cfd16f5c20d8ad29254dfa4a038dc6d5c8f6f5c032d7fa2 SHA512 e6b5cce94969a097d507e697a0b14f88d039ce65ebedf9256f4666728f9bb8cef4d53446f9d559e7a626be6e827b39148b24ddf1df1bbaec1f869a4e1d1dfd76 |
26 |
-DIST lua-openssl-0.8.0_p6.tar.gz 418000 BLAKE2B 34474c607f6e39985c17f142b1067f2438b51c7e6f62861f65fa8c471722b56dee05a7a45eae277b368ee643a1820334de03c08f09c88a17e851925d575df6d4 SHA512 56125b8a88783b48bbeabd56be4732afe22ef54224b3f03f16e3cbc1ce94f554d6d8dea8236bff34786aad2720b53cbd05dcba85ca41497db61f339014fa3b95 |
27 |
DIST lua-openssl-0.8.1_p1.tar.gz 425188 BLAKE2B bf3171e921e144c4a13d78df9d69d89b350d4cd4358640ae8d6eb22faea302f0f0cd7687250ff70a8798e7e02c4656964ebfd90f7e98ea2eff051ad3c562029e SHA512 92be296ed18fa1ef982b70c982151cb223402cb92eb7ff8ae92009553e93f8cd24555aa1b653e20772d74b3fc7a7d4f5fc7fb923e54fec130ff6550d64ef909f |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 370df75c4d97..000000000000 |
32 |
--- a/dev-lua/lua-openssl/files/lua-openssl-0.8.0_p6-testcrl-openssl.patch |
33 |
+++ /dev/null |
34 |
@@ -1,56 +0,0 @@ |
35 |
-From 3fbe31a6d6e76ddac08d5da8eaa1c00fa54060e7 Mon Sep 17 00:00:00 2001 |
36 |
-From: zhaozg <zhaozg@×××××.com> |
37 |
-Date: Sun, 1 Aug 2021 18:50:43 +0800 |
38 |
-Subject: [PATCH] update openssl.crl |
39 |
- |
40 |
---- |
41 |
- src/crl.c | 9 +++++---- |
42 |
- test/5.x509_crl.lua | 3 ++- |
43 |
- 2 files changed, 7 insertions(+), 5 deletions(-) |
44 |
- |
45 |
-diff --git a/src/crl.c b/src/crl.c |
46 |
-index d35e3e0..091c31e 100644 |
47 |
---- a/src/crl.c |
48 |
-+++ b/src/crl.c |
49 |
-@@ -525,13 +525,14 @@ static LUA_FUNCTION(openssl_crl_nextUpdate) |
50 |
- /*** |
51 |
- get updateTime time |
52 |
- @function updateTime |
53 |
--@treturn string lastUpdate |
54 |
-+@treturn asn1_time lastUpdate |
55 |
-+@treturn asn1_time nextUpdate |
56 |
- */ |
57 |
- /*** |
58 |
- set updateTime time |
59 |
- @function updateTime |
60 |
- @tparam[opt=os.time()] lastUpdate, default use current time |
61 |
--@tparam number periord periord how long time(seconds) |
62 |
-+@tparam number period period how long time(seconds) |
63 |
- @treturn boolean result |
64 |
- */ |
65 |
- static LUA_FUNCTION(openssl_crl_updateTime) |
66 |
-@@ -561,8 +562,8 @@ static LUA_FUNCTION(openssl_crl_updateTime) |
67 |
- else |
68 |
- { |
69 |
- last = luaL_checkint(L, 2); |
70 |
-- next = last + luaL_checkint(L, 3); |
71 |
-- luaL_argcheck(L, next > last, 3, "value must after #2"); |
72 |
-+ next = luaL_checkint(L, 3); |
73 |
-+ next = last + next; |
74 |
- } |
75 |
- |
76 |
- ltm = ASN1_TIME_new(); |
77 |
-diff --git a/test/5.x509_crl.lua b/test/5.x509_crl.lua |
78 |
-index 747fb0e..d0686c9 100644 |
79 |
---- a/test/5.x509_crl.lua |
80 |
-+++ b/test/5.x509_crl.lua |
81 |
-@@ -45,7 +45,8 @@ function TestCRL:testNew() |
82 |
- assert(other:verify(ca.cacert)) |
83 |
- local pem = other:export() |
84 |
- |
85 |
-- assert(other:updateTime(os.time(), os.time()+3600)) |
86 |
-+ assert(other:updateTime(3600)) |
87 |
-+ assert(other:updateTime(os.time(), 3600)) |
88 |
- |
89 |
- assert(other:extensions({ |
90 |
- openssl.x509.extension.new_extension( |
91 |
|
92 |
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 |
93 |
deleted file mode 100644 |
94 |
index acec78d6e14c..000000000000 |
95 |
--- a/dev-lua/lua-openssl/lua-openssl-0.8.0_p20210815.ebuild |
96 |
+++ /dev/null |
97 |
@@ -1,130 +0,0 @@ |
98 |
-# Copyright 1999-2021 Gentoo Authors |
99 |
-# Distributed under the terms of the GNU General Public License v2 |
100 |
- |
101 |
-EAPI=7 |
102 |
- |
103 |
-EGIT_COMMIT="770242f24b9f449c42afd7c9205361870a3df61f" |
104 |
-EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" |
105 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
106 |
-MY_PN_AUX="lua-auxiliar" |
107 |
-MY_PN_COMPAT="lua-compat-5.3" |
108 |
-MY_PV="${PV//_p/-}" |
109 |
-MY_PV_COMPAT="0.10" |
110 |
- |
111 |
-inherit lua toolchain-funcs |
112 |
- |
113 |
-DESCRIPTION="OpenSSL binding for Lua" |
114 |
-HOMEPAGE="https://github.com/zhaozg/lua-openssl" |
115 |
-SRC_URI=" |
116 |
- https://github.com/zhaozg/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
117 |
- https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz |
118 |
- https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz |
119 |
-" |
120 |
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}" |
121 |
- |
122 |
-LICENSE="MIT openssl PHP-3" |
123 |
-SLOT="0" |
124 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
125 |
-IUSE="test" |
126 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
127 |
-RESTRICT="!test? ( test )" |
128 |
- |
129 |
-RDEPEND=" |
130 |
- !dev-lua/luaossl |
131 |
- !dev-lua/luasec |
132 |
- dev-libs/openssl:0=[-bindist(-)] |
133 |
- ${LUA_DEPS} |
134 |
-" |
135 |
-DEPEND="${RDEPEND}" |
136 |
-BDEPEND=" |
137 |
- virtual/pkgconfig |
138 |
- test? ( ${RDEPEND} ) |
139 |
-" |
140 |
- |
141 |
-DOCS=( "README.md" "samples/." ) |
142 |
- |
143 |
-src_prepare() { |
144 |
- default |
145 |
- |
146 |
- # Allow override of LUA* variables |
147 |
- sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die |
148 |
- |
149 |
- # Disable TestCMS test suite, as it fails |
150 |
- # See: https://github.com/zhaozg/lua-openssl/issues/230 |
151 |
- sed -e '/6.cms.lua/d' -i test/test.lua || die |
152 |
- |
153 |
- # Prepare needed dependencies (source code files only) |
154 |
- rm -r deps/{auxiliar,lua-compat} || die |
155 |
- mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die |
156 |
- mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die |
157 |
- |
158 |
- lua_copy_sources |
159 |
-} |
160 |
- |
161 |
-lua_src_compile() { |
162 |
- pushd "${BUILD_DIR}" || die |
163 |
- |
164 |
- local myemakeargs=( |
165 |
- "AR=$(tc-getAR)" |
166 |
- "CC=$(tc-getCC)" |
167 |
- "LUA=" |
168 |
- "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" |
169 |
- "LUA_LIBS=${LDFLAGS}" |
170 |
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" |
171 |
- "TARGET_SYS=${CTARGET:-${CHOST}}" |
172 |
- ) |
173 |
- |
174 |
- emake "${myemakeargs[@]}" |
175 |
- |
176 |
- popd |
177 |
-} |
178 |
- |
179 |
-src_compile() { |
180 |
- lua_foreach_impl lua_src_compile |
181 |
-} |
182 |
- |
183 |
-lua_src_test() { |
184 |
- pushd "${BUILD_DIR}" || die |
185 |
- |
186 |
- local myemakeargs=( |
187 |
- "LUA=${ELUA}" |
188 |
- "LUA_CFLAGS=" |
189 |
- "LUA_LIBS=" |
190 |
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" |
191 |
- "TARGET_SYS=${CTARGET:-${CHOST}}" |
192 |
- ) |
193 |
- |
194 |
- emake "${myemakeargs[@]}" test |
195 |
- |
196 |
- popd |
197 |
-} |
198 |
- |
199 |
-src_test() { |
200 |
- lua_foreach_impl lua_src_test |
201 |
-} |
202 |
- |
203 |
-lua_src_install() { |
204 |
- pushd "${BUILD_DIR}" || die |
205 |
- |
206 |
- local myemakeargs=( |
207 |
- "LUA=" |
208 |
- "LUA_CFLAGS=" |
209 |
- "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" |
210 |
- "LUA_LIBS=" |
211 |
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" |
212 |
- "TARGET_SYS=${CTARGET:-${CHOST}}" |
213 |
- ) |
214 |
- |
215 |
- emake "${myemakeargs[@]}" install |
216 |
- |
217 |
- insinto "$(lua_get_lmod_dir)" |
218 |
- doins -r "lib/." |
219 |
- |
220 |
- popd |
221 |
-} |
222 |
- |
223 |
-src_install() { |
224 |
- lua_foreach_impl lua_src_install |
225 |
- |
226 |
- einstalldocs |
227 |
-} |
228 |
|
229 |
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 |
230 |
deleted file mode 100644 |
231 |
index 47fb802ba0d3..000000000000 |
232 |
--- a/dev-lua/lua-openssl/lua-openssl-0.8.0_p6-r1.ebuild |
233 |
+++ /dev/null |
234 |
@@ -1,131 +0,0 @@ |
235 |
-# Copyright 1999-2021 Gentoo Authors |
236 |
-# Distributed under the terms of the GNU General Public License v2 |
237 |
- |
238 |
-EAPI=7 |
239 |
- |
240 |
-EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" |
241 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
242 |
-MY_PN_AUX="lua-auxiliar" |
243 |
-MY_PN_COMPAT="lua-compat-5.3" |
244 |
-MY_PV="${PV//_p/-}" |
245 |
-MY_PV_COMPAT="0.10" |
246 |
- |
247 |
-inherit lua toolchain-funcs |
248 |
- |
249 |
-DESCRIPTION="OpenSSL binding for Lua" |
250 |
-HOMEPAGE="https://github.com/zhaozg/lua-openssl" |
251 |
-SRC_URI=" |
252 |
- https://github.com/zhaozg/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz |
253 |
- https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz |
254 |
- https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz |
255 |
-" |
256 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
257 |
- |
258 |
-LICENSE="MIT openssl PHP-3" |
259 |
-SLOT="0" |
260 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
261 |
-IUSE="test" |
262 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
263 |
-RESTRICT="!test? ( test )" |
264 |
- |
265 |
-RDEPEND=" |
266 |
- !dev-lua/luaossl |
267 |
- !dev-lua/luasec |
268 |
- dev-libs/openssl:0=[-bindist(-)] |
269 |
- ${LUA_DEPS} |
270 |
-" |
271 |
-DEPEND="${RDEPEND}" |
272 |
-BDEPEND=" |
273 |
- virtual/pkgconfig |
274 |
- test? ( ${RDEPEND} ) |
275 |
-" |
276 |
- |
277 |
-DOCS=( "README.md" "samples/." ) |
278 |
- |
279 |
-PATCHES=( "${FILESDIR}/${PN}-0.8.0_p6-testcrl-openssl.patch" ) |
280 |
- |
281 |
-src_prepare() { |
282 |
- default |
283 |
- |
284 |
- # Allow override of LUA* variables |
285 |
- sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die |
286 |
- |
287 |
- # Disable TestCMS test suite, as it fails |
288 |
- # See: https://github.com/zhaozg/lua-openssl/issues/230 |
289 |
- sed -e '/6.cms.lua/d' -i test/test.lua || die |
290 |
- |
291 |
- # Prepare needed dependencies (source code files only) |
292 |
- rm -r deps/{auxiliar,lua-compat} || die |
293 |
- mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die |
294 |
- mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die |
295 |
- |
296 |
- lua_copy_sources |
297 |
-} |
298 |
- |
299 |
-lua_src_compile() { |
300 |
- pushd "${BUILD_DIR}" || die |
301 |
- |
302 |
- local myemakeargs=( |
303 |
- "AR=$(tc-getAR)" |
304 |
- "CC=$(tc-getCC)" |
305 |
- "LUA=" |
306 |
- "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" |
307 |
- "LUA_LIBS=${LDFLAGS}" |
308 |
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" |
309 |
- "TARGET_SYS=${CTARGET:-${CHOST}}" |
310 |
- ) |
311 |
- |
312 |
- emake "${myemakeargs[@]}" |
313 |
- |
314 |
- popd |
315 |
-} |
316 |
- |
317 |
-src_compile() { |
318 |
- lua_foreach_impl lua_src_compile |
319 |
-} |
320 |
- |
321 |
-lua_src_test() { |
322 |
- pushd "${BUILD_DIR}" || die |
323 |
- |
324 |
- local myemakeargs=( |
325 |
- "LUA=${ELUA}" |
326 |
- "LUA_CFLAGS=" |
327 |
- "LUA_LIBS=" |
328 |
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" |
329 |
- "TARGET_SYS=${CTARGET:-${CHOST}}" |
330 |
- ) |
331 |
- |
332 |
- emake "${myemakeargs[@]}" test |
333 |
- |
334 |
- popd |
335 |
-} |
336 |
- |
337 |
-src_test() { |
338 |
- lua_foreach_impl lua_src_test |
339 |
-} |
340 |
- |
341 |
-lua_src_install() { |
342 |
- pushd "${BUILD_DIR}" || die |
343 |
- |
344 |
- local myemakeargs=( |
345 |
- "LUA=" |
346 |
- "LUA_CFLAGS=" |
347 |
- "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" |
348 |
- "LUA_LIBS=" |
349 |
- "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" |
350 |
- "TARGET_SYS=${CTARGET:-${CHOST}}" |
351 |
- ) |
352 |
- |
353 |
- emake "${myemakeargs[@]}" install |
354 |
- |
355 |
- insinto "$(lua_get_lmod_dir)" |
356 |
- doins -r "lib/." |
357 |
- |
358 |
- popd |
359 |
-} |
360 |
- |
361 |
-src_install() { |
362 |
- lua_foreach_impl lua_src_install |
363 |
- |
364 |
- einstalldocs |
365 |
-} |