From: Erik Kapfer Date: Mon, 23 Dec 2013 16:38:41 +0000 (+0100) Subject: git: Update to 1.8.5.2. X-Git-Tag: v2.15-beta1~93^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66aeb7b5042c7188fedc66abea1e224c39836ed2;p=people%2Fms%2Fipfire-2.x.git git: Update to 1.8.5.2. --- diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index ada23da83a..5584c25758 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -24,25 +24,6 @@ usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm #usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.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/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 @@ -59,6 +40,8 @@ usr/libexec/git-core/git-branch usr/libexec/git-core/git-bundle usr/libexec/git-core/git-cat-file usr/libexec/git-core/git-check-attr +usr/libexec/git-core/git-check-ignore +usr/libexec/git-core/git-check-mailmap usr/libexec/git-core/git-check-ref-format usr/libexec/git-core/git-checkout usr/libexec/git-core/git-checkout-index @@ -100,8 +83,8 @@ usr/libexec/git-core/git-fsck-objects usr/libexec/git-core/git-gc usr/libexec/git-core/git-get-tar-commit-id usr/libexec/git-core/git-grep -usr/libexec/git-core/git-gui -usr/libexec/git-core/git-gui--askpass +#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 @@ -164,8 +147,7 @@ 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-remote-testsvn +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 @@ -213,11 +195,13 @@ 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/diffmerge usr/libexec/git-core/mergetools/diffuse usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge +usr/libexec/git-core/mergetools/gvimdiff +usr/libexec/git-core/mergetools/gvimdiff2 usr/libexec/git-core/mergetools/kdiff3 usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld @@ -225,7 +209,8 @@ 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/vimdiff +usr/libexec/git-core/mergetools/vimdiff2 usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates @@ -237,6 +222,7 @@ usr/share/git-core/templates/hooks/commit-msg.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 +usr/share/git-core/templates/hooks/pre-push.sample usr/share/git-core/templates/hooks/pre-rebase.sample usr/share/git-core/templates/hooks/prepare-commit-msg.sample usr/share/git-core/templates/hooks/update.sample @@ -319,6 +305,7 @@ usr/share/git-core/templates/info/exclude #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/fr/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 diff --git a/lfs/git b/lfs/git index 615c5b4c0c..2b8e8682d0 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team # +# Copyright (C) 2013 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.8.1 +VER = 1.8.5.2 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 = 9 +PAK_VER = 10 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a2c6f4404c5e432b47474d246ca83c7e +$(DL_FILE)_MD5 = 65b84be7298a4b9585a888410777f02e install : $(TARGET) @@ -77,8 +77,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) @$(POSTBUILD)