Merge remote-tracking branch 'stevee/git-update' into next

config/rootfiles/packages/git

@@ -9,8 +9,21 @@ usr/lib/perl5/site_perl/5.12.3/Error.pm
 usr/lib/perl5/site_perl/5.12.3/Git
 usr/lib/perl5/site_perl/5.12.3/Git.pm
 usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
+#usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm
+#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist
 usr/lib/python2.7/site-packages/git_remote_helpers
 #usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info
 usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py
@@ -54,10 +67,12 @@ usr/libexec/git-core/git-cherry-pick
 usr/libexec/git-core/git-citool
 usr/libexec/git-core/git-clean
 usr/libexec/git-core/git-clone
+usr/libexec/git-core/git-column
 usr/libexec/git-core/git-commit
 usr/libexec/git-core/git-commit-tree
 usr/libexec/git-core/git-config
 usr/libexec/git-core/git-count-objects
+usr/libexec/git-core/git-credential
 usr/libexec/git-core/git-credential-cache
 usr/libexec/git-core/git-credential-cache--daemon
 usr/libexec/git-core/git-credential-store
@@ -122,6 +137,7 @@ usr/libexec/git-core/git-mktree
 usr/libexec/git-core/git-mv
 usr/libexec/git-core/git-name-rev
 usr/libexec/git-core/git-notes
+usr/libexec/git-core/git-p4
 usr/libexec/git-core/git-pack-objects
 usr/libexec/git-core/git-pack-redundant
 usr/libexec/git-core/git-pack-refs
@@ -149,6 +165,7 @@ usr/libexec/git-core/git-remote-ftps
 usr/libexec/git-core/git-remote-http
 usr/libexec/git-core/git-remote-https
 usr/libexec/git-core/git-remote-testgit
+#usr/libexec/git-core/git-remote-testsvn
 usr/libexec/git-core/git-repack
 usr/libexec/git-core/git-replace
 usr/libexec/git-core/git-repo-config
@@ -195,7 +212,9 @@ usr/libexec/git-core/git-write-tree
 usr/libexec/git-core/mergetools
 usr/libexec/git-core/mergetools/araxis
 usr/libexec/git-core/mergetools/bc3
+usr/libexec/git-core/mergetools/codecompare
 usr/libexec/git-core/mergetools/defaults
+usr/libexec/git-core/mergetools/deltawalker
 usr/libexec/git-core/mergetools/diffuse
 usr/libexec/git-core/mergetools/ecmerge
 usr/libexec/git-core/mergetools/emerge
@@ -298,7 +317,23 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitweb/static/git-logo.png
 #usr/share/gitweb/static/gitweb.css
 #usr/share/gitweb/static/gitweb.js
+#usr/share/locale/da/LC_MESSAGES/git.mo
+#usr/share/locale/de/LC_MESSAGES/git.mo
 #usr/share/locale/is/LC_MESSAGES/git.mo
+#usr/share/locale/it/LC_MESSAGES/git.mo
+#usr/share/locale/nl/LC_MESSAGES/git.mo
+#usr/share/locale/pt_PT
+#usr/share/locale/pt_PT/LC_MESSAGES
+#usr/share/locale/pt_PT/LC_MESSAGES/git.mo
+#usr/share/locale/sv/LC_MESSAGES/git.mo
+#usr/share/locale/vi/LC_MESSAGES/git.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/git.mo
 #usr/share/man/man3/Git.3
 #usr/share/man/man3/Git::I18N.3
+#usr/share/man/man3/Git::SVN::Editor.3
+#usr/share/man/man3/Git::SVN::Fetcher.3
+#usr/share/man/man3/Git::SVN::Memoize::YAML.3
+#usr/share/man/man3/Git::SVN::Prompt.3
+#usr/share/man/man3/Git::SVN::Ra.3
+#usr/share/man/man3/Git::SVN::Utils.3
 #usr/share/man/man3/private-Error.3

lfs/git

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.7.9.3
+VER        = 1.8.1
 
 THISAPP    = git-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f93b976649216d731fd9f9befb90a58c
+$(DL_FILE)_MD5 = a2c6f4404c5e432b47474d246ca83c7e
 
 install : $(TARGET)