git: 3fd98fa0c108 - main - security/libssh2: Backport upstream commits

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Thu, 31 Oct 2024 19:56:22 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3fd98fa0c1081fc2af3c2b9343266c6cc1b53d7d

commit 3fd98fa0c1081fc2af3c2b9343266c6cc1b53d7d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-10-31 19:50:23 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-10-31 19:56:19 +0000

    security/libssh2: Backport upstream commits
    
    Backport upstream commit 5d03b4f94ac6740e0085a6acda6fc417ca6ecc83 and
    d4e43c7b69d10b6cfaaa53787addfd4beac7a3ce
    
    References:
    https://github.com/libssh2/libssh2/commit/5d03b4f94ac6740e0085a6acda6fc417ca6ecc83
    https://github.com/libssh2/libssh2/commit/d4e43c7b69d10b6cfaaa53787addfd4beac7a3ce
    
    Approved by:    portmgr (blanket, build fix)
---
 security/libssh2/Makefile | 4 ++++
 security/libssh2/distinfo | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index fe7f1e10a818..5c328d8fcedd 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -5,6 +5,10 @@ CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		https://www.libssh2.org/download/
 
+PATCH_SITES=	https://github.com/libssh2/libssh2/commit/
+PATCHFILES=	5d03b4f94ac6740e0085a6acda6fc417ca6ecc83.patch:-p1 \
+		d4e43c7b69d10b6cfaaa53787addfd4beac7a3ce.patch:-p1
+
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol
 WWW=		https://www.libssh2.org/
diff --git a/security/libssh2/distinfo b/security/libssh2/distinfo
index b41509a91849..172373e7606f 100644
--- a/security/libssh2/distinfo
+++ b/security/libssh2/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1729096176
+TIMESTAMP = 1730400101
 SHA256 (libssh2-1.11.1.tar.xz) = 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769
 SIZE (libssh2-1.11.1.tar.xz) = 721700
+SHA256 (5d03b4f94ac6740e0085a6acda6fc417ca6ecc83.patch) = 8bf8dd96324f5e934cba3f850a70887f769dcef255f93f13b30f354c1c5e009f
+SIZE (5d03b4f94ac6740e0085a6acda6fc417ca6ecc83.patch) = 3073
+SHA256 (d4e43c7b69d10b6cfaaa53787addfd4beac7a3ce.patch) = c9feb7d3d8c2b1619cb7bf2be2aa86830bf9f27b0ba470a192d33e510a23b3f3
+SIZE (d4e43c7b69d10b6cfaaa53787addfd4beac7a3ce.patch) = 2684