From nobody Fri Feb 25 09:35:21 2022 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 0607019DBEF6; Fri, 25 Feb 2022 09:35:22 +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 4K4l4T6b09z4lms; Fri, 25 Feb 2022 09:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645781721; 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=Hd+iSU+GC5zObiyGvlv8UTphsbAsz5d4GyZJGb5mVkM=; b=gLb0ZfcMH29dnF86kUfw+Yb7tV1QklrOJBkKZaNlmB2QpQY4FzKT7x/1x+VAf6KbYKaDP4 4PboFBW9tt033RW1fNY+D50NjdohTHkcqUgcd/gHv+DY0dk4AVXj1GRTk8i9l9//1UVEgn IU7YlNxIToNV2OG5ZIEPKYsTv6o5/XMtttJHCHKfhyNtmdv9WIq2IhzcY2bWpFKQGm4K6T C2CxBA5gb3wqaIcg3Rkn/MWlLDqC/EfbnUuOslHKI8PtZf5+NYTjwcaxGLZPzMl8sA1Da6 8qiSyiJCy2ArkRv9h5ZUA3p5j9ayvDe28XQVke4AG6fGSIWSgfrdH37hPPOMAQ== 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 BF8D41D499; Fri, 25 Feb 2022 09:35:21 +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 21P9ZLvW094808; Fri, 25 Feb 2022 09:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21P9ZLuQ094807; Fri, 25 Feb 2022 09:35:21 GMT (envelope-from git) Date: Fri, 25 Feb 2022 09:35:21 GMT Message-Id: <202202250935.21P9ZLuQ094807@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 66b541d491a1 - main - security/tinc-devel: fix regression with some openssl versions 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: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66b541d491a18c4b7b84504ae79210da81802f05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645781721; 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=Hd+iSU+GC5zObiyGvlv8UTphsbAsz5d4GyZJGb5mVkM=; b=sC8tKmuv1MxkQ7Em93TmWixv+vFtjOZl06fR60x9ArSNWoV7ejVA/d+hr15HQ7YvAmDLaH YThxWxqRQZyzNOFVb8EoalACtv/e6mRFD8CG8WNuw213X2jza9incdsLZ6FErH9DrUPHa8 7at1W1v6W8XhKkM67rBhayjrqUN458Fp/Wcw6PJmZYBWFSe/xZLpgUrezGFEbQ7Im4ndL5 S4C6lQGAtfUEa5422ity634EL6MTURX7jE0EOjqJ8nrsj2zsK4jcZDWQNodlo0Mt3rV0I6 bKIb4iKgmVYcfZboavNGKRpFG/O3tOxC3zCVD3nABVCHl9mFF/m46hQ+mQd34A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645781721; a=rsa-sha256; cv=none; b=EoF6xsf/bnRt5e4OC3p6HoRn1NlrbA6wyrBAoHtd4bqkMETX3rXAcladz1EI7o6nvRbBP4 OfM9mdncx6+1D+pJEFUEq8gcYhzNBlrvURVbgVbeoyMZKzIafiR4Uby342I1kDBO+5hO2i uPHUUC0gC3r4Cr79ixXvBopsRAGqK0o1Ep1I8bWCNnppOGhu7DZxTAoVjY/5N7x6rytmuL LBLOaAQG1Jqj5SHEY1dtzX/NT7xGfFAvGIuncdWjmU+ub5Rntukis09NBDLnmePKAUnkVG Qdi/84tIjNgUuo31D33mue9e1TFNDVnGSZn9M9mr075fUxxRQcvvTRBDEUWQzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=66b541d491a18c4b7b84504ae79210da81802f05 commit 66b541d491a18c4b7b84504ae79210da81802f05 Author: Dirk Meyer AuthorDate: 2022-02-25 09:32:16 +0000 Commit: Dirk Meyer CommitDate: 2022-02-25 09:35:14 +0000 security/tinc-devel: fix regression with some openssl versions PR: 262107 --- security/tinc-devel/Makefile | 1 + security/tinc-devel/files/patch-cipher.c | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/security/tinc-devel/Makefile b/security/tinc-devel/Makefile index 332f167b1f0e..7844c8ac0d9c 100644 --- a/security/tinc-devel/Makefile +++ b/security/tinc-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= tinc PORTVERSION= 1.1pre18 +PORTREVISION= 1 CATEGORIES= security net-vpn MASTER_SITES= https://www.tinc-vpn.org/packages/ \ http://www.tinc-vpn.org/packages/ diff --git a/security/tinc-devel/files/patch-cipher.c b/security/tinc-devel/files/patch-cipher.c deleted file mode 100644 index 206b330567de..000000000000 --- a/security/tinc-devel/files/patch-cipher.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/openssl/cipher.c.orig 2018-10-07 11:43:07 UTC -+++ src/openssl/cipher.c -@@ -189,7 +189,7 @@ bool cipher_decrypt(cipher_t *cipher, const void *inda - } else { - int len; - -- if(EVP_EncryptUpdate(cipher->ctx, outdata, &len, indata, inlen)) { -+ if(EVP_DecryptUpdate(cipher->ctx, outdata, &len, indata, inlen)) { - if(outlen) { - *outlen = len; - }