Merge pull request #547 from fac/2015Q4_backport_git

Backport git from 2017Q4 for security fixes

devel/git-base/MESSAGE

@@ -1,9 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2014/01/16 09:34:27 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2016/05/26 15:41:06 khorben Exp $
 
 NOTE:	Pristine templates are located in:
 	${GIT_TEMPLATE_INSTDIR}.
 
+To use the git-cvsimport repository conversion from CVS, install git-cvs.
+
 To use the git-svn interface to Subversion, install git-svn.
 
 ===========================================================================

devel/git-base/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/03/12 11:33:32 adam Exp $
+# $NetBSD: Makefile,v 1.46 2017/09/27 06:37:47 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -29,6 +29,7 @@ CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
 CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--with-libpcre2=${BUILDLINK_PREFIX.pcre2}
 CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--without-tcltk
@@ -107,6 +108,8 @@ post-install:
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/expat/buildlink3.mk"

devel/git-base/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10.4.1 2016/03/22 18:55:23 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/11/02 06:18:11 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -111,11 +111,11 @@ libexec/git-core/git-quiltimport
 libexec/git-core/git-read-tree
 libexec/git-core/git-rebase
 libexec/git-core/git-rebase--am
+libexec/git-core/git-rebase--helper
 libexec/git-core/git-rebase--interactive
 libexec/git-core/git-rebase--merge
 libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
-libexec/git-core/git-relink
 libexec/git-core/git-remote
 libexec/git-core/git-remote-ext
 libexec/git-core/git-remote-fd
@@ -177,6 +177,7 @@ libexec/git-core/mergetools/diffmerge
 libexec/git-core/mergetools/diffuse
 libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
+libexec/git-core/mergetools/examdiff
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
 libexec/git-core/mergetools/gvimdiff3
@@ -202,12 +203,14 @@ share/examples/git/templates/hooks/pre-applypatch.sample
 share/examples/git/templates/hooks/pre-commit.sample
 share/examples/git/templates/hooks/pre-push.sample
 share/examples/git/templates/hooks/pre-rebase.sample
+share/examples/git/templates/hooks/pre-receive.sample
 share/examples/git/templates/hooks/prepare-commit-msg.sample
 share/examples/git/templates/hooks/update.sample
 share/examples/git/templates/info/exclude
 share/locale/bg/LC_MESSAGES/git.mo
 share/locale/ca/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
+share/locale/es/LC_MESSAGES/git.mo
 share/locale/fr/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo

devel/git-base/distinfo

@@ -1,25 +1,15 @@
-$NetBSD: distinfo,v 1.41.2.1 2016/03/22 18:55:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.74 2017/11/30 07:50:01 adam Exp $
 
-SHA1 (git-2.7.3.tar.xz) = d7be9af73cc56c606e0744beb0091b612b416909
-RMD160 (git-2.7.3.tar.xz) = 5111811158362bbc6d4e0a97ec8df8e56c1bd674
-SHA512 (git-2.7.3.tar.xz) = f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72
-Size (git-2.7.3.tar.xz) = 3909636 bytes
-SHA1 (patch-aa) = 892e2dc9336a794399046ac2b4c59f3650d458f8
-SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
+SHA1 (git-2.15.1.tar.xz) = 0ff2d0c64621f92e15759b2ca07838858bef8ff0
+RMD160 (git-2.15.1.tar.xz) = 4faa07120bec5376a76330cdebe5b43e283856d7
+SHA512 (git-2.15.1.tar.xz) = dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
+Size (git-2.15.1.tar.xz) = 4894768 bytes
+SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
+SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
 SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
-SHA1 (patch-builtin_pack-objects.c) = 8038e9fca76f465c87d6e4265cb657965fca5fee
-SHA1 (patch-builtin_rev-list.c) = 52605a6e05e62e45a161e09dba5cf0ae448d642c
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
-SHA1 (patch-http-push.c) = ff931b9043ca8ddedc336d27efe8102e5372b66a
-SHA1 (patch-list-objects.c) = 0250fb74b635d27694dc8e7c99f48a0ba1f23ab7
-SHA1 (patch-list-objects.h) = e341343431e6b64bb6bf4463d632f50107110f37
-SHA1 (patch-pack-bitmap-write.c) = 31492718f3812a9229d33ebe4b8bfcebce0e5805
-SHA1 (patch-pack-bitmap.c) = 76c23b6b328a6b113b58ef026231623d73d1f088
-SHA1 (patch-reachable.c) = b58b59073662b74bbae02f83a5e05c29dee76185
-SHA1 (patch-revision.c) = d9b372b3930578817f5517cc76639fce832a0c58
-SHA1 (patch-revision.h) = 3258d405f6d2d3e5103d1e34cbcefec3da767298
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f

devel/git-base/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/08/01 19:18:39 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2016/04/11 04:22:33 dbj Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.git
 PKG_SUPPORTED_OPTIONS=	python apple-common-crypto
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--without-python
 
 .if !empty(PKG_OPTIONS:Mapple-common-crypto)
 .  if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-PKG_FAIL_REASON=	"apple-common-crypto not available on this system"
+PKG_FAIL_REASON+=	"apple-common-crypto not available on this system"
 .  endif
 CONFIGURE_ARGS+=	--without-openssl
 .else

devel/git-base/patches/patch-aa

@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
+$NetBSD: patch-aa,v 1.8 2016/09/07 08:56:33 adam Exp $
 
---- Makefile.orig	2015-10-16 21:58:26.000000000 +0000
+--- Makefile.orig	2016-09-03 01:59:09.000000000 +0000
 +++ Makefile
-@@ -371,8 +371,6 @@ GIT-VERSION-FILE: FORCE
-
- CFLAGS = -g -O2 -Wall
+@@ -396,8 +396,6 @@ DEVELOPER_CFLAGS = -Werror \
+ 	-Wunused \
+ 	-Wvla
  LDFLAGS =
 -ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 -ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
 
  # Create as necessary, replace existing, make ranlib unneeded.
-@@ -416,13 +414,9 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -441,13 +439,9 @@ htmldir_relative = $(patsubst $(prefix)/
 
  export prefix bindir sharedir sysconfdir gitwebdir localedir
 
@@ -22,12 +22,12 @@ $NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
 -TAR = tar
  FIND = find
 -INSTALL = install
- RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -1586,8 +1580,8 @@ ifdef DEFAULT_HELP_FORMAT
- BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
- endif
+ XGETTEXT = xgettext
+@@ -1647,8 +1641,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
+ PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+ BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
 
 -ALL_CFLAGS += $(BASIC_CFLAGS)
 -ALL_LDFLAGS += $(BASIC_LDFLAGS)
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.5 2015/10/17 07:44:56 adam Exp $
 
  export DIFF TAR INSTALL DESTDIR SHELL_PATH
 
-@@ -2278,11 +2272,10 @@ install: all
+@@ -2341,11 +2335,10 @@ install: all
  ifndef NO_GETTEXT
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
  	(cd po/build/locale && $(TAR) cf - .) | \

devel/git-base/patches/patch-ac

@@ -1,11 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2014/08/01 19:18:39 schmonz Exp $
+$NetBSD: patch-ac,v 1.3 2017/02/25 08:32:57 adam Exp $
 
---- gitk-git/Makefile.orig	2014-05-30 21:38:10.000000000 +0000
+--- gitk-git/Makefile.orig	2017-02-24 19:17:39.000000000 +0000
 +++ gitk-git/Makefile
-@@ -50,9 +50,9 @@ endif
+@@ -50,10 +50,9 @@ endif
  all:: gitk-wish $(ALL_MSGFILES)
 
  install:: all
+-	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 -	$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 -	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
 -	$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true