mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
libucl: update to 0.8.2.
This commit is contained in:
parent
101ab6e795
commit
fcc0407b62
2 changed files with 5 additions and 44 deletions
|
@ -1,41 +0,0 @@
|
||||||
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
|
|
||||||
---
|
|
||||||
configure.ac | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 8aa3d17..731b711 100644
|
|
||||||
--- 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])
|
|
|
@ -1,17 +1,19 @@
|
||||||
# Template file for 'libucl'
|
# Template file for 'libucl'
|
||||||
pkgname=libucl
|
pkgname=libucl
|
||||||
version=0.8.1
|
version=0.8.2
|
||||||
revision=6
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-urls --enable-signatures"
|
configure_args="--enable-urls --enable-signatures"
|
||||||
hostmakedepends="automake libtool pkg-config"
|
hostmakedepends="automake libtool pkg-config"
|
||||||
makedepends="libcurl-devel"
|
makedepends="libcurl-devel"
|
||||||
|
checkdepends="xz"
|
||||||
short_desc="Universal configuration library parser"
|
short_desc="Universal configuration library parser"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="BSD-2-Clause"
|
license="BSD-2-Clause"
|
||||||
homepage="https://github.com/vstakhov/libucl"
|
homepage="https://github.com/vstakhov/libucl"
|
||||||
|
changelog="https://github.com/vstakhov/libucl/raw/master/ChangeLog.md"
|
||||||
distfiles="https://github.com/vstakhov/libucl/archive/${version}.tar.gz"
|
distfiles="https://github.com/vstakhov/libucl/archive/${version}.tar.gz"
|
||||||
checksum=a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef
|
checksum=d95a0e2151cc167a0f3e51864fea4e8977a0f4c473faa805269a347f7fb4e165
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
|
Loading…
Add table
Reference in a new issue