git: 18f11552c6e5 - main - devel/git: Update to 2.43.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Feb 2024 17:47:54 UTC
The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=18f11552c6e53c67049fe22d355b7c1f3935e23d commit 18f11552c6e53c67049fe22d355b7c1f3935e23d Author: Renato Botelho <garga@FreeBSD.org> AuthorDate: 2024-02-14 17:46:51 +0000 Commit: Renato Botelho <garga@FreeBSD.org> CommitDate: 2024-02-14 17:47:48 +0000 devel/git: Update to 2.43.2 Sponsored by: Rubicon Communications, LLC ("Netgate") --- devel/git/Makefile | 2 +- devel/git/distinfo | 14 ++++++------- devel/git/files/patch-fix-imap-send.c | 39 ----------------------------------- devel/git/pkg-plist | 1 + 4 files changed, 9 insertions(+), 47 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 3561e392586c..44a5a4d2e893 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,5 @@ PORTNAME= git -DISTVERSION= 2.43.1 +DISTVERSION= 2.43.2 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/devel/git/distinfo b/devel/git/distinfo index cb001aa50df5..e31a9edce1d5 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,7 @@ -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 +TIMESTAMP = 1707931702 +SHA256 (git-2.43.2.tar.xz) = f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9 +SIZE (git-2.43.2.tar.xz) = 7388636 +SHA256 (git-manpages-2.43.2.tar.xz) = 3739b021aa186a59de42153b70306684e7da85715d37a1b3bfe614c3dda0cab1 +SIZE (git-manpages-2.43.2.tar.xz) = 570496 +SHA256 (git-htmldocs-2.43.2.tar.xz) = 9b3265e3a825f6eaac3ef29b2ae82aeffd71f30e039f2e173f9df95e15d6ebf7 +SIZE (git-htmldocs-2.43.2.tar.xz) = 1545440 diff --git a/devel/git/files/patch-fix-imap-send.c b/devel/git/files/patch-fix-imap-send.c deleted file mode 100644 index 2db3c5449490..000000000000 --- a/devel/git/files/patch-fix-imap-send.c +++ /dev/null @@ -1,39 +0,0 @@ -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 74e2628c4577..99892a8b1157 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -827,6 +827,7 @@ share/man/man7/gitworkflows.7.gz %%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.43.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt