From 4919ac0c1b407f8a3792c1a14c8f2334c7c78964 Mon Sep 17 00:00:00 2001 From: "Eric N. Vander Weele" Date: Thu, 14 Apr 2022 16:17:07 -0400 Subject: [PATCH] git: update to 2.35.2 Git v2.35.2 Release Notes ========================= This release merges up the fixes that appear in v2.30.3, v2.31.2, v2.32.1, v2.33.2 and v2.34.2 to address the security issue CVE-2022-24765; see the release notes for these versions for details. --- devel/git-base/distinfo | 18 +++++++++--------- .../patches/patch-Documentation_Makefile | 8 ++++---- devel/git-base/patches/patch-Makefile | 4 ++-- devel/git-base/patches/patch-config.mak.uname | 8 ++++---- devel/git-base/patches/patch-git-gui_Makefile | 10 +++++----- devel/git-base/patches/patch-gitk-git_Makefile | 4 ++-- .../git-base/patches/patch-templates_Makefile | 4 ++-- devel/git/Makefile.version | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index eeb512add688..6252a9b3388b 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,11 +1,11 @@ $NetBSD: distinfo,v 1.116 2022/01/31 13:03:42 adam Exp $ -BLAKE2s (git-2.35.1.tar.xz) = 6c607fc9eba2e931f2721fe4fb767e79b9bccb20341560735651d76f1ace9a29 -SHA512 (git-2.35.1.tar.xz) = 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb -Size (git-2.35.1.tar.xz) = 6874520 bytes -SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa -SHA1 (patch-Makefile) = e3e07365a22c8612e0f5ff3b7befb2bdd788dfb8 -SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 -SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7 -SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98 -SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 +BLAKE2s (git-2.35.2.tar.xz) = fa8e71d7758bcb094becbb7c7c3f241c1890f2de3fad163b31fd7cea7b58b78a +SHA512 (git-2.35.2.tar.xz) = fac143daf547f4f1952101bc0006b53ac50c1741394a8c75dc517f595ce58b183c7daabcb23a7f9fc87fe22250e298441b0b7cc7af93820110877d65c036b76a +Size (git-2.35.2.tar.xz) = 6876028 bytes +SHA1 (patch-Documentation_Makefile) = c2d48ee736832492ab1eb23059daf72b90d267ef +SHA1 (patch-Makefile) = 866e6d616a289381192bc4aa5306cec6f2979200 +SHA1 (patch-config.mak.uname) = 1cca6ca4b6a8b1f46ca51f9bf9839f19de9c109b +SHA1 (patch-git-gui_Makefile) = 21774b8ecb17d710ae2a2e4c0e9594e1eefa099f +SHA1 (patch-gitk-git_Makefile) = 675ea67596b4af0e860d29399184efa1c94ccaec +SHA1 (patch-templates_Makefile) = 6af7868a705df6eb5e98b2d9de5abd017faccd5e diff --git a/devel/git-base/patches/patch-Documentation_Makefile b/devel/git-base/patches/patch-Documentation_Makefile index d329f6562dc8..a22f71d831d1 100644 --- a/devel/git-base/patches/patch-Documentation_Makefile +++ b/devel/git-base/patches/patch-Documentation_Makefile @@ -1,11 +1,11 @@ -$NetBSD: patch-Documentation_Makefile,v 1.2 2020/03/19 22:30:30 rillig Exp $ +$NetBSD$ * Use BSD_INSTALL_*. * FIXME: Add "--skip-validation" to xmlto command. ---- Documentation/Makefile.orig 2014-11-26 22:39:03.000000000 +0000 +--- Documentation/Makefile.orig 2022-04-11 22:35:25.000000000 +0000 +++ Documentation/Makefile -@@ -107,7 +107,7 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC +@@ -144,7 +144,7 @@ ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIID TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -14,7 +14,7 @@ $NetBSD: patch-Documentation_Makefile,v 1.2 2020/03/19 22:30:30 rillig Exp $ XMLTO_EXTRA = INSTALL ?= install RM ?= rm -f -@@ -228,16 +228,16 @@ pdf: user-manual.pdf +@@ -263,16 +263,16 @@ pdf: user-manual.pdf install: install-man install-man: man diff --git a/devel/git-base/patches/patch-Makefile b/devel/git-base/patches/patch-Makefile index d906f2fcb9f3..0ddbd3de4492 100644 --- a/devel/git-base/patches/patch-Makefile +++ b/devel/git-base/patches/patch-Makefile @@ -1,11 +1,11 @@ -$NetBSD: patch-Makefile,v 1.5 2022/01/28 09:07:59 adam Exp $ +$NetBSD$ Do not override compiler/linker flags. Provide proper path for Perl module. Do not install git-p4 (requires Python). Fix tar operations. ---- Makefile.orig 2022-01-24 18:15:49.000000000 +0000 +--- Makefile.orig 2022-04-11 22:35:25.000000000 +0000 +++ Makefile @@ -522,7 +522,7 @@ gitexecdir = libexec/git-core mergetoolsdir = $(gitexecdir)/mergetools diff --git a/devel/git-base/patches/patch-config.mak.uname b/devel/git-base/patches/patch-config.mak.uname index c1c1a231df0a..cb915c91c0e4 100644 --- a/devel/git-base/patches/patch-config.mak.uname +++ b/devel/git-base/patches/patch-config.mak.uname @@ -1,8 +1,8 @@ -$NetBSD: patch-config.mak.uname,v 1.4 2014/08/25 07:49:08 adam Exp $ +$NetBSD$ ---- config.mak.uname.orig 2014-08-15 22:26:55.000000000 +0000 +--- config.mak.uname.orig 2022-04-11 22:35:25.000000000 +0000 +++ config.mak.uname -@@ -104,7 +104,7 @@ endif +@@ -161,7 +161,7 @@ endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease NEEDS_NSL = YesPlease @@ -11,7 +11,7 @@ $NetBSD: patch-config.mak.uname,v 1.4 2014/08/25 07:49:08 adam Exp $ SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin HAVE_ALLOCA_H = YesPlease NO_STRCASESTR = YesPlease -@@ -147,8 +147,6 @@ ifeq ($(uname_S),SunOS) +@@ -203,8 +203,6 @@ ifeq ($(uname_S),SunOS) NO_STRTOUMAX = YesPlease GIT_TEST_CMP = cmp endif diff --git a/devel/git-base/patches/patch-git-gui_Makefile b/devel/git-base/patches/patch-git-gui_Makefile index 788301055eea..c169c5064209 100644 --- a/devel/git-base/patches/patch-git-gui_Makefile +++ b/devel/git-base/patches/patch-git-gui_Makefile @@ -1,11 +1,11 @@ -$NetBSD: patch-git-gui_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ +$NetBSD$ Fix installation. Do not build Git Gui.app on Darwin. ---- git-gui/Makefile.orig 2019-11-04 05:07:07.000000000 +0000 +--- git-gui/Makefile.orig 2022-04-11 22:35:25.000000000 +0000 +++ git-gui/Makefile -@@ -48,11 +48,11 @@ endif +@@ -50,11 +50,11 @@ endif RM_RF ?= rm -rf RMDIR ?= rmdir @@ -20,7 +20,7 @@ Do not build Git Gui.app on Darwin. INSTALL_X1 = INSTALL_A0 = find # space is required here INSTALL_A1 = | cpio -pud -@@ -76,11 +76,11 @@ ifndef V +@@ -78,11 +78,11 @@ ifndef V QUIET_2DEVNULL = 2>/dev/null INSTALL_D0 = dir= @@ -35,7 +35,7 @@ Do not build Git Gui.app on Darwin. INSTALL_A0 = src= INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud -@@ -157,7 +157,7 @@ else +@@ -159,7 +159,7 @@ else endif ifeq ($(uname_S),Darwin) ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y) diff --git a/devel/git-base/patches/patch-gitk-git_Makefile b/devel/git-base/patches/patch-gitk-git_Makefile index f7d16a6465f8..03e4290a3c3d 100644 --- a/devel/git-base/patches/patch-gitk-git_Makefile +++ b/devel/git-base/patches/patch-gitk-git_Makefile @@ -1,6 +1,6 @@ -$NetBSD: patch-gitk-git_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ +$NetBSD$ ---- gitk-git/Makefile.orig 2017-02-24 19:17:39.000000000 +0000 +--- gitk-git/Makefile.orig 2022-04-11 22:35:25.000000000 +0000 +++ gitk-git/Makefile @@ -50,10 +50,9 @@ endif all:: gitk-wish $(ALL_MSGFILES) diff --git a/devel/git-base/patches/patch-templates_Makefile b/devel/git-base/patches/patch-templates_Makefile index b5baca74b5b3..fdac40dae138 100644 --- a/devel/git-base/patches/patch-templates_Makefile +++ b/devel/git-base/patches/patch-templates_Makefile @@ -1,6 +1,6 @@ -$NetBSD: patch-templates_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ +$NetBSD$ ---- templates/Makefile.orig 2010-10-22 03:49:16.000000000 +0000 +--- templates/Makefile.orig 2022-04-11 22:35:25.000000000 +0000 +++ templates/Makefile @@ -8,7 +8,7 @@ INSTALL ?= install TAR ?= tar diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version index 67981b2fc736..ef8da7e46e21 100644 --- a/devel/git/Makefile.version +++ b/devel/git/Makefile.version @@ -4,4 +4,4 @@ # used by devel/git-cvs/Makefile # used by devel/git-svn/Makefile -GIT_VERSION= 2.35.1 +GIT_VERSION= 2.35.2