diff --git a/common/shlibs b/common/shlibs index e262126fe2c..65badf45d01 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1868,7 +1868,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1 libjava.so openjdk10-bootstrap-10.0.2p13_1 libjli.so openjdk10-bootstrap-10.0.2p13_1 libjvm.so openjdk10-bootstrap-10.0.2p13_1 -libucl.so.5 libucl-0.8.1_1 +libucl.so.5 libucl-0.8.1_6 libhandle.so.1 xfsprogs-3.2.1_1 libnfnetlink.so.0 libnfnetlink-1.0.1_1 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1 diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch new file mode 100644 index 00000000000..e049a1b8b17 --- /dev/null +++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch @@ -0,0 +1,41 @@ +From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001 +From: Alexandru Guzinschi +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 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8aa3d17..731b711 100644 +--- configure.ac ++++ 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/srcpkgs/libucl/template b/srcpkgs/libucl/template index afb8f8dcbc0..04b2608684d 100644 --- a/srcpkgs/libucl/template +++ b/srcpkgs/libucl/template @@ -1,7 +1,7 @@ # Template file for 'libucl' pkgname=libucl version=0.8.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-urls --enable-signatures" hostmakedepends="automake libtool pkg-config"