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.7.1 v2 Date: Tue, 22 Mar 2016 22:05:56 +0000 Message-ID: <1458684356.30749.70.camel@ipfire.org> In-Reply-To: <1458668581-8133-1-git-send-email-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9070079010309546584==" List-Id: --===============9070079010309546584== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, I merged this because the patch contains a few fixes for some CVEs. Please include these in the commit message and not what you changed since the first patch. This won't make any sense later when someone only reads the commit message. Tell us what was done. Don't assume that the reader knows about the first patch. I edited that in this patch and merged it. -Michael On Tue, 2016-03-22 at 18:43 +0100, Marcel Lorenz wrote: > now with: DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "perl-Authen-SA= SL perl-MIME-Base64 perl-Net-SMTP-SSL" >=20 > Signed-off-by: Marcel Lorenz >=20 > --- > =C2=A0config/rootfiles/packages/git | 44 +++++++++++++++++++++++-----------= -------- > - > =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|=C2=A0=C2=A07 +++---- > =C2=A02 files changed, 27 insertions(+), 24 deletions(-) >=20 > diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git > index e168483..ea31b20 100644 > --- a/config/rootfiles/packages/git > +++ b/config/rootfiles/packages/git > @@ -6,26 +6,26 @@ usr/bin/git-upload-archive > =C2=A0usr/bin/git-upload-pack > =C2=A0#usr/bin/gitk > =C2=A0usr/lib/perl5/site_perl/5.12.3/Error.pm > -usr/lib/perl5/site_perl/5.12.3/Git > +#usr/lib/perl5/site_perl/5.12.3/Git > =C2=A0usr/lib/perl5/site_perl/5.12.3/Git.pm > =C2=A0usr/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/IndexInfo.pm > =C2=A0#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.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 > -usr/libexec/git-core > -usr/libexec/git-core/git > +#usr/libexec/git-core > +#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 > @@ -172,6 +172,7 @@ usr/libexec/git-core/git-stash > =C2=A0usr/libexec/git-core/git-status > =C2=A0usr/libexec/git-core/git-stripspace > =C2=A0usr/libexec/git-core/git-submodule > +usr/libexec/git-core/git-submodule--helper > =C2=A0usr/libexec/git-core/git-svn > =C2=A0usr/libexec/git-core/git-symbolic-ref > =C2=A0usr/libexec/git-core/git-tag > @@ -188,8 +189,9 @@ usr/libexec/git-core/git-verify-pack > =C2=A0usr/libexec/git-core/git-verify-tag > =C2=A0usr/libexec/git-core/git-web--browse > =C2=A0usr/libexec/git-core/git-whatchanged > +usr/libexec/git-core/git-worktree > =C2=A0usr/libexec/git-core/git-write-tree > -usr/libexec/git-core/mergetools > +#usr/libexec/git-core/mergetools > =C2=A0usr/libexec/git-core/mergetools/araxis > =C2=A0usr/libexec/git-core/mergetools/bc > =C2=A0usr/libexec/git-core/mergetools/bc3 > @@ -212,12 +214,13 @@ usr/libexec/git-core/mergetools/tortoisemerge > =C2=A0usr/libexec/git-core/mergetools/vimdiff > =C2=A0usr/libexec/git-core/mergetools/vimdiff2 > =C2=A0usr/libexec/git-core/mergetools/vimdiff3 > +usr/libexec/git-core/mergetools/winmerge > =C2=A0usr/libexec/git-core/mergetools/xxdiff > -usr/share/git-core > -usr/share/git-core/templates > +#usr/share/git-core > +#usr/share/git-core/templates > =C2=A0usr/share/git-core/templates/branches > =C2=A0usr/share/git-core/templates/description > -usr/share/git-core/templates/hooks > +#usr/share/git-core/templates/hooks > =C2=A0usr/share/git-core/templates/hooks/applypatch-msg.sample > =C2=A0usr/share/git-core/templates/hooks/commit-msg.sample > =C2=A0usr/share/git-core/templates/hooks/post-update.sample > @@ -227,7 +230,7 @@ usr/share/git-core/templates/hooks/pre-push.sample > =C2=A0usr/share/git-core/templates/hooks/pre-rebase.sample > =C2=A0usr/share/git-core/templates/hooks/prepare-commit-msg.sample > =C2=A0usr/share/git-core/templates/hooks/update.sample > -usr/share/git-core/templates/info > +#usr/share/git-core/templates/info > =C2=A0usr/share/git-core/templates/info/exclude > =C2=A0#usr/share/git-gui > =C2=A0#usr/share/git-gui/lib > @@ -315,6 +318,7 @@ usr/share/git-core/templates/info/exclude > =C2=A0#usr/share/locale/fr/LC_MESSAGES/git.mo > =C2=A0#usr/share/locale/is/LC_MESSAGES/git.mo > =C2=A0#usr/share/locale/it/LC_MESSAGES/git.mo > +#usr/share/locale/ko/LC_MESSAGES/git.mo > =C2=A0#usr/share/locale/pt_PT/LC_MESSAGES/git.mo > =C2=A0#usr/share/locale/ru/LC_MESSAGES/git.mo > =C2=A0#usr/share/locale/sv/LC_MESSAGES/git.mo > diff --git a/lfs/git b/lfs/git > index bbec140..032907b 100644 > --- a/lfs/git > +++ b/lfs/git > @@ -24,7 +24,7 @@ > =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.4.4 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.7.1 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D git-$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz > @@ -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 847787cd0616d38b0e429ea85f558c31 > +$(DL_FILE)_MD5 =3D eece7b1e87983271621a0cb6aab37a25 > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > @@ -78,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) > =C2=A0 cd $(DIR_APP) && ./configure \ > + --with-gitconfig=3D/etc/gitconfig \ > =C2=A0 --prefix=3D/usr \ > =C2=A0 --with-libpcre \ > =C2=A0 --with-curl \ > =C2=A0 --with-expat > - > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) > =C2=A0 cd $(DIR_APP) && make install > - > =C2=A0 @rm -rf $(DIR_APP) > =C2=A0 @$(POSTBUILD) --===============9070079010309546584== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlc4Y0hFQUFvSkVJQjU4UDl2a0FrSHV1UVFBSmVLbnRaQXQ3Vlh5QThOR3BXRjFDaWEK VlFiUjZObGdER3djQmtIV2Zrdm1PeDhyMURRbFI3OWdMMWVzL2x5U0lUcVUveFloQWdveVFBcklx bXFMOVoyagprWkxWYm9zekhINHlmTzI4VXNHcWFXMzhDQXVWS2FHdkF6V1hpTFlSTWM1TkdqRWhz ODRRdGxPMWIwSVcvOGgyCmRDNHNrZ01KNkRFRFhaSUhWMGxlejJpU0ZNT1ZUZzJNemwwTEI2N2hV ck9hY1BsNkJ5RlpRWEF3WER4SGZCbTEKcHFsTmwvd3NqQ005aDcrRUdDSnV6cjlRNUg0UHlUR0NI R0V6SHRaU1c0UEJpQmpvOUhvK0VwQWZLU3NjdDI3ZQpZdnV0dzFzUmM4MmtLMm96R2N1b3EwTXBP U2JGZWN6cWVwUnMxblp1aUNjYS9HRUdIbDZnbjJ6S2pHYmVsZ1RwCnNsYnVjRWQvV2ZCKzZtUHRv N0VIMjBzU2J0ZTVxVlFwSU5IOUp4elRqZFJIbW1oMDY4Q0VuVitYRGxNcTBNQ0wKZ0M4STFLR3NZ QTRwL254NFhwWVY3RmJBRFNpVk4yZWFKaUJ0NmRBYmx4TFBwOGppY1RJcTdsM1gzNkl0bE10VgpC SGZKRUl4ME11TWxKOVpmRlllUVk2cG11blpFcmJJL2FTNXRRVnB1VTdSTXM5ZmR6b24xVlhqQ1Br UGhGOUUwCnFieTY1OEplaFQxcy9TZy8vMUlLd25MQXZtdHlXRTk2RmxMVC9IcnRmVkVaQ0EyY2FE ZXJic3FCSXVsaTZ2SmgKQXdIa29xZFh4S3JIYWRYWDRVbHJqUzBqZ2UxQVhGUDhZSTRlRGZEQWpj ZEdKT1NqNHJkY29zRTdyYTVqOXlKMgovZ1Z6eGRnQjYrZE9QRnlSdXNaUwo9SElucgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============9070079010309546584==--