diff options
Diffstat (limited to 'dev-libs/libucl')
| -rw-r--r-- | dev-libs/libucl/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch | 39 | ||||
| -rw-r--r-- | dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch | 36 | ||||
| -rw-r--r-- | dev-libs/libucl/libucl-0.8.1-r100.ebuild | 75 | ||||
| -rw-r--r-- | dev-libs/libucl/libucl-0.9.0.ebuild | 74 |
5 files changed, 0 insertions, 230 deletions
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest index 14ea174ed7be..e666d4d1dc0d 100644 --- a/dev-libs/libucl/Manifest +++ b/dev-libs/libucl/Manifest @@ -1,10 +1,4 @@ -AUX libucl-0.8.1-openssl-1.1.1.patch 1595 BLAKE2B 2992f092b1773a1b6ea41354efc9b47aa389635bcf87b503edb3f292062faa1c3f34247e485b806394818b3111cb10741d8e5feab4766011f5d8e9376c797637 SHA512 8cea479cf028ffb68d0449f09d1291f5866664a96b74075297393dd0ac180c700025b3bdd9e5ca7a52b69c897bc075bf9c2ac710d092d0edd4e234252663d65f -AUX libucl-0.9.0-gchar-compile.patch 1011 BLAKE2B c5aae42dd37d9a52feaf3e01fd49dea19d284d6c9cd2206e796f58a81f590ffc397c13e24a875de3d2a70ef14ec1e8491b9a4d0c4d137daa9cc907727c216e43 SHA512 96e8184d357d35a47b33d41187f885cfb9c4fd7278a945799232975f5d849f5a8e25bca131759a6f9aee66937e4aacad35155a006635d3c56aa81805d5f5af8b -DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af -DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1 SHA512 a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5 DIST libucl-0.9.2.tar.gz 2044512 BLAKE2B c0290584517df16ea0e06aa8b5e8c62e8d4f883242a06bec0c385e4d0f5fe8092e076dcb80754963bfca38a9dff62744946096ae16eb547bfc61ffb158951ac4 SHA512 4df54788406baf81c80156cadd938b33aa9a16859981aaa4f82ff447183d87016f647ed22fcdf29fda51b25a58f99f7a1892305aff7c97615f05c125f5966066 -EBUILD libucl-0.8.1-r100.ebuild 1534 BLAKE2B 702ceb04306a8fa6bf6e76da2429fd5348e7eed32c430735c85fe3829341658d3e2695357e1702e799b84475dd8159822a31bd183b3f8edf875d25ddffb8d1bf SHA512 f88801247bd1ace4f9f4b2d9ac48dccc072e26d3e1eca1df33c5f18fff8e27f8b1fea8844547ca9aabe19d84ad6120f58550dd434375c0c409f12beea9443e64 -EBUILD libucl-0.9.0.ebuild 1487 BLAKE2B 802ed03701d32cb60e879e3c1bacccc8b6f25944b2f7dd3dbb316a962373d578adedd5cc06f52168320fba3f513c5425c327c801e9801b643d1889f639f342ba SHA512 7f26dc654981218fdf7c26509dfb3476a938f44391d290ddb6fbabc9947b60befe121b995bfbb9b01446bed5f40fe067eacccec343e0d2ce3a1a9b8ed2c15478 EBUILD libucl-0.9.2.ebuild 1434 BLAKE2B 3501bb88f192a1d3f84cbe42739b2bb9c4ede7ee065052acbc4093e71ee49f23bb5c38b2aec410ffbe205fa72741ab1c63ab98fab9dda9a8aa07020848e1538d SHA512 f3dccdb45e8ad6640fe2c23c5a576af1db3a71ee3ecd3218c5c85582a92d88a5ed150ce88d0cf3e51eb31ee9ef904b144a9086d5af94cda92f7b0a46bd0c0719 EBUILD libucl-9999.ebuild 1434 BLAKE2B 3501bb88f192a1d3f84cbe42739b2bb9c4ede7ee065052acbc4093e71ee49f23bb5c38b2aec410ffbe205fa72741ab1c63ab98fab9dda9a8aa07020848e1538d SHA512 f3dccdb45e8ad6640fe2c23c5a576af1db3a71ee3ecd3218c5c85582a92d88a5ed150ce88d0cf3e51eb31ee9ef904b144a9086d5af94cda92f7b0a46bd0c0719 MISC metadata.xml 837 BLAKE2B 5ae3fa47a9bfdd5676f70f7a6d5f0f8be5d6139485775aa04e0e5d5681fdf8363089c7a0699b5faa0bb5502d4d3c5273ca071a7ec3f492e3c787be28da97ae48 SHA512 a1def93d027d9c8eb2dfe116a72916bbab70f6737145c2e3ca82b0c219ca5983ce70b5a9c81248e8f39b7b5840fe81788c2b413103d864738b11fa8d6b2e1731 diff --git a/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch b/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch deleted file mode 100644 index f10f882acc6b..000000000000 --- a/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/797364 -https://github.com/vstakhov/libucl/commit/c7141327180cff73904b28f04cfdb604fc7d0773 - -From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001 -From: Alexandru Guzinschi <alex@gentle.ro> -Date: Fri, 11 Sep 2020 11:41:54 +0300 -Subject: [PATCH] fix: Changed OpenSSL check inside configure.am - -In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()` -functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`. -Because a check for `EVP_MD_CTX_create()` was in place inside -configure.am, building with newer OpenSSL versions could not be done. - -Checking for `EVP_MD_CTX_create` function from configure.am was -replaced with a check for `CRYPTO_new_ex_data()` function. - -Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0, -no code changes are necessary. - -Fixes: #203 - -[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502 ---- a/configure.ac -+++ b/configure.ac -@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils], - AM_CONDITIONAL([UTILS], [test x$utils = xtrue]) - - AS_IF([test "x$enable_signatures" = "xyes"], [ -- AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [ -+ AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [ - AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).]) - LIBCRYPTO_LIB="-lcrypto" - LIBS_EXTRA="${LIBS_EXTRA} -lcrypto" -- ], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])]) -+ ], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])]) - ]) - AC_SUBST(LIBCRYPTO_LIB) - AC_PATH_PROG(PANDOC, pandoc, [/non/existent]) - diff --git a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch b/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch deleted file mode 100644 index 9ec9105276c1..000000000000 --- a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch +++ /dev/null @@ -1,36 +0,0 @@ -Merged as: https://github.com/vstakhov/libucl/commit/708f5e21e3d85f56cdcbcbc418d8725f53bf390b -From: Vsevolod Stakhov <vsevolod@rspamd.com> -Date: Tue, 6 Feb 2024 15:59:48 +0000 -Subject: [PATCH] Fix lua compile issues - -Issue: #282 ---- a/lua/lua_ucl.c -+++ b/lua/lua_ucl.c -@@ -406,7 +406,6 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags) - - /* Table iterate */ - if (is_array) { -- int i; - - if (!is_implicit) { - top = ucl_object_typed_new (UCL_ARRAY); -@@ -416,7 +415,7 @@ ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags) - top = NULL; - } - -- for (i = 1; i <= max; i ++) { -+ for (size_t i = 1; i <= max; i ++) { - lua_pushinteger (L, i); - lua_gettable (L, idx); - -@@ -886,8 +885,8 @@ lua_ucl_parser_parse_text (lua_State *L) - t = lua_touserdata (L, 2); - } - else if (lua_type (L, 2) == LUA_TSTRING) { -- const gchar *s; -- gsize len; -+ const char *s; -+ size_t len; - static struct _rspamd_lua_text st_t; - - s = lua_tolstring (L, 2, &len); diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild deleted file mode 100644 index 7452ade35ada..000000000000 --- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} ) -inherit lua-single autotools - -DESCRIPTION="Universal configuration library parser" -HOMEPAGE="https://github.com/vstakhov/libucl" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vstakhov/libucl.git" -else - SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="lua +regex sign urls +utils static-libs test" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -DEPEND="!!dev-libs/ucl - lua? ( ${LUA_DEPS} ) - urls? ( net-misc/curl ) - sign? ( dev-libs/openssl:0= ) -" -BDEPEND="${DEPEND} - virtual/pkgconfig -" -RDEPEND="${DEPEND}" - -DOCS=( README.md doc/api.md ) - -PATCHES=( - "${FILESDIR}"/${P}-openssl-1.1.1.patch -) - -pkg_setup() { - use lua && lua_pkg_setup -} - -src_prepare() { - default - rm tests/schema/{definitions,ref{,Remote}}.json || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "$(use_enable lua)" - "$(use_enable regex)" - "$(use_enable sign signatures)" - "$(use_enable urls)" - "$(use_enable utils)" - ) - use lua && myeconfargs+=( - LUA_INCLUDE="$(lua_get_CFLAGS)" - LIB_LIBS="$(lua_get_LIBS)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - use lua && DOCS+=( "doc/lua_api.md" ) - einstalldocs - if ! use static-libs; then - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ - die "error while deleting static library" - fi -} diff --git a/dev-libs/libucl/libucl-0.9.0.ebuild b/dev-libs/libucl/libucl-0.9.0.ebuild deleted file mode 100644 index 86d714ebb85a..000000000000 --- a/dev-libs/libucl/libucl-0.9.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -inherit lua-single autotools - -DESCRIPTION="Universal configuration library parser" -HOMEPAGE="https://github.com/vstakhov/libucl" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vstakhov/libucl.git" -else - SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD-2" -SLOT="0/9" -IUSE="lua +regex sign urls +utils static-libs test" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -DEPEND="!!dev-libs/ucl - lua? ( ${LUA_DEPS} ) - urls? ( net-misc/curl ) - sign? ( dev-libs/openssl:0= ) -" -BDEPEND="${DEPEND} - virtual/pkgconfig -" -RDEPEND="${DEPEND}" - -DOCS=( README.md doc/api.md ) - -PATCHES=( - "${FILESDIR}"/${P}-gchar-compile.patch -) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - "$(use_enable lua)" - "$(use_enable regex)" - "$(use_enable sign signatures)" - "$(use_enable urls)" - "$(use_enable utils)" - ) - use lua && myeconfargs+=( - LUA_INCLUDE="$(lua_get_CFLAGS)" - LIB_LIBS="$(lua_get_LIBS)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - use lua && DOCS+=( "doc/lua_api.md" ) - einstalldocs - if ! use static-libs; then - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ - die "error while deleting static library" - fi -} |