From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] git: update to 2.12.1 Date: Thu, 06 Apr 2017 10:00:35 +0100 Message-ID: <1491469235.2643.121.camel@ipfire.org> In-Reply-To: <20170322084007.21748-1-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6617706208152144205==" List-Id: --===============6617706208152144205== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 >=20 > Signed-off-by: Marcel Lorenz > --- > =C2=A0config/rootfiles/packages/git | 35 +++++++++++++++++++---------------- > =C2=A0lfs/git=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0| 11 ++++++----- > =C2=A02 files changed, 25 insertions(+), 21 deletions(-) >=20 > 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 > =C2=A0usr/lib/perl5/site_perl/5.12.3/Git.pm > =C2=A0usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm > =C2=A0usr/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/.packl= ist > +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/.packli= st There are architecture-dependent paths in the rootfile which will cause the build to fail on i586 and armv5tel. > =C2=A0#usr/libexec/git-core > -#usr/libexec/git-core/git > +usr/libexec/git-core/git > =C2=A0usr/libexec/git-core/git-add > =C2=A0usr/libexec/git-core/git-add--interactive > =C2=A0usr/libexec/git-core/git-am > @@ -138,7 +138,6 @@ usr/libexec/git-core/git-rebase--interactive > =C2=A0usr/libexec/git-core/git-rebase--merge > =C2=A0usr/libexec/git-core/git-receive-pack > =C2=A0usr/libexec/git-core/git-reflog > -usr/libexec/git-core/git-relink > =C2=A0usr/libexec/git-core/git-remote > =C2=A0usr/libexec/git-core/git-remote-ext > =C2=A0usr/libexec/git-core/git-remote-fd > @@ -201,6 +200,7 @@ usr/libexec/git-core/mergetools/diffmerge > =C2=A0usr/libexec/git-core/mergetools/diffuse > =C2=A0usr/libexec/git-core/mergetools/ecmerge > =C2=A0usr/libexec/git-core/mergetools/emerge > +usr/libexec/git-core/mergetools/examdiff > =C2=A0usr/libexec/git-core/mergetools/gvimdiff > =C2=A0usr/libexec/git-core/mergetools/gvimdiff2 > =C2=A0usr/libexec/git-core/mergetools/gvimdiff3 > @@ -228,6 +228,7 @@ usr/share/git-core/templates/hooks/pre-applypatch.sample > =C2=A0usr/share/git-core/templates/hooks/pre-commit.sample > =C2=A0usr/share/git-core/templates/hooks/pre-push.sample > =C2=A0usr/share/git-core/templates/hooks/pre-rebase.sample > +usr/share/git-core/templates/hooks/pre-receive.sample > =C2=A0usr/share/git-core/templates/hooks/prepare-commit-msg.sample > =C2=A0usr/share/git-core/templates/hooks/update.sample > =C2=A0#usr/share/git-core/templates/info > @@ -270,6 +271,7 @@ usr/share/git-core/templates/info/exclude > =C2=A0#usr/share/git-gui/lib/msgs/ja.msg > =C2=A0#usr/share/git-gui/lib/msgs/nb.msg > =C2=A0#usr/share/git-gui/lib/msgs/pt_br.msg > +#usr/share/git-gui/lib/msgs/pt_pt.msg > =C2=A0#usr/share/git-gui/lib/msgs/ru.msg > =C2=A0#usr/share/git-gui/lib/msgs/sv.msg > =C2=A0#usr/share/git-gui/lib/msgs/vi.msg > @@ -302,6 +304,7 @@ usr/share/git-core/templates/info/exclude > =C2=A0#usr/share/gitk/lib/msgs/it.msg > =C2=A0#usr/share/gitk/lib/msgs/ja.msg > =C2=A0#usr/share/gitk/lib/msgs/pt_br.msg > +#usr/share/gitk/lib/msgs/pt_pt.msg > =C2=A0#usr/share/gitk/lib/msgs/ru.msg > =C2=A0#usr/share/gitk/lib/msgs/sv.msg > =C2=A0#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 @@ > =C2=A0#####################################################################= ######## > ## > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# IPFire.org - A linux based > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > -# Copyright (C) 2013=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > +# Copyright (C) 2017=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# This program is free software: you can redistribute it and/or > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# it under the terms of the GNU General Public License as published > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > @@ -24,15 +24,15 @@ > =C2=A0 > =C2=A0include Config > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.7.4 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.12.1 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D git-$(VER) > -DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz > +DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > =C2=A0DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D git > -PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 13 > +PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 14 > =C2=A0 > =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "perl-Authen-SASL p= erl-MIME-Base64 perl-Net-SMTP-SSL" > =C2=A0 > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) > =C2=A0 > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_MD5 =3D b0219fcb6d73104361f4fbdba3741d00 > +$(DL_FILE)_MD5 =3D a05c614c80ecd41e50699f1562e1130c > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) > + cd $(DIR_APP) && autoconf Why is this necessary? > =C2=A0 cd $(DIR_APP) && ./configure \ > =C2=A0 --with-gitconfig=3D/etc/gitconfig \ > =C2=A0 --prefix=3D/usr \ --===============6617706208152144205== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlk1Z08wQUFvSkVJQjU4UDl2a0FrSEVBY1AvaTlweE82ZEt1Sy90V0RYcW1LTTBrYjcK aDJSN1ZoMUdXaU54b2RCdVFRTjlQazhlQmN2Q3BhNmJIZm0xenl5cGdhUkdiWkpYQ3RMNTVXdDFl QVUrTFh4TApTbEdhNXkxVkFya0dxQ0FkVXYrb1pCb0RlSm8zMlhrdkx2UGJFMXdyS1FqQ1BtZUtJ K0tqMTJhRUxrZWprbGJvCnFYWEpGRWc4UzUxWFZ1WTkvaElxVVlRTmtsbC9HMk5BbFFmLytXdXZp U3Fxcjl4dmNTMHVWdGVKRXhNUFdhYlEKcEkweW5ROEpnTzVNWmRaMUVFQXl2cnN5ZVI0RFhkcGJZ SCthNVpSdVlUUGxibks3ZGlROVp5RzlqVURBSElrMQpzY2gxSHJXVmlPWVdDQm1xTWluTkFxelVP RVd3YnEzVmZBMGd1QzlDY1lYS3A2UzU3OWE2bTJPbjRMelBrZE1HClVzNk10bEsxc1VncnVzTkc5 K2pmMm0wK2lDaVc0OENvM0hqa3dhbjNZb2h0YWo4Qzg0VzZWWTk0aUx6bUc2ZisKL1JuenVFYk5L YlFSSVFqWFNGYnRyS09PcFNJZlFPWlVRYTdGOVRGaUhDL0cvTlZwNUdZa0tXOENzWElhby9LUwp2 UHo5UkpvU0w1OTI1MFowd0d6cU5DRm5vR1NsYWhBb1crb2JzNXphUlhIeTlUMGRlT0pvOG9BQXJr TUp3WXNMCkpzRk1PTlY1R29MQmptU0VJMjdONWRoQzFiYmJXbFBpakVObDZqNFJPOVBpbE5OZG5L VFVWcnBMYmNYYzJUWHIKQnJDUGtRd1gyWnd4d2s4TmdGZ01sMmdQaFRwb1p3a2dXajVGamhId3Rt aWlIVmNBaTlZa2VUZU4wR2JHUlpPbgprbElXSDZ5MGI5T2VTOHVZek5yQQo9czhKTgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6617706208152144205==--