mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

security/libressl: Fix merge conflict

Browse Source
This commit is contained in:
Bernard Spil 2021-11-28 11:30:36 +00:00
parent 25a58494c9
commit d225577e82
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/libressl/Makefile
View File

@ -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>

6
security/libressl/distinfo
View File

@ -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