svn commit: r448094 - branches/2017Q3/devel/git

Mark Felder feld at FreeBSD.org
Thu Aug 17 13:15:27 UTC 2017 

Author: feld
Date: Thu Aug 17 13:15:25 2017
New Revision: 448094
URL: https://svnweb.freebsd.org/changeset/ports/448094

Log:
  MFH: r445615 r446083 r447205 r447721 r447759
  
  Update devel/git to 2.13.3
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)
  
  - Add diff-highlight back to package when CONTRIB option is set
  - While here, remove unnecessary lines from pkg-plist
  - Bump PORTREVISION
  
  PR:		220804
  Submitted by:	martin at sugioarto.com
  Sponsored by:	Rubicon Communications, LLC (Netgate)
  
  Update devel/git to 2.13.4
  
  Update devel/git to 2.14.1
  
  This version fixes a security issue:
  
  A "ssh://..." URL can result in a "ssh" command line with a
  hostname that begins with a dash "-", which would cause the "ssh"
  command to instead (mis)treat it as an option.  This is now
  prevented by forbidding such a hostname (which will not be
  necessary in the real world).
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)
  
  Fix packaging WITH=HTMLDOCS.
  
  Pointy hat:	garga
  Sponsored by:	Absolight
  
  Approved by:	ports-secteam (with hat)

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

Modified: branches/2017Q3/devel/git/Makefile
==============================================================================
--- branches/2017Q3/devel/git/Makefile	Thu Aug 17 13:04:11 2017	(r448093)
+++ branches/2017Q3/devel/git/Makefile	Thu Aug 17 13:15:25 2017	(r448094)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.13.2
+DISTVERSION=	2.14.1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -42,7 +42,6 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*
 		contrib/remote-helpers/git-remote-bzr \
 		contrib/remote-helpers/git-remote-hg \
 		contrib/credential/netrc/git-credential-netrc \
-		contrib/diff-highlight/diff-highlight \
 		contrib/buildsystems/generate contrib/contacts/git-contacts \
 		contrib/svn-fe/svnrdump_sim.py
 TEST_TARGET=	test
@@ -155,6 +154,10 @@ post-patch:
 .endfor
 	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
 
+post-patch-CONTRIB-on:
+	@${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," \
+		${WRKSRC}/contrib/diff-highlight/Makefile
+
 post-patch-CVS-off:
 	@${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
 		/git-cvsimport.perl/d; \
@@ -179,6 +182,10 @@ post-patch-P4-off:
 post-build:
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 .endif
+
+post-build-CONTRIB-on:
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/contrib/diff-highlight
+	${RM} ${WRKSRC}/contrib/diff-highlight/shebang.perl
 
 post-install:
 	(cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)

Modified: branches/2017Q3/devel/git/distinfo
==============================================================================
--- branches/2017Q3/devel/git/distinfo	Thu Aug 17 13:04:11 2017	(r448093)
+++ branches/2017Q3/devel/git/distinfo	Thu Aug 17 13:15:25 2017	(r448094)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1498482405
-SHA256 (git-2.13.2.tar.xz) = 0d10ac3751466f81652b62cbda83cc8d8ffd014911462138e039f176e413dde5
-SIZE (git-2.13.2.tar.xz) = 4751380
-SHA256 (git-manpages-2.13.2.tar.xz) = 30e1e1313000eb81f0e348e5083758a33703941a60ab111057b46c3dad968b6e
-SIZE (git-manpages-2.13.2.tar.xz) = 407684
-SHA256 (git-htmldocs-2.13.2.tar.xz) = 54f0d36d375e7f71441994e60c18b6e2cc43581d5827e806e0bddb6904e17dfc
-SIZE (git-htmldocs-2.13.2.tar.xz) = 1109048
+TIMESTAMP = 1502396019
+SHA256 (git-2.14.1.tar.xz) = 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6
+SIZE (git-2.14.1.tar.xz) = 4791876
+SHA256 (git-manpages-2.14.1.tar.xz) = 7ebce1e0e862af1367e24f14765c7b67f08b63fb01b80949f55479c562d414f2
+SIZE (git-manpages-2.14.1.tar.xz) = 410400
+SHA256 (git-htmldocs-2.14.1.tar.xz) = 9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb
+SIZE (git-htmldocs-2.14.1.tar.xz) = 1115176

Modified: branches/2017Q3/devel/git/pkg-plist
==============================================================================
--- branches/2017Q3/devel/git/pkg-plist	Thu Aug 17 13:04:11 2017	(r448093)
+++ branches/2017Q3/devel/git/pkg-plist	Thu Aug 17 13:15:25 2017	(r448094)
@@ -387,6 +387,7 @@ man/man7/giteveryday.7.gz
 man/man7/gitglossary.7.gz
 man/man7/gitnamespaces.7.gz
 man/man7/gitrevisions.7.gz
+man/man7/gitsubmodules.7.gz
 man/man7/gittutorial-2.7.gz
 man/man7/gittutorial.7.gz
 man/man7/gitworkflows.7.gz
@@ -626,16 +627,24 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.13.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.14.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.14.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -685,17 +694,20 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.6.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.8.6.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/blame-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-ancillaryinterrogators.txt
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-ancillarymanipulators.txt
@@ -1051,6 +1063,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/gitrepository-layout.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitsubmodules.html
+%%HTMLDOCS%%%%DOCSDIR%%/gitsubmodules.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gittutorial-2.html
 %%HTMLDOCS%%%%DOCSDIR%%/gittutorial-2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gittutorial.html
@@ -1131,12 +1145,12 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.txt
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.html
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sub-process.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sub-process.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt
@@ -1227,7 +1241,6 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
 %%CONTRIB%%share/git-core/contrib/completion/git-prompt.sh
- at comment share/git-core/contrib/contacts/.gitignore
 %%CONTRIB%%share/git-core/contrib/contacts/Makefile
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
@@ -1248,8 +1261,9 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/credential/wincred/git-credential-wincred.c
 %%CONTRIB%%share/git-core/contrib/diff-highlight/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/README
+%%CONTRIB%%share/git-core/contrib/diff-highlight/DiffHighlight.pm
+%%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl
 %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight
- at comment share/git-core/contrib/diff-highlight/t/.gitignore
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh
 %%CONTRIB%%share/git-core/contrib/emacs/.gitignore

More information about the svn-ports-branches mailing list