22854539 git 2.7.4 s11u3-sru
authorDanek Duvall <danek.duvall@oracle.com>
Thu, 24 Mar 2016 11:12:03 -0700
branchs11u3-sru
changeset 5720 519e1bb835ee
parent 5713 b6d980e5e998
child 5721 153e2c170241
22854539 git 2.7.4 16298577 git system wide configuration stored in sub-optimal directory 16576745 git can't find gpg to sign tags 16913667 gitweb.cgi have no execution flags after installation 21952988 problem in UTILITY/GIT 21955798 new git patch to prevent inet_ntop() compile failures 22315592 git send-email fails because it can't find Error.pm 22959674 problem in UTILITY/GIT
components/git/Makefile
components/git/git.license
components/git/git.p5m
components/git/patches/barf.patch
components/git/patches/gpg.patch
components/git/patches/imap-send.patch
components/git/patches/inet_ntop.patch
components/git/patches/perl_Makefile.patch
components/git/patches/python_Makefile.patch
components/git/patches/t_Makefile.patch
components/git/patches/test.patch
--- a/components/git/Makefile	Sat Apr 02 01:55:18 2016 +0100
+++ b/components/git/Makefile	Thu Mar 24 11:12:03 2016 -0700
@@ -18,59 +18,95 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+
 #
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		git
-COMPONENT_VERSION=	1.7.9.2
+COMPONENT_VERSION=	2.7.4
 COMPONENT_PROJECT_URL=	http://git-scm.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75
-COMPONENT_ARCHIVE_URL=	http://git-core.googlecode.com/files/$(COMPONENT_ARCHIVE)
+    sha256:dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b
+COMPONENT_ARCHIVE_URL=	https://www.kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/git
 
-TPNO=			8436
+TPNO=			27482
 
 #
 # man pages are a separate archive
 #
-COMPONENT_ARCHIVE_1 =	$(COMPONENT_NAME)-manpages-$(COMPONENT_VERSION).tar.gz
+COMPONENT_SRC_1 =	$(COMPONENT_NAME)-manpages-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE_1 =	$(COMPONENT_SRC_1).tar.xz
 COMPONENT_ARCHIVE_HASH_1 = \
-    sha256:c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
-COMPONENT_ARCHIVE_URL_1 = http://git-core.googlecode.com/files/$(COMPONENT_ARCHIVE_1)
+    sha256:d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25
+COMPONENT_ARCHIVE_URL_1 = https://www.kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE_1)
+UNPACK_ARGS_1 =		-r $(COMPONENT_SRC_1)
+PKG_PROTO_DIRS +=	$(COMPONENT_SRC_1)
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-PYTHON_VERSION =	2.7
+PKG_HARDLINKS +=	usr/lib/git-core/git
+PKG_HARDLINKS +=	usr/lib/git-core/git-cvsserver
+PKG_HARDLINKS +=	usr/lib/git-core/git-gui
+PKG_HARDLINKS +=	usr/lib/git-core/git-remote-ftps
+PKG_HARDLINKS +=	usr/lib/git-core/git-shell
+PKG_HARDLINKS +=	usr/lib/git-core/git-upload-pack
 
 PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
 
+CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin
+CONFIGURE_LIBDIR.64 =	$(CONFIGURE_PREFIX)/lib
+
+CONFIGURE_SCRIPT    =	$(@D)/configure
 CONFIGURE_PREFIX    =	/usr
-CONFIGURE_OPTIONS  +=	--without-openssl
+CONFIGURE_OPTIONS  +=	--sysconfdir=/etc
 CONFIGURE_OPTIONS  +=	--libexecdir=/usr/lib
+CONFIGURE_OPTIONS  +=	--with-libpcre
 CONFIGURE_OPTIONS  +=	--with-perl=$(PERL)
 CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON.$(PYTHON_VERSION))
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS  +=	CPPFLAGS="-I/usr/include/pcre"
 
 # Build fails if environment variable PROFILE is set.
 COMPONENT_BUILD_ENV+=	PROFILE=
 COMPONENT_INSTALL_ENV+=	PROFILE=
 COMPONENT_TEST_ENV+=	PROFILE=
 
-COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
-COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell $(PERL) -MConfig -e 'print "$$Config{installvendorarch}"')
+# We set prefix_SQ empty to make sure that perl's MakeMaker module doesn't grab
+# the value from $prefix (set by configure) and force VENDORPREFIX to $prefix,
+# thereby putting the perl modules in /usr/lib/Git.
+COMPONENT_BUILD_ARGS+=		prefix_SQ=
+COMPONENT_INSTALL_ARGS+=	prefix_SQ=
 COMPONENT_INSTALL_ARGS+=	INSTALL="$(INSTALL)"
 
 # get rid of terminal escape codes in test output
 COMPONENT_TEST_ENV = TERM=dumb
 # many failures; keep going; later versions of git are much cleaner
 COMPONENT_TEST_ARGS += -k -i
+# If GITTEST_JOBS is set, then run the jobs in parallel (to that number)
+COMPONENT_TEST_ARGS += $(if $(GITTEST_JOBS),-j$(GITTEST_JOBS),)
 COMPONENT_TEST_TARGETS = test
+# Enable tests requiring Apache
+COMPONENT_TEST_TARGETS += LIB_HTTPD_PATH=/usr/apache2/2.4/bin/httpd
+COMPONENT_TEST_TARGETS += LIB_HTTPD_MODULE_PATH=/usr/apache2/2.4/libexec
+# Put each test result in a file; necessary if jobs run in parallel
+COMPONENT_TEST_TARGETS += GIT_TEST_OPTS=--tee
+COMPONENT_TEST_TARGETS += DEFAULT_TEST_TARGET=test-noclean
+# Compile the test results and put that into the test output file instead
+COMPONENT_POST_TEST_ACTION = \
+	(cd $(@D)/t/test-results; for i in *.out; do \
+		echo "*** $${i%.out}.sh ***"; \
+		cat $$i; \
+	done; \
+	cd ..; \
+	$(GMAKE) -s aggregate-results) &> $(BUILD_DIR)/test-$(MACH$(BITS)).out
 
 # This runs configure but configure doesn't generate a Makefile.
 # Instead a Makefile comes with git.
@@ -79,15 +115,19 @@
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
+COMPONENT_PRE_CONFIGURE_ACTION += ; (cd $(@D); $(GMAKE) configure)
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-build:		$(BUILD_32)
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32) $(BUILD_DIR)/.manpages
+install:	$(INSTALL_64) $(BUILD_DIR)/.manpages
 
-# There are some known issues around I18N.
-test:	$(TEST_32)
+test:		$(TEST_64)
+
+system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 # These man pages come in a separate archive with no Makefile
 # and Solaris likes some of them moved around hence we'll just
@@ -114,7 +154,10 @@
 	$(TOUCH) [email protected]
 
 
+REQUIRED_PACKAGES += crypto/gnupg
 REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/python-27
@@ -122,3 +165,4 @@
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += web/curl
+REQUIRED_PACKAGES += web/server/apache-24
--- a/components/git/git.license	Sat Apr 02 01:55:18 2016 +0100
+++ b/components/git/git.license	Thu Mar 24 11:12:03 2016 -0700
@@ -1,8 +1,8 @@
- GNU GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,7 +56,6 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -112,7 +111,6 @@
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
 
-
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -171,7 +169,6 @@
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
-
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -229,7 +226,6 @@
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
 
-
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -283,7 +279,6 @@
 
 		     END OF TERMS AND CONDITIONS
 
-
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -308,10 +303,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -341,196 +335,631 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
----------------------------------------
-vcs-svn/fast_export.c:
- * Licensed under a two-clause BSD-style license. 
- * See LICENSE for details. 
----------------------------------------
-xdiff/xhistogram.c
- * Copyright (C) 2010, Google Inc. 
- * and other copyright owners as documented in JGit's IP log. 
- * 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Distribution License v1.0 which 
- * accompanies this distribution, is reproduced below, and is 
- * available at http://www.eclipse.org/org/documents/edl-v10.php 
- * 
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or 
- * without modification, are permitted provided that the following 
- * conditions are met: 
- * 
- * - Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer. 
- * 
- * - Redistributions in binary form must reproduce the above 
- *   copyright notice, this list of conditions and the following 
- *   disclaimer in the documentation and/or other materials provided 
- *   with the distribution. 
- * 
- * - Neither the name of the Eclipse Foundation, Inc. nor the 
- *   names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior 
- *   written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+== xdiff/*, compat/obstack.c ===================================================
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
 
-Copyrights:
-=========== 
-	(C) 2005 by Nicolas Pitre <[email protected]>
-	# Copyright (c) 2005 Junio C Hamano
-    Gnomovision version 69, Copyright (C) year name of author
-   (C) 2005 by Nicolas Pitre <[email protected]>
- *  Copyright (C) 2003	Davide Libenzi
- *  Copyright (C) 2003  Davide Libenzi
- *  Copyright (C) 2003-2006 Davide Libenzi, Johannes E. Schindelin
- * (C) Copyright 2006 Linus Torvalds
- * Copyright (C) 1995-9 by Cryptography Research, Inc.  All
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- * Copyright (C) 1996-2001  Internet Software Consortium.
- * Copyright (C) 2000-2002 Michael R. Elkins <[email protected]>
- * Copyright (C) 2002-2004 Oswald Buddenhagen <[email protected]>
- * Copyright (C) 2004 Theodore Y. Ts'o <[email protected]>
- * Copyright (c) 2005 Junio C Hamano
- * Copyright (C) 2005 Junio C Hamano
- * Copyright (c) 2005 Linus Torvalds
- * Copyright (C) 2005 Linus Torvalds
- * Copyright (C) 2005 Paul Mackerras <[email protected]>
- * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
- * Copyright (c) 2005, 2006 Rene Scharfe
- * Copyright (c) 2005, Junio C Hamano
- * Copyright (C) 2006 Christian Couder
- * Copyright (c) 2006 Franck Bui-Huu
- * Copyright (C) 2006 Johannes Schindelin
- * Copyright (c) 2006 Junio C Hamano
- * Copyright (c) 2006 Kristian Høgsberg <[email protected]>
- * Copyright (C) 2006 Linus Torvalds
- * Copyright (C) 2006 Mike McCormack
- * Copyright (c) 2006 Rene Scharfe
- * Copyright (C) 2006 Ryan Anderson
- * Copyright (c) 2006 Shawn O. Pearce
- * Copyright (c) 2006, Junio C Hamano
- * Copyright (c) 2007 by Johannes Schindelin
- * Copyright (c) 2007 by Nicolas Pitre <[email protected]>
- * Copyright (C) 2007 by Nicolas Pitre, licensed under the GPL version 2.
- * Copyright (c) 2007 Carlos Rica
- * Copyright (c) 2007 Carlos Rica <[email protected]>
- * Copyright (c) 2007 James Bowes
- * Copyright (c) 2007 Johannes E. Schindelin
- * Copyright (C) 2007 Johannes E. Schindelin
- * Copyright (c) 2007 Junio C Hamano
- * Copyright (c) 2007 Kristian Høgsberg <[email protected]>
- * Copyright (c) 2007 Kristian Høgsberg <[email protected]>,
- * Copyright (C) 2007 Shawn Bohrer
- * Copyright (c) 2007 Thomas Harning Jr
- * Copyright (c) 2008 by Junio C Hamano
- * Copyright (C) 2008 Linus Torvalds
- * Copyright (C) Eric Biederman, 2005
- * Copyright (C) Johannes Schindelin, 2005
- * Copyright (C) Junio C Hamano, 2005
- * Copyright (c) Junio C Hamano, 2006
- * Copyright (C) Linus Torvalds 2006
- * Copyright (C) Linus Torvalds, 2005
- * Copyright (C) Linus Torvalds, 2005-2006
- * Copyright 2006 Jon Loeliger
- * Original Copyright (c) 2005 Junio C Hamano
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-* Copyright 2005, Lukas Sandstrom <[email protected]>
-# (C) Copyright 2000 - 2005
-# Copyright © 2005-2008 Paul Mackerras.  All rights reserved.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# Copyright (c) 1997-8 Graham Barr <[email protected]>. All rights reserved.
-# Copyright (c) 2005 Amos Waterland
-# Copyright (c) 2005 Fredrik Kuivinen
-# Copyright (c) 2005 Johannes Schindelin
-# Copyright (c) 2005 Jon Seymour
-# Copyright (c) 2005 Junio C Hamano
-# Copyright (c) 2005 Junio C Hamano.
-# Copyright (c) 2005 Linus Torvalds
-# Copyright (C) 2005 Rene Scharfe
-# Copyright (c) 2005 Robert Fitzsimons
-# Copyright (c) 2005, 2006 Junio C Hamano
-# Copyright (c) 2006 Brian C Gernhardt
-# Copyright (c) 2006 Carl D. Worth
-# Copyright (C) 2006 Carl D. Worth <[email protected]>
-# Copyright (c) 2006 Catalin Marinas
-# Copyright (c) 2006 Christian Couder
-# Copyright (c) 2006 Eric Wong
-# Copyright (c) 2006 Johannes E. Schindelin
-# Copyright (c) 2006 Josh England
-# Copyright (c) 2006 Junio C Hamano
-# Copyright (C) 2006 Martin Waitz <[email protected]>
-# Copyright (c) 2006 Shawn O. Pearce
-# Copyright (c) 2006 Shawn Pearce
-# Copyright (c) 2006 Theodore Y. Ts'o
-# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
-# Copyright (C) 2006, Eric Wong <[email protected]>
-# Copyright (c) 2006, Junio C Hamano
-# Copyright (c) 2006, Junio C Hamano.
-# Copyright (c) 2007 Andy Parkins
-# Copyright (c) 2007 Carl D. Worth
-# Copyright (c) 2007 Carlos Rica
-# Copyright (c) 2007 Christian Couder
-# Copyright (c) 2007 David D. Kilzer
-# Copyright (c) 2007 David Symonds
-# Copyright (c) 2007 Eric Wong
-# Copyright (c) 2007 Frank Lichtenheld
-# Copyright (c) 2007 Jakub Narebski
-# Copyright (c) 2007 Johannes E Schindelin
-# Copyright (c) 2007 Johannes E. Schindelin
-# Copyright (c) 2007 Johannes Schindelin
-# Copyright (c) 2007 Johannes Sixt
-# Copyright (c) 2007 Junio C Hamano
-# Copyright (c) 2007 Kristian Høgsberg <[email protected]>
-# Copyright (c) 2007 Lars Hjemli
-# Copyright (c) 2007 Michael Spang
-# Copyright (c) 2007 Nguyễn Thái Ngọc Duy
-# Copyright (c) 2007 Nicolas Pitre
-# Copyright (c) 2007 Santi Béjar, based on t4013 by Junio C Hamano
-# Copyright (c) 2007 Shawn O. Pearce
-# Copyright (c) 2007 Shawn Pearce
-# Copyright (c) 2007 Steven Grimm
-# Copyright (c) 2007, Nanako Shiraishi
-# Copyright (c) 2008 Charles Bailey
-# Copyright (c) 2008 Christian Couder
-# Copyright (c) 2008 Clemens Buchacher <[email protected]>
-# Copyright (c) 2008 Dmitry V. Levin
-# Copyright (c) 2008 Jan Krüger
-# Copyright (c) 2008 Johannes E. Schindelin
-# Copyright (c) 2008 Johannes Schindelin
-# Copyright (c) 2008 Kevin Ballard
-# Copyright (c) 2008 Matthew Ogilvie
-# Copyright (c) 2008 Ping Yin
-# Copyright (c) 2008 Santhosh Kumar Mani
-# Copyright (c) 2008 Timo Hirvonen
-# Copyright (c) Linus Torvalds, 2005
-# Copyright (c) Petr Baudis, 2006
-# Copyright (c) Robin Rosenberg
-# Copyright 2002,2005 Greg Kroah-Hartman <[email protected]>
-# Copyright 2005 Ryan Anderson <[email protected]>
-# Copyright 2005, Ryan Anderson <[email protected]>
-# This tool is copyright (c) 2005, Martin Langhoff.
-# This tool is copyright (c) 2005, Matthias Urlichs.
-#### Copyright The Open University UK - 2006.
-Copyright © 2005-2008 Paul Mackerras
-Copyright © 2006, 2007 Shawn Pearce, et. al.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-Copyright (C) 2006 Free Software Foundation, Inc.
-Copyright 2006 by Petr Baudis E<lt>[email protected]<gt>.
-This program is copyright The Open University UK – 2006.
- * Copyright (C) 2010, Google Inc. 
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+== git-p4.py ===================================================================
+Copyright (c) 2007 Simon Hausmann <[email protected]>
+Copyright (c) 2007 Trolltech ASA
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+== khash.h =====================================================================
+Copyright (c) 2008, 2009, 2011 by Attractive Chaos <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+== vcs-svn/* ===================================================================
+Copyright (C) 2010 David Barr <[email protected]>.
+All rights reserved.
+
+Copyright (C) 2010 Jonathan Nieder <[email protected]>.
+
+Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH,
+Frankfurt/Main, Germany
+and others, see http://svn2cc.sarovar.org
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice(s), this list of conditions and the following disclaimer
+   unmodified other than the allowable addition of one or more
+   copyright notices.
+2. Redistributions in binary form must reproduce the above copyright
+   notice(s), this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+== xdiff/xhistogram.c ==========================================================
+Copyright (C) 2010, Google Inc.
+and other copyright owners as documented in JGit's IP log.
+
+This program and the accompanying materials are made available
+under the terms of the Eclipse Distribution License v1.0 which
+accompanies this distribution, is reproduced below, and is
+available at http://www.eclipse.org/org/documents/edl-v10.php
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+- Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+- Neither the name of the Eclipse Foundation, Inc. nor the
+  names of its contributors may be used to endorse or promote
+  products derived from this software without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/components/git/git.p5m	Sat Apr 02 01:55:18 2016 +0100
+++ b/components/git/git.p5m	Thu Mar 24 11:12:03 2016 -0700
@@ -18,11 +18,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/lib/git-core/.* -> default mode 0555>
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr/perl5/.*/man/(.*) -> emit link \
+    path=/usr/share/man/%<1> target=../../../perl5/$(PERL_VERSION)/man/%<1>>
+#
 set name=pkg.fmri \
     value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="git - Fast Version Control System"
@@ -36,44 +41,49 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/360
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 dir  path=usr
 dir  path=usr/bin
-hardlink path=usr/bin/git target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git target=../lib/git-core/git
 hardlink path=usr/bin/git-cvsserver target=../lib/git-core/git-cvsserver
-hardlink path=usr/bin/git-receive-pack target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git-receive-pack target=../lib/git-core/git
 hardlink path=usr/bin/git-shell target=../lib/git-core/git-shell
-hardlink path=usr/bin/git-upload-archive target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git-upload-archive target=../lib/git-core/git
 hardlink path=usr/bin/git-upload-pack target=../lib/git-core/git-upload-pack
 file path=usr/bin/gitk
 dir  path=usr/lib
 dir  path=usr/lib/git-core
-hardlink path=usr/lib/git-core/git target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-add target=git-cherry-pick
+file path=usr/lib/git-core/git
+hardlink path=usr/lib/git-core/git-add target=git
 file path=usr/lib/git-core/git-add--interactive
-file path=usr/lib/git-core/git-am
-hardlink path=usr/lib/git-core/git-annotate target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-apply target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-am target=git
+hardlink path=usr/lib/git-core/git-annotate target=git
+hardlink path=usr/lib/git-core/git-apply target=git
 file path=usr/lib/git-core/git-archimport
-hardlink path=usr/lib/git-core/git-archive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-archive target=git
 file path=usr/lib/git-core/git-bisect
-hardlink path=usr/lib/git-core/git-bisect--helper target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-blame target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-branch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-bundle target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-cat-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-attr target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-ref-format target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-checkout target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-checkout-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-cherry target=git-cherry-pick
-file path=usr/lib/git-core/git-cherry-pick
+hardlink path=usr/lib/git-core/git-bisect--helper target=git
+hardlink path=usr/lib/git-core/git-blame target=git
+hardlink path=usr/lib/git-core/git-branch target=git
+hardlink path=usr/lib/git-core/git-bundle target=git
+hardlink path=usr/lib/git-core/git-cat-file target=git
+hardlink path=usr/lib/git-core/git-check-attr target=git
+hardlink path=usr/lib/git-core/git-check-ignore target=git
+hardlink path=usr/lib/git-core/git-check-mailmap target=git
+hardlink path=usr/lib/git-core/git-check-ref-format target=git
+hardlink path=usr/lib/git-core/git-checkout target=git
+hardlink path=usr/lib/git-core/git-checkout-index target=git
+hardlink path=usr/lib/git-core/git-cherry target=git
+hardlink path=usr/lib/git-core/git-cherry-pick target=git
 hardlink path=usr/lib/git-core/git-citool target=git-gui
-hardlink path=usr/lib/git-core/git-clean target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-clone target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-commit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-commit-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-config target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-count-objects target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-clean target=git
+hardlink path=usr/lib/git-core/git-clone target=git
+hardlink path=usr/lib/git-core/git-column target=git
+hardlink path=usr/lib/git-core/git-commit target=git
+hardlink path=usr/lib/git-core/git-commit-tree target=git
+hardlink path=usr/lib/git-core/git-config target=git
+hardlink path=usr/lib/git-core/git-count-objects target=git
+hardlink path=usr/lib/git-core/git-credential target=git
 file path=usr/lib/git-core/git-credential-cache
 file path=usr/lib/git-core/git-credential-cache--daemon
 file path=usr/lib/git-core/git-credential-store
@@ -81,140 +91,147 @@
 file path=usr/lib/git-core/git-cvsimport
 file path=usr/lib/git-core/git-cvsserver
 file path=usr/lib/git-core/git-daemon
-hardlink path=usr/lib/git-core/git-describe target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-files target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-describe target=git
+hardlink path=usr/lib/git-core/git-diff target=git
+hardlink path=usr/lib/git-core/git-diff-files target=git
+hardlink path=usr/lib/git-core/git-diff-index target=git
+hardlink path=usr/lib/git-core/git-diff-tree target=git
 file path=usr/lib/git-core/git-difftool
 file path=usr/lib/git-core/git-difftool--helper
-hardlink path=usr/lib/git-core/git-fast-export target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fast-export target=git
 file path=usr/lib/git-core/git-fast-import
-hardlink path=usr/lib/git-core/git-fetch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fetch-pack target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fetch target=git
+hardlink path=usr/lib/git-core/git-fetch-pack target=git
 file path=usr/lib/git-core/git-filter-branch
-hardlink path=usr/lib/git-core/git-fmt-merge-msg target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-for-each-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-format-patch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fsck target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fsck-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-gc target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-get-tar-commit-id target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-grep target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fmt-merge-msg target=git
+hardlink path=usr/lib/git-core/git-for-each-ref target=git
+hardlink path=usr/lib/git-core/git-format-patch target=git
+hardlink path=usr/lib/git-core/git-fsck target=git
+hardlink path=usr/lib/git-core/git-fsck-objects target=git
+hardlink path=usr/lib/git-core/git-gc target=git
+hardlink path=usr/lib/git-core/git-get-tar-commit-id target=git
+hardlink path=usr/lib/git-core/git-grep target=git
 file path=usr/lib/git-core/git-gui
 file path=usr/lib/git-core/git-gui--askpass
-hardlink path=usr/lib/git-core/git-hash-object target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-help target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-hash-object target=git
+hardlink path=usr/lib/git-core/git-help target=git
 file path=usr/lib/git-core/git-http-backend
 file path=usr/lib/git-core/git-http-fetch
 file path=usr/lib/git-core/git-http-push
 file path=usr/lib/git-core/git-imap-send
-hardlink path=usr/lib/git-core/git-index-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-init target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-init-db target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-index-pack target=git
+hardlink path=usr/lib/git-core/git-init target=git
+hardlink path=usr/lib/git-core/git-init-db target=git
 file path=usr/lib/git-core/git-instaweb
-hardlink path=usr/lib/git-core/git-log target=git-cherry-pick
-file path=usr/lib/git-core/git-lost-found
-hardlink path=usr/lib/git-core/git-ls-files target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mailinfo target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mailsplit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-base target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-index target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-interpret-trailers target=git
+hardlink path=usr/lib/git-core/git-log target=git
+hardlink path=usr/lib/git-core/git-ls-files target=git
+hardlink path=usr/lib/git-core/git-ls-remote target=git
+hardlink path=usr/lib/git-core/git-ls-tree target=git
+hardlink path=usr/lib/git-core/git-mailinfo target=git
+hardlink path=usr/lib/git-core/git-mailsplit target=git
+hardlink path=usr/lib/git-core/git-merge target=git
+hardlink path=usr/lib/git-core/git-merge-base target=git
+hardlink path=usr/lib/git-core/git-merge-file target=git
+hardlink path=usr/lib/git-core/git-merge-index target=git
 file path=usr/lib/git-core/git-merge-octopus
 file path=usr/lib/git-core/git-merge-one-file
-hardlink path=usr/lib/git-core/git-merge-ours target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-recursive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-merge-ours target=git
+hardlink path=usr/lib/git-core/git-merge-recursive target=git
 file path=usr/lib/git-core/git-merge-resolve
-hardlink path=usr/lib/git-core/git-merge-subtree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-merge-subtree target=git
+hardlink path=usr/lib/git-core/git-merge-tree target=git
 file path=usr/lib/git-core/git-mergetool
 file path=usr/lib/git-core/git-mergetool--lib
-hardlink path=usr/lib/git-core/git-mktag target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mktree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mv target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-name-rev target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-notes target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-redundant target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-refs target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-mktag target=git
+hardlink path=usr/lib/git-core/git-mktree target=git
+hardlink path=usr/lib/git-core/git-mv target=git
+hardlink path=usr/lib/git-core/git-name-rev target=git
+hardlink path=usr/lib/git-core/git-notes target=git
+file path=usr/lib/git-core/git-p4
+hardlink path=usr/lib/git-core/git-pack-objects target=git
+hardlink path=usr/lib/git-core/git-pack-redundant target=git
+hardlink path=usr/lib/git-core/git-pack-refs target=git
 file path=usr/lib/git-core/git-parse-remote
-hardlink path=usr/lib/git-core/git-patch-id target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-peek-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-prune target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-prune-packed target=git-cherry-pick
-file path=usr/lib/git-core/git-pull
-hardlink path=usr/lib/git-core/git-push target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-patch-id target=git
+hardlink path=usr/lib/git-core/git-prune target=git
+hardlink path=usr/lib/git-core/git-prune-packed target=git
+hardlink path=usr/lib/git-core/git-pull target=git
+hardlink path=usr/lib/git-core/git-push target=git
 file path=usr/lib/git-core/git-quiltimport
-hardlink path=usr/lib/git-core/git-read-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-read-tree target=git
 file path=usr/lib/git-core/git-rebase
 file path=usr/lib/git-core/git-rebase--am
 file path=usr/lib/git-core/git-rebase--interactive
 file path=usr/lib/git-core/git-rebase--merge
-hardlink path=usr/lib/git-core/git-receive-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-reflog target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-receive-pack target=git
+hardlink path=usr/lib/git-core/git-reflog target=git
 file path=usr/lib/git-core/git-relink
-hardlink path=usr/lib/git-core/git-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-remote-ext target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-remote-fd target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-remote target=git
+hardlink path=usr/lib/git-core/git-remote-ext target=git
+hardlink path=usr/lib/git-core/git-remote-fd target=git
 hardlink path=usr/lib/git-core/git-remote-ftp target=git-remote-ftps
 file path=usr/lib/git-core/git-remote-ftps
 hardlink path=usr/lib/git-core/git-remote-http target=git-remote-ftps
 hardlink path=usr/lib/git-core/git-remote-https target=git-remote-ftps
-file path=usr/lib/git-core/git-remote-testgit
-file path=usr/lib/git-core/git-repack
-hardlink path=usr/lib/git-core/git-replace target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-repo-config target=git-cherry-pick
+file path=usr/lib/git-core/git-remote-testsvn
+hardlink path=usr/lib/git-core/git-repack target=git
+hardlink path=usr/lib/git-core/git-replace target=git
 file path=usr/lib/git-core/git-request-pull
-hardlink path=usr/lib/git-core/git-rerere target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-reset target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rev-list target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rev-parse target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-revert target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rm target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-rerere target=git
+hardlink path=usr/lib/git-core/git-reset target=git
+hardlink path=usr/lib/git-core/git-rev-list target=git
+hardlink path=usr/lib/git-core/git-rev-parse target=git
+hardlink path=usr/lib/git-core/git-revert target=git
+hardlink path=usr/lib/git-core/git-rm target=git
 file path=usr/lib/git-core/git-send-email
-hardlink path=usr/lib/git-core/git-send-pack target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-send-pack target=git
 file path=usr/lib/git-core/git-sh-i18n
 file path=usr/lib/git-core/git-sh-i18n--envsubst
 file path=usr/lib/git-core/git-sh-setup
 file path=usr/lib/git-core/git-shell
-hardlink path=usr/lib/git-core/git-shortlog target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-show target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-show-branch target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-shortlog target=git
+hardlink path=usr/lib/git-core/git-show target=git
+hardlink path=usr/lib/git-core/git-show-branch target=git
 file path=usr/lib/git-core/git-show-index
-hardlink path=usr/lib/git-core/git-show-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-stage target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-show-ref target=git
+hardlink path=usr/lib/git-core/git-stage target=git
 file path=usr/lib/git-core/git-stash
-hardlink path=usr/lib/git-core/git-status target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-stripspace target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-status target=git
+hardlink path=usr/lib/git-core/git-stripspace target=git
 file path=usr/lib/git-core/git-submodule
+hardlink path=usr/lib/git-core/git-submodule--helper target=git
 file path=usr/lib/git-core/git-svn
-hardlink path=usr/lib/git-core/git-symbolic-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-tag target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-tar-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-unpack-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-unpack-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-server-info target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-upload-archive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-symbolic-ref target=git
+hardlink path=usr/lib/git-core/git-tag target=git
+hardlink path=usr/lib/git-core/git-unpack-file target=git
+hardlink path=usr/lib/git-core/git-unpack-objects target=git
+hardlink path=usr/lib/git-core/git-update-index target=git
+hardlink path=usr/lib/git-core/git-update-ref target=git
+hardlink path=usr/lib/git-core/git-update-server-info target=git
+hardlink path=usr/lib/git-core/git-upload-archive target=git
 file path=usr/lib/git-core/git-upload-pack
-hardlink path=usr/lib/git-core/git-var target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-tag target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-var target=git
+hardlink path=usr/lib/git-core/git-verify-commit target=git
+hardlink path=usr/lib/git-core/git-verify-pack target=git
+hardlink path=usr/lib/git-core/git-verify-tag target=git
 file path=usr/lib/git-core/git-web--browse
-hardlink path=usr/lib/git-core/git-whatchanged target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-write-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-whatchanged target=git
+hardlink path=usr/lib/git-core/git-worktree target=git
+hardlink path=usr/lib/git-core/git-write-tree target=git
 dir  path=usr/lib/git-core/mergetools
 file path=usr/lib/git-core/mergetools/araxis
+file path=usr/lib/git-core/mergetools/bc
 file path=usr/lib/git-core/mergetools/bc3
-file path=usr/lib/git-core/mergetools/defaults
+file path=usr/lib/git-core/mergetools/codecompare
+file path=usr/lib/git-core/mergetools/deltawalker
+file path=usr/lib/git-core/mergetools/diffmerge
 file path=usr/lib/git-core/mergetools/diffuse
 file path=usr/lib/git-core/mergetools/ecmerge
 file path=usr/lib/git-core/mergetools/emerge
+file path=usr/lib/git-core/mergetools/gvimdiff
+file path=usr/lib/git-core/mergetools/gvimdiff2
+file path=usr/lib/git-core/mergetools/gvimdiff3
 file path=usr/lib/git-core/mergetools/kdiff3
 file path=usr/lib/git-core/mergetools/kompare
 file path=usr/lib/git-core/mergetools/meld
@@ -222,35 +239,47 @@
 file path=usr/lib/git-core/mergetools/p4merge
 file path=usr/lib/git-core/mergetools/tkdiff
 file path=usr/lib/git-core/mergetools/tortoisemerge
-file path=usr/lib/git-core/mergetools/vim
+file path=usr/lib/git-core/mergetools/vimdiff
+file path=usr/lib/git-core/mergetools/vimdiff2
+file path=usr/lib/git-core/mergetools/vimdiff3
+file path=usr/lib/git-core/mergetools/winmerge
 file path=usr/lib/git-core/mergetools/xxdiff
-dir  path=usr/lib/python$(PYVER)
-dir  path=usr/lib/python$(PYVER)/vendor-packages
-dir  path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers-0.1.0-py$(PYVER).egg-info
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/__init__.pyc
-dir  path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/__init__.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/exporter.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/exporter.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/git.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/git.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/importer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/importer.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/non_local.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/non_local.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/repo.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/repo.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/util.pyc
 dir  path=usr/perl5
+dir  path=usr/perl5/$(PERL_VERSION)
+dir  path=usr/perl5/$(PERL_VERSION)/man
+dir  path=usr/perl5/$(PERL_VERSION)/man/man3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::I18N.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Editor.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Fetcher.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Memoize::YAML.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Prompt.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Ra.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Utils.3
 dir  path=usr/perl5/vendor_perl
 dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)
 dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Error.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Git.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Git/.packlist
+# perl/Makefile.PL installs this file if and only if 'require Error' fails.
+# Thus if git is installed, it succeeds, and the file is not installed.  So
+# ignore that and just pull from the source.
+file perl/private-Error.pm path=usr/perl5/vendor_perl/$(PERL_VERSION)/Error.pm
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/I18N.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/IndexInfo.pm
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Editor.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Fetcher.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/GlobSpec.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Log.pm
+dir  path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Memoize
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Memoize/YAML.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Migration.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Prompt.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Ra.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Utils.pm
 dir  path=usr/share
 dir  path=usr/share/git-core
 dir  path=usr/share/git-core/templates
@@ -262,6 +291,7 @@
 file path=usr/share/git-core/templates/hooks/post-update.sample
 file path=usr/share/git-core/templates/hooks/pre-applypatch.sample
 file path=usr/share/git-core/templates/hooks/pre-commit.sample
+file path=usr/share/git-core/templates/hooks/pre-push.sample
 file path=usr/share/git-core/templates/hooks/pre-rebase.sample
 file path=usr/share/git-core/templates/hooks/prepare-commit-msg.sample
 file path=usr/share/git-core/templates/hooks/update.sample
@@ -296,6 +326,7 @@
 file path=usr/share/git-gui/lib/merge.tcl
 file path=usr/share/git-gui/lib/mergetool.tcl
 dir  path=usr/share/git-gui/lib/msgs
+file path=usr/share/git-gui/lib/msgs/bg.msg
 file path=usr/share/git-gui/lib/msgs/de.msg
 file path=usr/share/git-gui/lib/msgs/el.msg
 file path=usr/share/git-gui/lib/msgs/fr.msg
@@ -306,6 +337,7 @@
 file path=usr/share/git-gui/lib/msgs/pt_br.msg
 file path=usr/share/git-gui/lib/msgs/ru.msg
 file path=usr/share/git-gui/lib/msgs/sv.msg
+file path=usr/share/git-gui/lib/msgs/vi.msg
 file path=usr/share/git-gui/lib/msgs/zh_cn.msg
 file path=usr/share/git-gui/lib/option.tcl
 file path=usr/share/git-gui/lib/remote.tcl
@@ -326,6 +358,8 @@
 dir  path=usr/share/gitk
 dir  path=usr/share/gitk/lib
 dir  path=usr/share/gitk/lib/msgs
+file path=usr/share/gitk/lib/msgs/bg.msg
+file path=usr/share/gitk/lib/msgs/ca.msg
 file path=usr/share/gitk/lib/msgs/de.msg
 file path=usr/share/gitk/lib/msgs/es.msg
 file path=usr/share/gitk/lib/msgs/fr.msg
@@ -335,17 +369,27 @@
 file path=usr/share/gitk/lib/msgs/pt_br.msg
 file path=usr/share/gitk/lib/msgs/ru.msg
 file path=usr/share/gitk/lib/msgs/sv.msg
+file path=usr/share/gitk/lib/msgs/vi.msg
 dir  path=usr/share/gitweb
-file path=usr/share/gitweb/gitweb.cgi
+file path=usr/share/gitweb/gitweb.cgi mode=0555
 dir  path=usr/share/gitweb/static
 file path=usr/share/gitweb/static/git-favicon.png
 file path=usr/share/gitweb/static/git-logo.png
 file path=usr/share/gitweb/static/gitweb.css
 file path=usr/share/gitweb/static/gitweb.js
 dir  path=usr/share/locale
-dir  path=usr/share/locale/is
-dir  path=usr/share/locale/is/LC_MESSAGES
+file path=usr/share/locale/bg/LC_MESSAGES/git.mo
+file path=usr/share/locale/ca/LC_MESSAGES/git.mo
+file path=usr/share/locale/de/LC_MESSAGES/git.mo
+file path=usr/share/locale/fr/LC_MESSAGES/git.mo
 file path=usr/share/locale/is/LC_MESSAGES/git.mo
+file path=usr/share/locale/it/LC_MESSAGES/git.mo
+file path=usr/share/locale/ko/LC_MESSAGES/git.mo
+file path=usr/share/locale/pt_PT/LC_MESSAGES/git.mo
+file path=usr/share/locale/ru/LC_MESSAGES/git.mo
+file path=usr/share/locale/sv/LC_MESSAGES/git.mo
+file path=usr/share/locale/vi/LC_MESSAGES/git.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/git.mo
 dir  path=usr/share/man
 dir  path=usr/share/man/man1
 file path=usr/share/man/man1/git-add.1
@@ -360,6 +404,8 @@
 file path=usr/share/man/man1/git-bundle.1
 file path=usr/share/man/man1/git-cat-file.1
 file path=usr/share/man/man1/git-check-attr.1
+file path=usr/share/man/man1/git-check-ignore.1
+file path=usr/share/man/man1/git-check-mailmap.1
 file path=usr/share/man/man1/git-check-ref-format.1
 file path=usr/share/man/man1/git-checkout-index.1
 file path=usr/share/man/man1/git-checkout.1
@@ -368,6 +414,7 @@
 file path=usr/share/man/man1/git-citool.1
 file path=usr/share/man/man1/git-clean.1
 file path=usr/share/man/man1/git-clone.1
+file path=usr/share/man/man1/git-column.1
 file path=usr/share/man/man1/git-commit-tree.1
 file path=usr/share/man/man1/git-commit.1
 file path=usr/share/man/man1/git-config.1
@@ -375,6 +422,7 @@
 file path=usr/share/man/man1/git-credential-cache--daemon.1
 file path=usr/share/man/man1/git-credential-cache.1
 file path=usr/share/man/man1/git-credential-store.1
+file path=usr/share/man/man1/git-credential.1
 file path=usr/share/man/man1/git-cvsexportcommit.1
 file path=usr/share/man/man1/git-cvsimport.1
 file path=usr/share/man/man1/git-cvsserver.1
@@ -409,8 +457,8 @@
 file path=usr/share/man/man1/git-init-db.1
 file path=usr/share/man/man1/git-init.1
 file path=usr/share/man/man1/git-instaweb.1
+file path=usr/share/man/man1/git-interpret-trailers.1
 file path=usr/share/man/man1/git-log.1
-file path=usr/share/man/man1/git-lost-found.1
 file path=usr/share/man/man1/git-ls-files.1
 file path=usr/share/man/man1/git-ls-remote.1
 file path=usr/share/man/man1/git-ls-tree.1
@@ -435,7 +483,6 @@
 file path=usr/share/man/man1/git-pack-refs.1
 file path=usr/share/man/man1/git-parse-remote.1
 file path=usr/share/man/man1/git-patch-id.1
-file path=usr/share/man/man1/git-peek-remote.1
 file path=usr/share/man/man1/git-prune-packed.1
 file path=usr/share/man/man1/git-prune.1
 file path=usr/share/man/man1/git-pull.1
@@ -448,12 +495,10 @@
 file path=usr/share/man/man1/git-relink.1
 file path=usr/share/man/man1/git-remote-ext.1
 file path=usr/share/man/man1/git-remote-fd.1
-file path=usr/share/man/man1/git-remote-helpers.1
 file path=usr/share/man/man1/git-remote-testgit.1
 file path=usr/share/man/man1/git-remote.1
 file path=usr/share/man/man1/git-repack.1
 file path=usr/share/man/man1/git-replace.1
-file path=usr/share/man/man1/git-repo-config.1
 file path=usr/share/man/man1/git-request-pull.1
 file path=usr/share/man/man1/git-rerere.1
 file path=usr/share/man/man1/git-reset.1
@@ -480,7 +525,6 @@
 file path=usr/share/man/man1/git-svn.1
 file path=usr/share/man/man1/git-symbolic-ref.1
 file path=usr/share/man/man1/git-tag.1
-file path=usr/share/man/man1/git-tar-tree.1
 file path=usr/share/man/man1/git-unpack-file.1
 file path=usr/share/man/man1/git-unpack-objects.1
 file path=usr/share/man/man1/git-update-index.1
@@ -489,15 +533,19 @@
 file path=usr/share/man/man1/git-upload-archive.1
 file path=usr/share/man/man1/git-upload-pack.1
 file path=usr/share/man/man1/git-var.1
+file path=usr/share/man/man1/git-verify-commit.1
 file path=usr/share/man/man1/git-verify-pack.1
 file path=usr/share/man/man1/git-verify-tag.1
 file path=usr/share/man/man1/git-web--browse.1
 file path=usr/share/man/man1/git-whatchanged.1
+file path=usr/share/man/man1/git-worktree.1
 file path=usr/share/man/man1/git-write-tree.1
 file path=usr/share/man/man1/git.1
 file path=usr/share/man/man1/gitk.1
+file path=usr/share/man/man1/gitremote-helpers.1
 file path=usr/share/man/man1/gitweb.1
 dir  path=usr/share/man/man4
+# Autogenerated symlinks to the Git man3 pages go here.
 file path=usr/share/man/man4/gitattributes.4
 file path=usr/share/man/man4/githooks.4
 file path=usr/share/man/man4/gitignore.4
@@ -510,10 +558,12 @@
 file path=usr/share/man/man5/gitcredentials.5
 file path=usr/share/man/man5/gitcvs-migration.5
 file path=usr/share/man/man5/gitdiffcore.5
+file path=usr/share/man/man5/giteveryday.5
 file path=usr/share/man/man5/gitglossary.5
 file path=usr/share/man/man5/gitnamespaces.5
 file path=usr/share/man/man5/gitrevisions.5
 file path=usr/share/man/man5/gittutorial-2.5
 file path=usr/share/man/man5/gittutorial.5
 file path=usr/share/man/man5/gitworkflows.5
+#
 license git.license license=GPLv2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/git/patches/barf.patch	Thu Mar 24 11:12:03 2016 -0700
@@ -0,0 +1,16 @@
+Patch to allow the Studio compilers to compile.  Although the existing code
+catches cases where you're using an older gcc that doesn't support the
+feature, it omits the case where gcc is not the compiler and the feature
+is not available.  This is suitable for upstream.
+
+--- git-2.5.3/git-compat-util.h	Thu Sep 17 13:26:50 2015
++++ git-2.5.3/git-compat-util.h	Thu Sep 24 14:32:55 2015
[email protected]@ -32,6 +32,8 @@
+ # else
+ #  define FLEX_ARRAY 0 /* older GNU extension */
+ # endif
++#else
++# define BARF_UNLESS_AN_ARRAY(arr) 0
+ #endif
+ 
+ /*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/git/patches/gpg.patch	Thu Mar 24 11:12:03 2016 -0700
@@ -0,0 +1,15 @@
+On Solaris, GnuPG's main executable is "gpg2" instead of "gpg".  Perhaps
+that should be otherwise, but until we deliver a "gpg" executable, git
+should look for "gpg2" instead.  This is not suitable for upstream.
+
+--- git-2.6.1/gpg-interface.c	Fri Oct  2 15:40:47 2015
++++ git-2.6.1/gpg-interface.c	Fri Dec  4 14:12:20 2015
[email protected]@ -5,7 +5,7 @@
+ #include "sigchain.h"
+ 
+ static char *configured_signing_key;
+-static const char *gpg_program = "gpg";
++static const char *gpg_program = "gpg2";
+ 
+ #define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
+ #define PGP_MESSAGE "-----BEGIN PGP MESSAGE-----"
--- a/components/git/patches/imap-send.patch	Sat Apr 02 01:55:18 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-This patch fixes CVE-2013-0308.
-It was created from a diff between the version 1.8.1.4 of this file
-from the community and the current one.  The only changes to this file
-are for addressing this CVE.
-Here is the community diff:
-https://github.com/gitster/git/commit/0ee7198f457c8ea031b09b528cfd88f0f0e630d8
-
---- git-1.7.9.2/imap-send.c_orig	2012-02-22 18:04:18.000000000 -0800
-+++ git-1.7.9.2/imap-send.c	2015-03-25 12:23:29.465800340 -0700
[email protected]@ -31,6 +31,7 @@
- #else
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
-+#include <openssl/x509v3.h>
- #endif
- 
- struct store_conf {
[email protected]@ -266,12 +267,64 @@
- 	}
- }
- 
-+#ifdef NO_OPENSSL
- static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
- {
--#ifdef NO_OPENSSL
- 	fprintf(stderr, "SSL requested but SSL support not compiled in\n");
- 	return -1;
-+}
-+
- #else
-+
-+static int host_matches(const char *host, const char *pattern)
-+{
-+	if (pattern[0] == '*' && pattern[1] == '.') {
-+		pattern += 2;
-+		if (!(host = strchr(host, '.')))
-+			return 0;
-+		host++;
-+	}
-+
-+	return *host && *pattern && !strcasecmp(host, pattern);
-+}
-+
-+static int verify_hostname(X509 *cert, const char *hostname)
-+{
-+	int len;
-+	X509_NAME *subj;
-+	char cname[1000];
-+	int i, found;
-+	STACK_OF(GENERAL_NAME) *subj_alt_names;
-+
-+	/* try the DNS subjectAltNames */
-+	found = 0;
-+	if ((subj_alt_names = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL))) {
-+		int num_subj_alt_names = sk_GENERAL_NAME_num(subj_alt_names);
-+		for (i = 0; !found && i < num_subj_alt_names; i++) {
-+			GENERAL_NAME *subj_alt_name = sk_GENERAL_NAME_value(subj_alt_names, i);
-+			if (subj_alt_name->type == GEN_DNS &&
-+			    strlen((const char *)subj_alt_name->d.ia5->data) == (size_t)subj_alt_name->d.ia5->length &&
-+			    host_matches(hostname, (const char *)(subj_alt_name->d.ia5->data)))
-+				found = 1;
-+		}
-+		sk_GENERAL_NAME_pop_free(subj_alt_names, GENERAL_NAME_free);
-+	}
-+	if (found)
-+		return 0;
-+
-+	/* try the common name */
-+	if (!(subj = X509_get_subject_name(cert)))
-+		return error("cannot get certificate subject");
-+	if ((len = X509_NAME_get_text_by_NID(subj, NID_commonName, cname, sizeof(cname))) < 0)
-+		return error("cannot get certificate common name");
-+	if (strlen(cname) == (size_t)len && host_matches(hostname, cname))
-+		return 0;
-+	return error("certificate owner '%s' does not match hostname '%s'",
-+		     cname, hostname);
-+}
-+
-+static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
-+{
- #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
- 	const SSL_METHOD *meth;
- #else
[email protected]@ -279,6 +332,7 @@
- #endif
- 	SSL_CTX *ctx;
- 	int ret;
-+	X509 *cert;
- 
- 	SSL_library_init();
- 	SSL_load_error_strings();
[email protected]@ -322,9 +376,18 @@
- 		return -1;
- 	}
- 
-+	if (verify) {
-+		/* make sure the hostname matches that of the certificate */
-+		cert = SSL_get_peer_certificate(sock->ssl);
-+		if (!cert)
-+			return error("unable to get peer certificate.");
-+		if (verify_hostname(cert, server.host) < 0)
-+			return -1;
-+	}
-+
- 	return 0;
--#endif
- }
-+#endif
- 
- static int socket_read(struct imap_socket *sock, char *buf, int len)
- {
[email protected]@ -1022,7 +1085,7 @@
- 
- 	ret = socket_write(&ctx->imap->buf.sock, response, strlen(response));
- 	if (ret != strlen(response))
--		return error("IMAP error: sending response failed\n");
-+		return error("IMAP error: sending response failed");
- 
- 	free(response);
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/git/patches/inet_ntop.patch	Thu Mar 24 11:12:03 2016 -0700
@@ -0,0 +1,25 @@
+This patch was developed in-house and is planned to be contributed upstream
+(it is still needed for version 2.6.1).
+
+--- git-1.7.9.2/git-compat-util.h.~1~	2015-09-24 16:14:32.844686777 -0700
++++ git-1.7.9.2/git-compat-util.h	2015-09-24 16:13:05.181990467 -0700
[email protected]@ -418,7 +418,7 @@
+ #endif
+ 
+ #ifdef NO_INET_NTOP
+-const char *inet_ntop(int af, const void *src, char *dst, size_t size);
++const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+ #endif
+ 
+ extern void release_pack_memory(size_t, int);
+--- git-1.7.9.2/compat/inet_ntop.c.~1~	2015-09-24 16:16:58.256287899 -0700
++++ git-1.7.9.2/compat/inet_ntop.c	2015-09-24 16:17:19.386385899 -0700
[email protected]@ -168,7 +168,7 @@
+  *	Paul Vixie, 1996.
+  */
+ const char *
+-inet_ntop(int af, const void *src, char *dst, size_t size)
++inet_ntop(int af, const void *src, char *dst, socklen_t size)
+ {
+ 	switch (af) {
+ 	case AF_INET:
--- a/components/git/patches/perl_Makefile.patch	Sat Apr 02 01:55:18 2016 +0100
+++ b/components/git/patches/perl_Makefile.patch	Thu Mar 24 11:12:03 2016 -0700
@@ -1,28 +1,14 @@
---- git-1.7.9.2/perl/Makefile.~1~	Wed Feb 22 18:04:18 2012
-+++ git-1.7.9.2/perl/Makefile	Fri Mar  2 14:51:25 2012
[email protected]@ -21,20 +21,18 @@
- 	$(RM) $(makfile).old
- 
- ifdef NO_PERL_MAKEMAKER
--instdir_SQ = $(subst ','\'',$(prefix)/lib)
-+instdir_SQ = $(subst ','\'',$$(PERL_LIB))
- $(makfile): ../GIT-CFLAGS Makefile
- 	echo all: private-Error.pm Git.pm > [email protected]
- 	echo '	mkdir -p blib/lib' >> [email protected]
- 	echo '	$(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> [email protected]
- 	echo '	$(RM) blib/lib/Error.pm' >> [email protected]
--	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
- 	echo '	cp private-Error.pm blib/lib/Error.pm' >> [email protected]
- 	echo install: >> [email protected]
--	echo '	mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> [email protected]
--	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> [email protected]
--	echo '	$(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> [email protected]
--	'$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \
--	echo '	cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> [email protected]
-+	echo '	mkdir -p "$$(DESTDIR)/$(instdir_SQ)"' >> [email protected]
-+	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)/$(instdir_SQ)"' >> [email protected]
-+	echo '	$(RM) "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> [email protected]
-+	echo '	cp private-Error.pm "$$(DESTDIR)/$(instdir_SQ)/Error.pm"' >> [email protected]
- 	echo instlibdir: >> [email protected]
+Make sure that the vendor pattern for installation is passed through to
+MakeMaker.  This is not suitable for upstream.
+
+--- git-2.4.5/perl/Makefile	Thu Jun 25 12:15:40 2015
++++ git-2.4.5/perl/Makefile	Sat Jul  4 11:32:21 2015
[email protected]@ -80,7 +80,7 @@
  	echo '	echo $(instdir_SQ)' >> [email protected]
  else
+ $(makfile): Makefile.PL ../GIT-CFLAGS
+-	$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)'
++	$(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE='' --localedir='$(localedir_SQ)' INSTALLDIRS=vendor
+ endif
+ 
+ # this is just added comfort for calling make directly in perl dir
--- a/components/git/patches/python_Makefile.patch	Sat Apr 02 01:55:18 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- git-1.7.3.2/git_remote_helpers/Makefile.orig	Tue Nov 15 05:25:37 2011
-+++ git-1.7.3.2/git_remote_helpers/Makefile	Tue Nov 15 06:35:06 2011
[email protected]@ -23,13 +23,15 @@
- 
- PYLIBDIR=$(shell $(PYTHON_PATH) -c \
- 	 "import sys; \
--	 print 'lib/python%i.%i/site-packages' % sys.version_info[:2]")
-+	 print 'lib/python%i.%i/vendor-packages' % sys.version_info[:2]")
- 
- all: $(pysetupfile)
- 	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
- 
- install: $(pysetupfile)
--	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
-+	$(PYTHON_PATH) $(pysetupfile) install \
-+	--install-lib=$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR) \
-+	--prefix $(DESTDIR_SQ)$(prefix)
- 
- instlibdir: $(pysetupfile)
- 	@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"
--- a/components/git/patches/t_Makefile.patch	Sat Apr 02 01:55:18 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-The ordering to the tests was non-deterministic without sorting the list.
-This will be fed back to the community.
-
---- git-1.7.9.2/t/Makefile_orig	2015-03-26 14:29:33.733092028 -0700
-+++ git-1.7.9.2/t/Makefile	2015-03-26 14:29:53.247281197 -0700
[email protected]@ -17,7 +17,7 @@
- # Shell quote;
- SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
- 
--T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
-+T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
- TSVN = $(wildcard t91[0-9][0-9]-*.sh)
- TGITWEB = $(wildcard t95[0-9][0-9]-*.sh)
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/git/patches/test.patch	Thu Mar 24 11:12:03 2016 -0700
@@ -0,0 +1,102 @@
+A couple of tests need patching:
+
+  - There's a garbled sed command in the clone tests, which works for GNU
+    sed, but not for Solaris.
+
+  - Because we're doing the build in a symlink farm, one of the diff tests
+    thinks that we're changing the type of the files from symlink to file,
+    so the diffs come out wrong.  Rather than cleverly mucking around with
+    the working directory vs the repo directory, we just cat the files as
+    real files into place.
+
+The first patch is probably fine for upstream; the latter perhaps less so.
+
+--- git-2.4.5/t/t5601-clone.sh	Thu Jun 25 12:15:40 2015
++++ git-2.4.5/t/t5601-clone.sh	Thu Jul  2 12:35:08 2015
[email protected]@ -445,7 +445,7 @@
+ #IPv6
+ for tuah in ::1 [::1] [::1]: [email protected]::1 [email protected][::1] [email protected][::1]: [[email protected]::1] [[email protected]::1]:
+ do
+-	ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
++	ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "[]")
+ 	test_expect_success "clone ssh://$tuah/home/user/repo" "
+ 	  test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
+ 	"
+--- git-2.4.5/t/t4018-diff-funcname.sh	Thu Jun 25 12:15:40 2015
++++ git-2.4.5/t/t4018-diff-funcname.sh	Thu Jul  2 14:11:09 2015
[email protected]@ -79,8 +79,11 @@
+ 
+ 	# add all test files to the index
+ 	(
+-		cd "$TEST_DIRECTORY"/t4018 &&
+-		git --git-dir="$TRASH_DIRECTORY/.git" add .
++		( cd "$TEST_DIRECTORY"/t4018 && printf "%s\n" * ) | while read f
++		do
++			cat "$TEST_DIRECTORY"/t4018/$f > $f
++			git add -v $f
++		done
+ 	) &&
+ 
+ 	# place modified files in the worktree
+
+
+This simply adds a couple of targets to the test Makefile which allow us to
+run the tests in parallel cleanly.  This way the results don't get cleaned
+up automatically after running the tests, and we can emit those results to
+the master file.  This might be interesting to upstream, but is really
+specific to running the tests in an external framework.
+
+--- git-2.7.4/t/Makefile	Thu Mar 17 13:47:59 2016
++++ git-2.7.4/t/Makefile	Tue Mar 22 14:28:40 2016
[email protected]@ -36,6 +36,9 @@
+ test: pre-clean $(TEST_LINT)
+ 	$(MAKE) aggregate-results-and-cleanup
+ 
++test-noclean: pre-clean $(TEST_LINT)
++	$(MAKE) T
++
+ prove: pre-clean $(TEST_LINT)
+ 	@echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+ 	$(MAKE) clean-except-prove-cache
[email protected]@ -68,6 +71,8 @@
+ test-lint-shell-syntax:
+ 	@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS)
+ 
++T: $(T)
++
+ aggregate-results-and-cleanup: $(T)
+ 	$(MAKE) aggregate-results
+ 	$(MAKE) clean
+
+
+This is a Solaris-specific patch that turns on GnuPG in the tests, which it
+wouldn't otherwise because we don't deliver GnuPG in its usual path.
+
+--- git-2.7.4/t/lib-gpg.sh	Thu Mar 17 13:47:59 2016
++++ git-2.7.4/t/lib-gpg.sh	Tue Mar 22 14:40:59 2016
[email protected]@ -1,5 +1,9 @@
+ #!/bin/sh
+ 
++gpg() {
++	gpg2 "[email protected]"
++}
++
+ gpg_version=$(gpg --version 2>&1)
+ if test $? = 127; then
+ 	say "You do not seem to have gpg installed"
+
+
+This allows Apache 2.4 to load on Solaris.
+
+--- git-2.7.4/t/lib-httpd/apache.conf	Thu Mar 17 13:47:59 2016
++++ git-2.7.4/t/lib-httpd/apache.conf	Tue Mar 22 15:15:56 2016
[email protected]@ -64,6 +64,9 @@
+ <IfModule !mod_mpm_prefork.c>
+ 	LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+ </IfModule>
++<IfModule !mod_unixd.c>
++	LoadModule unixd_module modules/mod_unixd.so
++</IfModule>
+ </IfVersion>
+ 
+ PassEnv GIT_VALGRIND