Date: Sun, 28 Nov 2021 11:30:56 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d225577e82dc - main - security/libressl: Fix merge conflict Message-ID: <202111281130.1ASBUulY012103@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d225577e82dc23813fcf6500262f2e381d493248 commit d225577e82dc23813fcf6500262f2e381d493248 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2021-11-28 11:30:36 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2021-11-28 11:30:36 +0000 security/libressl: Fix merge conflict --- security/libressl/Makefile | 9 +++++---- security/libressl/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 4906e5d40014..cd6d65778118 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -1,7 +1,7 @@ # Created by: Vsevolod Stakhov <vsevolod@FreeBSD.org> PORTNAME= libressl -PORTVERSION= 3.4.1 +PORTVERSION= 3.4.2 CATEGORIES= security devel MASTER_SITES= OPENBSD/LibreSSL @@ -25,9 +25,10 @@ LIBTLS_DESC= Only install libtls (no libcrypto/libssl) MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS_INSTALL= libressl-devel-libtls +CONFLICTS_INSTALL= libressl-devel libtls_CONFLICTS_INSTALL= libretls -default_CONFLICTS_INSTALL= openssl openssl-devel +default_CONFLICTS_INSTALL= openssl \ + openssl-devel .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS @@ -58,7 +59,7 @@ post-install: ${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem post-stage-MAN3-on: - (cd ${STAGEDIR}${MANPREFIX}; find man/man3 -not -type d | \ + (cd ${STAGEDIR}${MANPREFIX}; ${FIND} man/man3 -not -type d | \ ${SED} 's/$$/.gz/' >> ${TMPPLIST}) .include <bsd.port.mk> diff --git a/security/libressl/distinfo b/security/libressl/distinfo index 6bebf8988e70..f3f0168d2cf5 100644 --- a/security/libressl/distinfo +++ b/security/libressl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634377226 -SHA256 (libressl-3.4.1.tar.gz) = 107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c -SIZE (libressl-3.4.1.tar.gz) = 3917346 +TIMESTAMP = 1638095434 +SHA256 (libressl-3.4.2.tar.gz) = cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce +SIZE (libressl-3.4.2.tar.gz) = 3918441
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111281130.1ASBUulY012103>