From: Michael Tremer Date: Sun, 11 Mar 2012 15:53:32 +0000 (+0100) Subject: git: Update to 1.7.9.3. X-Git-Tag: v2.11-core58~10 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=25a063e66dd06b43685dcd6cc779a6ad71b125b6 git: Update to 1.7.9.3. --- diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index f17851da9e..b92070e074 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -6,10 +6,32 @@ usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk 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/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/I18N.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 +usr/lib/python2.7/site-packages/git_remote_helpers/__init__.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git +usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/git.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/git.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/util.py +usr/lib/python2.7/site-packages/git_remote_helpers/util.pyc usr/libexec/git-core +usr/libexec/git-core/git usr/libexec/git-core/git-add usr/libexec/git-core/git-add--interactive usr/libexec/git-core/git-am @@ -36,6 +58,9 @@ 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-cache +usr/libexec/git-core/git-credential-cache--daemon +usr/libexec/git-core/git-credential-store usr/libexec/git-core/git-cvsexportcommit usr/libexec/git-core/git-cvsimport usr/libexec/git-core/git-cvsserver @@ -50,7 +75,6 @@ usr/libexec/git-core/git-difftool--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch -usr/libexec/git-core/git-fetch--tool usr/libexec/git-core/git-fetch-pack usr/libexec/git-core/git-filter-branch usr/libexec/git-core/git-fmt-merge-msg @@ -65,6 +89,7 @@ usr/libexec/git-core/git-gui usr/libexec/git-core/git-gui--askpass usr/libexec/git-core/git-hash-object usr/libexec/git-core/git-help +usr/libexec/git-core/git-http-backend usr/libexec/git-core/git-http-fetch usr/libexec/git-core/git-http-push usr/libexec/git-core/git-imap-send @@ -96,6 +121,7 @@ usr/libexec/git-core/git-mktag 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-pack-objects usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs @@ -109,12 +135,22 @@ usr/libexec/git-core/git-push usr/libexec/git-core/git-quiltimport usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase +usr/libexec/git-core/git-rebase--am usr/libexec/git-core/git-rebase--interactive +usr/libexec/git-core/git-rebase--merge usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-relink usr/libexec/git-core/git-remote +usr/libexec/git-core/git-remote-ext +usr/libexec/git-core/git-remote-fd +usr/libexec/git-core/git-remote-ftp +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-repack +usr/libexec/git-core/git-replace usr/libexec/git-core/git-repo-config usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere @@ -125,6 +161,8 @@ usr/libexec/git-core/git-revert usr/libexec/git-core/git-rm usr/libexec/git-core/git-send-email usr/libexec/git-core/git-send-pack +usr/libexec/git-core/git-sh-i18n +usr/libexec/git-core/git-sh-i18n--envsubst usr/libexec/git-core/git-sh-setup usr/libexec/git-core/git-shell usr/libexec/git-core/git-shortlog @@ -154,6 +192,22 @@ usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse usr/libexec/git-core/git-whatchanged 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/defaults +usr/libexec/git-core/mergetools/diffuse +usr/libexec/git-core/mergetools/ecmerge +usr/libexec/git-core/mergetools/emerge +usr/libexec/git-core/mergetools/kdiff3 +usr/libexec/git-core/mergetools/kompare +usr/libexec/git-core/mergetools/meld +usr/libexec/git-core/mergetools/opendiff +usr/libexec/git-core/mergetools/p4merge +usr/libexec/git-core/mergetools/tkdiff +usr/libexec/git-core/mergetools/tortoisemerge +usr/libexec/git-core/mergetools/vim +usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates usr/share/git-core/templates/branches @@ -161,8 +215,6 @@ usr/share/git-core/templates/description usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample -usr/share/git-core/templates/hooks/post-commit.sample -usr/share/git-core/templates/hooks/post-receive.sample usr/share/git-core/templates/hooks/post-update.sample usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample @@ -195,16 +247,19 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/error.tcl #usr/share/git-gui/lib/git-gui.ico #usr/share/git-gui/lib/index.tcl +#usr/share/git-gui/lib/line.tcl #usr/share/git-gui/lib/logo.tcl #usr/share/git-gui/lib/merge.tcl #usr/share/git-gui/lib/mergetool.tcl #usr/share/git-gui/lib/msgs #usr/share/git-gui/lib/msgs/de.msg +#usr/share/git-gui/lib/msgs/el.msg #usr/share/git-gui/lib/msgs/fr.msg #usr/share/git-gui/lib/msgs/hu.msg #usr/share/git-gui/lib/msgs/it.msg #usr/share/git-gui/lib/msgs/ja.msg #usr/share/git-gui/lib/msgs/nb.msg +#usr/share/git-gui/lib/msgs/pt_br.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg #usr/share/git-gui/lib/msgs/zh_cn.msg @@ -218,6 +273,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/sshkey.tcl #usr/share/git-gui/lib/status_bar.tcl #usr/share/git-gui/lib/tclIndex +#usr/share/git-gui/lib/themed.tcl #usr/share/git-gui/lib/tools.tcl #usr/share/git-gui/lib/tools_dlg.tcl #usr/share/git-gui/lib/transport.tcl @@ -228,8 +284,21 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg +#usr/share/gitk/lib/msgs/fr.msg +#usr/share/gitk/lib/msgs/hu.msg #usr/share/gitk/lib/msgs/it.msg +#usr/share/gitk/lib/msgs/ja.msg +#usr/share/gitk/lib/msgs/pt_br.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg +#usr/share/gitweb +#usr/share/gitweb/gitweb.cgi +#usr/share/gitweb/static +#usr/share/gitweb/static/git-favicon.png +#usr/share/gitweb/static/git-logo.png +#usr/share/gitweb/static/gitweb.css +#usr/share/gitweb/static/gitweb.js +#usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/man/man3/Git.3 +#usr/share/man/man3/Git::I18N.3 #usr/share/man/man3/private-Error.3 diff --git a/lfs/git b/lfs/git index 253b81971a..82b90fdc8b 100644 --- a/lfs/git +++ b/lfs/git @@ -24,15 +24,15 @@ include Config -VER = 1.6.3.1 +VER = 1.7.9.3 THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c1f4aab741359c29f0fbf28563ac7387 +$(DL_FILE)_MD5 = f93b976649216d731fd9f9befb90a58c install : $(TARGET) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install