commit: 2dd974e5548b888ccf976dbc48ed4c37cd59e731 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Sep 10 13:16:10 2024 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Sep 10 13:20:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd974e5
dev-libs/libucl: drop 0.8.1-r100 Both bugs are no longer present in version dev-libs/libucl-0.9.2. Closes: https://bugs.gentoo.org/880219 Closes: https://bugs.gentoo.org/833464 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> dev-libs/libucl/Manifest | 1 - .../libucl/files/libucl-0.8.1-openssl-1.1.1.patch | 39 ----------- dev-libs/libucl/libucl-0.8.1-r100.ebuild | 75 ---------------------- 3 files changed, 115 deletions(-) diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest index d74b4cc231c5..4444ec1e34e8 100644 --- a/dev-libs/libucl/Manifest +++ b/dev-libs/libucl/Manifest @@ -1,3 +1,2 @@ -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 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 <[email protected]> -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/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 -}
