Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Apr 2020 14:21:58 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r531768 - branches/2020Q2/devel/git
Message-ID:  <202004151421.03FELw2c066205@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Wed Apr 15 14:21:57 2020
New Revision: 531768
URL: https://svnweb.freebsd.org/changeset/ports/531768

Log:
  MFH: r531622 r531627 r531715
  
  devel/git: Update to 2.26.0
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)
  
  devel/git: Fix build
  
  I've committed the wrong changes in r531622 breaking git build.  Fix it now.
  
  Reported by:	mandree and jbeich
  Sponsored by:	Rubicon Communications, LLC (Netgate)
  
  devel/git: Update to 2.26.1
  
  Security:	CVE-2020-5260
  Sponsored by:	Rubicon Communications, LLC (Netgate)
  
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2020Q2/devel/git/Makefile
  branches/2020Q2/devel/git/distinfo
  branches/2020Q2/devel/git/pkg-plist
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/devel/git/Makefile
==============================================================================
--- branches/2020Q2/devel/git/Makefile	Wed Apr 15 13:30:03 2020	(r531767)
+++ branches/2020Q2/devel/git/Makefile	Wed Apr 15 14:21:57 2020	(r531768)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.25.2
+DISTVERSION=	2.26.1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -43,7 +43,7 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*
 		contrib/fast-import/import-zips.py \
 		contrib/remote-helpers/git-remote-bzr \
 		contrib/remote-helpers/git-remote-hg \
-		contrib/credential/netrc/git-credential-netrc \
+		contrib/credential/netrc/git-credential-netrc.perl \
 		contrib/buildsystems/generate contrib/contacts/git-contacts \
 		contrib/svn-fe/svnrdump_sim.py \
 		templates/hooks--fsmonitor-watchman.sample

Modified: branches/2020Q2/devel/git/distinfo
==============================================================================
--- branches/2020Q2/devel/git/distinfo	Wed Apr 15 13:30:03 2020	(r531767)
+++ branches/2020Q2/devel/git/distinfo	Wed Apr 15 14:21:57 2020	(r531768)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1584540874
-SHA256 (git-2.25.2.tar.xz) = 9b937103e048e2d3bf964d4132a0e7edccc2583d4ef30bc8a516f93a76de7123
-SIZE (git-2.25.2.tar.xz) = 5877576
-SHA256 (git-manpages-2.25.2.tar.xz) = 78bbe92b0c7c2f9a227025a7b7207951c185adda38a968499e5b6dacb6e1d41a
-SIZE (git-manpages-2.25.2.tar.xz) = 459208
-SHA256 (git-htmldocs-2.25.2.tar.xz) = 90f10350933ce4fcafadacfcdca4184ed5acbed5a326e11c1523086b358ef380
-SIZE (git-htmldocs-2.25.2.tar.xz) = 1296488
+TIMESTAMP = 1586891148
+SHA256 (git-2.26.1.tar.xz) = 888228408f254634330234df3cece734d190ef6381063821f31ec020538f0368
+SIZE (git-2.26.1.tar.xz) = 6006104
+SHA256 (git-manpages-2.26.1.tar.xz) = a93cb7f45dab1fc45a9a4a6cfc32f1a8edd0894c0441e163951c323c7a184048
+SIZE (git-manpages-2.26.1.tar.xz) = 462068
+SHA256 (git-htmldocs-2.26.1.tar.xz) = e857bfef9f7f63b2a553564226500ccca8da40b71e1009fcc4fab84ad951b1b0
+SIZE (git-htmldocs-2.26.1.tar.xz) = 1304500

Modified: branches/2020Q2/devel/git/pkg-plist
==============================================================================
--- branches/2020Q2/devel/git/pkg-plist	Wed Apr 15 13:30:03 2020	(r531767)
+++ branches/2020Q2/devel/git/pkg-plist	Wed Apr 15 14:21:57 2020	(r531768)
@@ -703,6 +703,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.25.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.25.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.25.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.26.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.26.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -1227,7 +1229,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/credential/libsecret/Makefile
 %%CONTRIB%%share/git-core/contrib/credential/libsecret/git-credential-libsecret.c
 %%CONTRIB%%share/git-core/contrib/credential/netrc/Makefile
-%%CONTRIB%%share/git-core/contrib/credential/netrc/git-credential-netrc
+%%CONTRIB%%share/git-core/contrib/credential/netrc/git-credential-netrc.perl
 %%CONTRIB%%share/git-core/contrib/credential/netrc/t-git-credential-netrc.sh
 %%CONTRIB%%share/git-core/contrib/credential/netrc/test.command-option-gpg
 %%CONTRIB%%share/git-core/contrib/credential/netrc/test.git-config-gpg
@@ -1440,6 +1442,7 @@ share/git-core/templates/info/exclude
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/git.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/git.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/git.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/git.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/git.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/git.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004151421.03FELw2c066205>