From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] git: update to 2.12.1
Date: Tue, 18 Apr 2017 14:43:49 +0200
Message-ID: <50bc7ba4c258e0258b2adfc2af538620@ipfire.org>
In-Reply-To: <1492518824.11653.59.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5285773103297861514=="
List-Id: <development.lists.ipfire.org>

--===============5285773103297861514==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

ok, i change it...

-Marcel

Am 2017-04-18 14:33, schrieb Michael Tremer:
> Could you change it to the official release tarball which also has a=20
> configure
> script?
>=20
> On Tue, 2017-04-18 at 14:27 +0200, Marcel Lorenz wrote:
>> Hi,
>>=20
>> i have the file from here:
>>=20
>> https://github.com/git/git/releases
>>=20
>> Best,
>> Marcel
>>=20
>> Am 2017-04-18 14:17, schrieb Michael Tremer:
>> > Hi,
>> >
>> > the tarball from here
>> >
>> > =C2=A0 https://www.kernel.org/pub/software/scm/git/git-2.12.1.tar.gz
>> >
>> > does not match with the checksum in the LFS file. Where did you=C2=A0
>> > download yours
>> > from?
>> >
>> > -Michael
>> >
>> > On Fri, 2017-04-14 at 09:22 +0200, Marcel Lorenz wrote:
>> > > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
>> > > ---
>> > > =C2=A0config/rootfiles/packages/git | 29 ++++++++++++++++-------------
>> > > =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, 22 insertions(+), 18 deletions(-)
>> > >
>> > > diff --git a/config/rootfiles/packages/git=C2=A0
>> > > b/config/rootfiles/packages/git
>> > > index ea31b20..bf9e372 100644
>> > > --- a/config/rootfiles/packages/git
>> > > +++ b/config/rootfiles/packages/git
>> > > @@ -10,18 +10,18 @@ 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/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
>> > > =C2=A0#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/=
Git
>> > > =C2=A0#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-
>> > > multi/auto/Git/.packlist
>> > > =C2=A0#usr/libexec/git-core
>> > > @@ -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 @@=C2=A0
>> > > 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=C2=A0
>> > > Team=C2=A0=C2=A0<info(a)ipfire.org>=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=C2=A0
>> > > Team=C2=A0=C2=A0<info(a)ipfire.org>=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 publis=
hed
>> > > 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-S=
ASL perl-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
>> > > =C2=A0	cd $(DIR_APP) && ./configure \
>> > > =C2=A0		--with-gitconfig=3D/etc/gitconfig \
>> > > =C2=A0		--prefix=3D/usr \
>>=20
>>=20


--===============5285773103297861514==--