From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Lorenz To: development@lists.ipfire.org Subject: Re: [PATCH] git: update to 2.7.1 v2 Date: Wed, 23 Mar 2016 07:44:12 +0100 Message-ID: <0ec1bb3dab133779b4964251f47aeab7@mail01.ipfire.org> In-Reply-To: <1458684356.30749.70.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6842071457668322682==" List-Id: --===============6842071457668322682== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Ah ok, i will do it so in my next patches... :) Thx for edit. Marcel Am 2016-03-22 23:05, schrieb Michael Tremer: > Hi, >=20 > I merged this because the patch contains a few fixes for some CVEs.=20 > Please > include these in the commit message and not what you changed since the=20 > first > patch. This won't make any sense later when someone only reads the=20 > commit > message. Tell us what was done. Don't assume that the reader knows=20 > about the > first patch. >=20 > I edited that in this patch and merged it. >=20 > -Michael >=20 > 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-S= ASL perl-MIME-Base64=20 >> perl-Net-SMTP-SSL" >>=20 >> Signed-off-by: Marcel Lorenz >>=20 >> --- >> =C2=A0config/rootfiles/packages/git | 44=20 >> +++++++++++++++++++++++------------------- >> - >> =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=20 >> 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) --===============6842071457668322682==--