From nobody Tue Feb 13 16:36:42 2024 X-Original-To: dev-commits-ports-main@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 4TZ6RH0bCkz59CJX; Tue, 13 Feb 2024 16:36:43 +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 4TZ6RH03z9z4nvs; Tue, 13 Feb 2024 16:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707842203; 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=XT+YTvLaTc2w2Wcl/vkRknG7PVgJ8j1HF5XWTgB5Tfc=; b=k+NHNCaC4rP311XKLoYJFlfeOzYdcYB+dKniLLUGsQHLopnL+K8/Y7Mr3YutpuRw/xduIY 6ON5wgGbvR54YgUwiqEoAPZ2EX2dEJxEw+bmPB1wnx1K0oH3VvR864bVnGRjq8CsRhYWZi uNPzVUdjfIHOFelD54HB+X0jp2poyFIsGqfOMaYJ7SwkBZBBNH5DCobpaJmQa2GRww5IsU A1zRwAFJac24FZj0TJjWxwM7OvCZFiODTuZlhGNWDtpZZGODBwpXmkYPQlebWHHwQxWHHv UuYG8+QB9TZfCt0KZwSW7X8LIpER4SPUVQmltfkdoaEfQ7PuN2lKw5/Ka9tgvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707842203; a=rsa-sha256; cv=none; b=B8+oDsteXVmTrfje3OoS49TYXq9AKsq+wNaAtFnTELdmc9hlMXrSvxreQmRYD4BHK+Fc6j Pfrbhu5VfmFVAk3dChgI9tBjT+1np7+6lUOzHYm3TyjrzsS7OjLuSnp8qAgwtrjpvITAy6 OtyjMVxH4wIeX4g/Y+BZ9I/SU6oR6mrRck2r2SDJ2/adk8PsVrMWwd3HQ5aD1g7Y5dzZ5W wQ62nNl/MtnOro1Ensozqse7YLOsxp4ed/jcL01EEcY5MiyBWDUlvvMRexfKcOb6hYt1Oo durl9LGxXAsf5knYzzltYqepSyfcERu9lgiLWy8bVHl6ANGHgR/1+5PBd3uOXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707842203; 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=XT+YTvLaTc2w2Wcl/vkRknG7PVgJ8j1HF5XWTgB5Tfc=; b=tmGO+VYhlqC85viZKj1Ma4aDXBpHoxzpuBhKPAmip+PUIap35icDkTzaqNHzKiDFBarslM 7a4vHPuNuG2P2sVUrIIYDKOCw4tHKcWON/MNfMrIRvLvl6BT+LHW2yBzfgF8kz2eG8l8Z1 cqAS8X/Krg3OCuQSkJ8Nb5BwJvOUkyNX3V6X/3ATmWhJ5S6V47TdNF01gO5+M8zUJyWdXe A1aiF36OFNLcl0PIOLB5QMGzUouAKx5yTdNLLmRuLtP3j6o6vQnQDG5DtJ/OuYDixwmKEj qbVezFl8sundNya3HvpwzBvC/5N5F3fla8lhrLcylVS/DYzSwEbTsWh3Sy/UFw== 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 4TZ6RG5wsYzMSH; Tue, 13 Feb 2024 16:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DGagsG020222; Tue, 13 Feb 2024 16:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DGagAn020219; Tue, 13 Feb 2024 16:36:42 GMT (envelope-from git) Date: Tue, 13 Feb 2024 16:36:42 GMT Message-Id: <202402131636.41DGagAn020219@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: d1122e068529 - main - devel/git: Update to 2.43.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1122e068529845ee4aee2ed3ace6a16c3597547 Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1122e068529845ee4aee2ed3ace6a16c3597547 commit d1122e068529845ee4aee2ed3ace6a16c3597547 Author: Renato Botelho AuthorDate: 2024-02-13 16:34:37 +0000 Commit: Renato Botelho 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 +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 + Signed-off-by: Junio C Hamano + +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