From 654f71f1a4a261e57970a57f430e639f23ae26da Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Jun 2015 21:01:35 +0200 Subject: [PATCH] git: Update to version 2.4.4 Signed-off-by: Michael Tremer --- config/rootfiles/packages/git | 21 +++++++++++++-------- lfs/git | 13 ++++++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 5584c25758..e168483c13 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -95,8 +95,8 @@ usr/libexec/git-core/git-index-pack usr/libexec/git-core/git-init usr/libexec/git-core/git-init-db usr/libexec/git-core/git-instaweb +usr/libexec/git-core/git-interpret-trailers usr/libexec/git-core/git-log -usr/libexec/git-core/git-lost-found usr/libexec/git-core/git-ls-files usr/libexec/git-core/git-ls-remote usr/libexec/git-core/git-ls-tree @@ -126,7 +126,6 @@ usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs usr/libexec/git-core/git-parse-remote usr/libexec/git-core/git-patch-id -usr/libexec/git-core/git-peek-remote usr/libexec/git-core/git-prune usr/libexec/git-core/git-prune-packed usr/libexec/git-core/git-pull @@ -150,7 +149,6 @@ usr/libexec/git-core/git-remote-https 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 usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset @@ -177,7 +175,6 @@ usr/libexec/git-core/git-submodule usr/libexec/git-core/git-svn usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag -usr/libexec/git-core/git-tar-tree usr/libexec/git-core/git-unpack-file usr/libexec/git-core/git-unpack-objects usr/libexec/git-core/git-update-index @@ -186,6 +183,7 @@ usr/libexec/git-core/git-update-server-info usr/libexec/git-core/git-upload-archive usr/libexec/git-core/git-upload-pack usr/libexec/git-core/git-var +usr/libexec/git-core/git-verify-commit usr/libexec/git-core/git-verify-pack usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse @@ -193,6 +191,7 @@ 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/bc usr/libexec/git-core/mergetools/bc3 usr/libexec/git-core/mergetools/codecompare usr/libexec/git-core/mergetools/deltawalker @@ -202,6 +201,7 @@ 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/gvimdiff3 usr/libexec/git-core/mergetools/kdiff3 usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld @@ -211,6 +211,7 @@ usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff usr/libexec/git-core/mergetools/vimdiff2 +usr/libexec/git-core/mergetools/vimdiff3 usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates @@ -257,6 +258,7 @@ usr/share/git-core/templates/info/exclude #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/bg.msg #usr/share/git-gui/lib/msgs/de.msg #usr/share/git-gui/lib/msgs/el.msg #usr/share/git-gui/lib/msgs/fr.msg @@ -267,6 +269,7 @@ usr/share/git-core/templates/info/exclude #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/vi.msg #usr/share/git-gui/lib/msgs/zh_cn.msg #usr/share/git-gui/lib/option.tcl #usr/share/git-gui/lib/remote.tcl @@ -287,6 +290,8 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk #usr/share/gitk/lib #usr/share/gitk/lib/msgs +#usr/share/gitk/lib/msgs/bg.msg +#usr/share/gitk/lib/msgs/ca.msg #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg #usr/share/gitk/lib/msgs/fr.msg @@ -296,6 +301,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/pt_br.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg +#usr/share/gitk/lib/msgs/vi.msg #usr/share/gitweb #usr/share/gitweb/gitweb.cgi #usr/share/gitweb/static @@ -303,15 +309,14 @@ 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/bg/LC_MESSAGES/git.mo +#usr/share/locale/ca/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 -#usr/share/locale/pt_PT -#usr/share/locale/pt_PT/LC_MESSAGES #usr/share/locale/pt_PT/LC_MESSAGES/git.mo +#usr/share/locale/ru/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 diff --git a/lfs/git b/lfs/git index 51936ab4dc..bbec140f4e 100644 --- a/lfs/git +++ b/lfs/git @@ -24,15 +24,15 @@ include Config -VER = 1.8.5.2 +VER = 2.4.4 THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 11 +PAK_VER = 12 DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = df8519044f9880f3687d863d99245282 +$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31 install : $(TARGET) @@ -78,7 +78,10 @@ $(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 + --prefix=/usr \ + --with-libpcre \ + --with-curl \ + --with-expat cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.39.2