git: d1122e068529 - main - devel/git: Update to 2.43.1

The branch main has been updated by garga:

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

commit d1122e068529845ee4aee2ed3ace6a16c3597547
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-02-13 16:34:37 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-02-13 16:36:31 +0000

    devel/git: Update to 2.43.1
    
    Import a patch applied on git main branch after 2.43.1 was released to
    fix build without CURL.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 devel/git/Makefile                    |  3 +--
 devel/git/distinfo                    | 14 ++++++-------
 devel/git/files/patch-fix-imap-send.c | 39 +++++++++++++++++++++++++++++++++++
 devel/git/pkg-plist                   |  1 +
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 383c199874ff..3561e392586c 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	git
-DISTVERSION=	2.43.0
-PORTREVISION=	1
+DISTVERSION=	2.43.1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index f3eda8bfe6e4..cb001aa50df5 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1700510344
-SHA256 (git-2.43.0.tar.xz) = 5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec
-SIZE (git-2.43.0.tar.xz) = 7382996
-SHA256 (git-manpages-2.43.0.tar.xz) = ef18df09444a60c70be996a481fde093928996055f61a585e9ea07b5bdc6d4d8
-SIZE (git-manpages-2.43.0.tar.xz) = 570356
-SHA256 (git-htmldocs-2.43.0.tar.xz) = 8b02e46a5fb41971be8cd2347dbc14d53802a08b0822adc1f822831da8f31f60
-SIZE (git-htmldocs-2.43.0.tar.xz) = 1543348
+TIMESTAMP = 1707501533
+SHA256 (git-2.43.1.tar.xz) = 2234f37b453ff8e4672c21ad40d41cc7393c9a8dcdfe640bec7ac5b5358f30d2
+SIZE (git-2.43.1.tar.xz) = 7388400
+SHA256 (git-manpages-2.43.1.tar.xz) = 8d93efedcbffb538b6f4284a38423cff7132934420840632af3e5ef454676b8c
+SIZE (git-manpages-2.43.1.tar.xz) = 570624
+SHA256 (git-htmldocs-2.43.1.tar.xz) = 8b450a6608f3b86a3051748aa8c402bc43c9f93c7c5e1c4ec35c792332667f68
+SIZE (git-htmldocs-2.43.1.tar.xz) = 1545040
diff --git a/devel/git/files/patch-fix-imap-send.c b/devel/git/files/patch-fix-imap-send.c
new file mode 100644
index 000000000000..2db3c5449490
--- /dev/null
+++ b/devel/git/files/patch-fix-imap-send.c
@@ -0,0 +1,39 @@
+commit 30bced3a67
+Author: Philippe Blain <levraiphilippeblain@gmail.com>
+Date:   Thu Feb 1 21:18:33 2024
+
+    imap-send: add missing "strbuf.h" include under NO_CURL
+    
+    Building with NO_CURL is currently broken since imap-send.c uses things
+    defined in "strbuf.h" wihtout including it.
+    
+    The inclusion of that header was removed in eea0e59ffb (treewide: remove
+    unnecessary includes in source files, 2023-12-23), which failed to
+    notice that "strbuf.h" was transitively included in imap-send.c via
+    "http.h", but only if USE_CURL_FOR_IMAP_SEND is defined. Add back the
+    missing include. Note that it was explicitely added in 3307f7dde2
+    (imap-send: include strbuf.h, 2023-05-17) after a similar breakage in
+    ba3d1c73da (treewide: remove unnecessary cache.h includes, 2023-02-24) -
+    see the thread starting at [1].
+    
+    It can be verified by inspection that this is the only case where a
+    header we include is dependent on a Makefile knob in the files modified
+    in eea0e59ffb.
+    
+    [1] https://lore.kernel.org/git/20230517070632.71884-1-list@eworm.de/
+    
+    Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
+    Signed-off-by: Junio C Hamano <gitster@pobox.com>
+
+diff --git imap-send.c imap-send.c
+index 904cb23cf5..9b1806a285 100644
+--- imap-send.c
++++ imap-send.c
+@@ -28,6 +28,7 @@
+ #include "run-command.h"
+ #include "parse-options.h"
+ #include "setup.h"
++#include "strbuf.h"
+ #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG)
+ typedef void *SSL;
+ #endif
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 200dabd62897..74e2628c4577 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -826,6 +826,7 @@ share/man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.42.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.42.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt