Am 2017-04-06 11:00, schrieb Michael Tremer: > Hi, > > see my comments inline. > > On Wed, 2017-03-22 at 09:40 +0100, Marcel Lorenz wrote: >> https://github.com/git/git/blob/master/Documentation/RelNotes/2.12.0.txt >> https://github.com/git/git/blob/master/Documentation/RelNotes/2.12.1.txt >> >> Signed-off-by: Marcel Lorenz >> --- >>  config/rootfiles/packages/git | 35 >> +++++++++++++++++++---------------- >>  lfs/git                       | 11 ++++++----- >>  2 files changed, 25 insertions(+), 21 deletions(-) >> >> diff --git a/config/rootfiles/packages/git >> b/config/rootfiles/packages/git >> index ea31b20..8d26912 100644 >> --- a/config/rootfiles/packages/git >> +++ b/config/rootfiles/packages/git >> @@ -10,22 +10,22 @@ usr/lib/perl5/site_perl/5.12.3/Error.pm >>  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/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/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/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/x86_64-linux-thread-multi/auto/Git >> +#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Git/.packlist > > There are architecture-dependent paths in the rootfile which will cause > the > build to fail on i586 and armv5tel. Oh sorry, note seen. I make a v2 patch. > >>  #usr/libexec/git-core >> -#usr/libexec/git-core/git >> +usr/libexec/git-core/git >>  usr/libexec/git-core/git-add >>  usr/libexec/git-core/git-add--interactive >>  usr/libexec/git-core/git-am >> @@ -138,7 +138,6 @@ 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 >> @@ -201,6 +200,7 @@ 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/examdiff >>  usr/libexec/git-core/mergetools/gvimdiff >>  usr/libexec/git-core/mergetools/gvimdiff2 >>  usr/libexec/git-core/mergetools/gvimdiff3 >> @@ -228,6 +228,7 @@ >> 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/pre-receive.sample >>  usr/share/git-core/templates/hooks/prepare-commit-msg.sample >>  usr/share/git-core/templates/hooks/update.sample >>  #usr/share/git-core/templates/info >> @@ -270,6 +271,7 @@ usr/share/git-core/templates/info/exclude >>  #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/pt_pt.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 >> @@ -302,6 +304,7 @@ usr/share/git-core/templates/info/exclude >>  #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/pt_pt.msg >>  #usr/share/gitk/lib/msgs/ru.msg >>  #usr/share/gitk/lib/msgs/sv.msg >>  #usr/share/gitk/lib/msgs/vi.msg >> diff --git a/lfs/git b/lfs/git >> index 564bc09..9b55b20 100644 >> --- a/lfs/git >> +++ b/lfs/git >> @@ -1,7 +1,7 @@ >>  ############################################################################# >> ## >>  #                                                                             >>  # >>  # IPFire.org - A linux based >> firewall                                         # >> -# Copyright (C) 2013  IPFire >> Team                            >>  # >> +# Copyright (C) 2017  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,15 +24,15 @@ >>   >>  include Config >>   >> -VER        = 2.7.4 >> +VER        = 2.12.1 >>   >>  THISAPP    = git-$(VER) >> -DL_FILE    = $(THISAPP).tar.xz >> +DL_FILE    = $(THISAPP).tar.gz >>  DL_FROM    = $(URL_IPFIRE) >>  DIR_APP    = $(DIR_SRC)/$(THISAPP) >>  TARGET     = $(DIR_INFO)/$(THISAPP) >>  PROG       = git >> -PAK_VER    = 13 >> +PAK_VER    = 14 >>   >>  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 = b0219fcb6d73104361f4fbdba3741d00 >> +$(DL_FILE)_MD5 = a05c614c80ecd41e50699f1562e1130c >>   >>  install : $(TARGET) >>   >> @@ -77,6 +77,7 @@ $(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) && autoconf > > Why is this necessary? The archive came with no configure script. Best, Marcel > >>   cd $(DIR_APP) && ./configure \ >>   --with-gitconfig=/etc/gitconfig \ >>   --prefix=/usr \