CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jan 14 21:41:39 UTC 2025

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: distinfo
        pkgsrc/devel/git-docs: Makefile

Log Message:
git: updated to 2.48.1

Git v2.48.1 Release Notes

This release merges up the fix that appears in v2.40.4, v2.41.3,
v2.42.4, v2.43.6, v2.44.3, v2.45.3, v2.46.3, and v2.47.2 to address
the security issues CVE-2024-50349 and CVE-2024-52006; see the release
notes for these versions for details.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.152 -r1.153 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/git-docs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.133 pkgsrc/devel/git/Makefile.version:1.134
--- pkgsrc/devel/git/Makefile.version:1.133     Mon Jan 13 14:24:43 2025
+++ pkgsrc/devel/git/Makefile.version   Tue Jan 14 21:41:38 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.133 2025/01/13 14:24:43 adam Exp $
+# $NetBSD: Makefile.version,v 1.134 2025/01/14 21:41:38 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.48.0
+GIT_VERSION=   2.48.1

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.152 pkgsrc/devel/git-base/distinfo:1.153
--- pkgsrc/devel/git-base/distinfo:1.152        Mon Jan 13 14:24:43 2025
+++ pkgsrc/devel/git-base/distinfo      Tue Jan 14 21:41:39 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.152 2025/01/13 14:24:43 adam Exp $
+$NetBSD: distinfo,v 1.153 2025/01/14 21:41:39 adam Exp $
 
-BLAKE2s (git-2.48.0.tar.xz) = 1e20d17a27380f00fec92e99103a6a91d57f7fe2b55abe376d18cd382d88824d
-SHA512 (git-2.48.0.tar.xz) = 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e
-Size (git-2.48.0.tar.xz) = 7723336 bytes
+BLAKE2s (git-2.48.1.tar.xz) = 5984802d2868bd1a04ece5d347c2b5dfedf9daa5e0cc98c075dc184b7f0ee4a7
+SHA512 (git-2.48.1.tar.xz) = 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606
+Size (git-2.48.1.tar.xz) = 7723580 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = 24b9ed15f5ef59973d17d5217dd4e415a3b4c3e5
 SHA1 (patch-config.mak.uname) = 32b9c120ff3f947ebe3d32107eaaa2be61775a18

Index: pkgsrc/devel/git-docs/Makefile
diff -u pkgsrc/devel/git-docs/Makefile:1.22 pkgsrc/devel/git-docs/Makefile:1.23
--- pkgsrc/devel/git-docs/Makefile:1.22 Tue Jun  6 12:40:37 2023
+++ pkgsrc/devel/git-docs/Makefile      Tue Jan 14 21:41:39 2025
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2023/06/06 12:40:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.23 2025/01/14 21:41:39 adam Exp $
 
 PKGNAME=       git-docs-${GIT_VERSION}
 COMMENT=       GIT Tree History Storage Tool (documentation)
 
-CONFLICTS+=            scmgit-docs-[0-9]*
-SUPERSEDES+=           scmgit-docs-[0-9]*
-
-DISTINFO_FILE=         ../../devel/git-base/distinfo
+CONFLICTS+=    scmgit-docs-[0-9]*
+SUPERSEDES+=   scmgit-docs-[0-9]*
 
 TOOL_DEPENDS+=         asciidoc-[0-9]*:../../textproc/asciidoc
 TOOL_DEPENDS+=         xmlto-[0-9]*:../../textproc/xmlto