From nobody Sun Nov 28 11:30:56 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2B64418A8865; Sun, 28 Nov 2021 11:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J25rw6KlCz4cbR; Sun, 28 Nov 2021 11:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9BA86551; Sun, 28 Nov 2021 11:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ASBUulH012104; Sun, 28 Nov 2021 11:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ASBUulY012103; Sun, 28 Nov 2021 11:30:56 GMT (envelope-from git) Date: Sun, 28 Nov 2021 11:30:56 GMT Message-Id: <202111281130.1ASBUulY012103@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: d225577e82dc - main - security/libressl: Fix merge conflict List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d225577e82dc23813fcf6500262f2e381d493248 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638099056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDXGyoDL8A4kMj1e9dcNzbW4GyQj/Z2jACHusJRKJfY=; b=Pk7PX/Q37t7enZ5y1NR2FyT5paIUQwQuyTEB27QZUZc7jZqRVKlhStTpgKlIL3OJ92R9GZ SiNhk+x/HmLBjTHc6BWBLH5OQLVTvfbHjvFiiNgcJHm80G9XY+IuXNbdU2kbxp0k77cCPI AQ+Xo5PAEyXbbQGakbvPLjnoxrABLqky432s9u/+5GrPdO622lRfLMC1Ma2N6iGkChmbky FlUiVvITM1svsTqx8EMcYLAI1l2ZW454GWvEELoLeYWHKPXsTbV5BdOMaIm8P6UNHzzBeH LrukcH7RcsLQ7GbGzMvctdqAD1OJjoPBF1i9ReuttYvInhE+xDtSAUDc058eZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638099056; a=rsa-sha256; cv=none; b=UmDVkU6QLboFXbEgwz2QrU1tvsmVL0eskfOOydlJv8vmfXVMRELmf7aFaGmsyJmC1B3RPu EgBTsZscqcj5DGXqINZgetcJmxBuvjs18vcbiCall5re5FncP4ybxG+nPeDntmZHwak4Ol u0O6U2j+YURbzYZbQddWU+kE8N2aAP1Y3eLTkjYn60D22KjHYUV7THeVXUAUBaRnHNtRsB 8c6/OuGDJjPrRBiBLkV00HEwzj64Gph3MzkJDjhk0UWXiv+bFgSmA9iTeRMfChUHCS8WK1 5DEKmpeVvUhJu9oYDHok9ySoY14OQShO1E6Vjb8zTXgGb35W7JCwrlYZhtYECg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d225577e82dc23813fcf6500262f2e381d493248 commit d225577e82dc23813fcf6500262f2e381d493248 Author: Bernard Spil AuthorDate: 2021-11-28 11:30:36 +0000 Commit: Bernard Spil 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 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 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