git: update to 2.7.1 v2
| Message ID | 1458668581-8133-1-git-send-email-marcel.lorenz@ipfire.org |
|---|---|
| State | Accepted |
| Commit | 4d137b36f1c669eddb938b95597f22ce168d7374 |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (hedwig.ipfire.org [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id D961761204 for <patchwork@ipfire.org>; Tue, 22 Mar 2016 18:31:18 +0100 (CET) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 1060D1CF1; Tue, 22 Mar 2016 18:31:18 +0100 (CET) Received: from mint01.skynet.local (ip5f5b7cdb.dynamic.kabel-deutschland.de [95.91.124.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id B7983183C; Tue, 22 Mar 2016 18:31:14 +0100 (CET) From: Marcel Lorenz <marcel.lorenz@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] git: update to 2.7.1 v2 Date: Tue, 22 Mar 2016 18:43:01 +0100 Message-Id: <1458668581-8133-1-git-send-email-marcel.lorenz@ipfire.org> X-Mailer: git-send-email 1.9.1 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Marcel Lorenz
March 23, 2016, 4:43 a.m. UTC
now with: DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
config/rootfiles/packages/git | 44 +++++++++++++++++++++++--------------------
lfs/git | 7 +++----
2 files changed, 27 insertions(+), 24 deletions(-)
Comments
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 = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL" > > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > > --- > config/rootfiles/packages/git | 44 +++++++++++++++++++++++------------------- > - > lfs/git | 7 +++---- > 2 files changed, 27 insertions(+), 24 deletions(-) > > 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 > usr/bin/git-upload-pack > #usr/bin/gitk > usr/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 > 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/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.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/libexec/git-core > -usr/libexec/git-core/git > +#usr/libexec/git-core > +#usr/libexec/git-core/git > usr/libexec/git-core/git-add > usr/libexec/git-core/git-add--interactive > usr/libexec/git-core/git-am > @@ -172,6 +172,7 @@ usr/libexec/git-core/git-stash > usr/libexec/git-core/git-status > usr/libexec/git-core/git-stripspace > usr/libexec/git-core/git-submodule > +usr/libexec/git-core/git-submodule--helper > usr/libexec/git-core/git-svn > usr/libexec/git-core/git-symbolic-ref > usr/libexec/git-core/git-tag > @@ -188,8 +189,9 @@ usr/libexec/git-core/git-verify-pack > usr/libexec/git-core/git-verify-tag > usr/libexec/git-core/git-web--browse > usr/libexec/git-core/git-whatchanged > +usr/libexec/git-core/git-worktree > usr/libexec/git-core/git-write-tree > -usr/libexec/git-core/mergetools > +#usr/libexec/git-core/mergetools > usr/libexec/git-core/mergetools/araxis > usr/libexec/git-core/mergetools/bc > usr/libexec/git-core/mergetools/bc3 > @@ -212,12 +214,13 @@ usr/libexec/git-core/mergetools/tortoisemerge > usr/libexec/git-core/mergetools/vimdiff > usr/libexec/git-core/mergetools/vimdiff2 > usr/libexec/git-core/mergetools/vimdiff3 > +usr/libexec/git-core/mergetools/winmerge > usr/libexec/git-core/mergetools/xxdiff > -usr/share/git-core > -usr/share/git-core/templates > +#usr/share/git-core > +#usr/share/git-core/templates > usr/share/git-core/templates/branches > usr/share/git-core/templates/description > -usr/share/git-core/templates/hooks > +#usr/share/git-core/templates/hooks > usr/share/git-core/templates/hooks/applypatch-msg.sample > usr/share/git-core/templates/hooks/commit-msg.sample > usr/share/git-core/templates/hooks/post-update.sample > @@ -227,7 +230,7 @@ usr/share/git-core/templates/hooks/pre-push.sample > usr/share/git-core/templates/hooks/pre-rebase.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 > +#usr/share/git-core/templates/info > usr/share/git-core/templates/info/exclude > #usr/share/git-gui > #usr/share/git-gui/lib > @@ -315,6 +318,7 @@ usr/share/git-core/templates/info/exclude > #usr/share/locale/fr/LC_MESSAGES/git.mo > #usr/share/locale/is/LC_MESSAGES/git.mo > #usr/share/locale/it/LC_MESSAGES/git.mo > +#usr/share/locale/ko/LC_MESSAGES/git.mo > #usr/share/locale/pt_PT/LC_MESSAGES/git.mo > #usr/share/locale/ru/LC_MESSAGES/git.mo > #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 @@ > > include Config > > -VER = 2.4.4 > +VER = 2.7.1 > > THISAPP = git-$(VER) > DL_FILE = $(THISAPP).tar.xz > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31 > +$(DL_FILE)_MD5 = eece7b1e87983271621a0cb6aab37a25 > > install : $(TARGET) > > @@ -78,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) > cd $(DIR_APP) && ./configure \ > + --with-gitconfig=/etc/gitconfig \ > --prefix=/usr \ > --with-libpcre \ > --with-curl \ > --with-expat > - > cd $(DIR_APP) && make $(MAKETUNING) > cd $(DIR_APP) && make install > - > @rm -rf $(DIR_APP) > @$(POSTBUILD)
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, > > 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 = "perl-Authen-SASL perl-MIME-Base64 >> perl-Net-SMTP-SSL" >> >> Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> >> >> --- >> config/rootfiles/packages/git | 44 >> +++++++++++++++++++++++------------------- >> - >> lfs/git | 7 +++---- >> 2 files changed, 27 insertions(+), 24 deletions(-) >> >> 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 >> usr/bin/git-upload-pack >> #usr/bin/gitk >> usr/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 >> 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/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.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/libexec/git-core >> -usr/libexec/git-core/git >> +#usr/libexec/git-core >> +#usr/libexec/git-core/git >> usr/libexec/git-core/git-add >> usr/libexec/git-core/git-add--interactive >> usr/libexec/git-core/git-am >> @@ -172,6 +172,7 @@ usr/libexec/git-core/git-stash >> usr/libexec/git-core/git-status >> usr/libexec/git-core/git-stripspace >> usr/libexec/git-core/git-submodule >> +usr/libexec/git-core/git-submodule--helper >> usr/libexec/git-core/git-svn >> usr/libexec/git-core/git-symbolic-ref >> usr/libexec/git-core/git-tag >> @@ -188,8 +189,9 @@ usr/libexec/git-core/git-verify-pack >> usr/libexec/git-core/git-verify-tag >> usr/libexec/git-core/git-web--browse >> usr/libexec/git-core/git-whatchanged >> +usr/libexec/git-core/git-worktree >> usr/libexec/git-core/git-write-tree >> -usr/libexec/git-core/mergetools >> +#usr/libexec/git-core/mergetools >> usr/libexec/git-core/mergetools/araxis >> usr/libexec/git-core/mergetools/bc >> usr/libexec/git-core/mergetools/bc3 >> @@ -212,12 +214,13 @@ usr/libexec/git-core/mergetools/tortoisemerge >> usr/libexec/git-core/mergetools/vimdiff >> usr/libexec/git-core/mergetools/vimdiff2 >> usr/libexec/git-core/mergetools/vimdiff3 >> +usr/libexec/git-core/mergetools/winmerge >> usr/libexec/git-core/mergetools/xxdiff >> -usr/share/git-core >> -usr/share/git-core/templates >> +#usr/share/git-core >> +#usr/share/git-core/templates >> usr/share/git-core/templates/branches >> usr/share/git-core/templates/description >> -usr/share/git-core/templates/hooks >> +#usr/share/git-core/templates/hooks >> usr/share/git-core/templates/hooks/applypatch-msg.sample >> usr/share/git-core/templates/hooks/commit-msg.sample >> usr/share/git-core/templates/hooks/post-update.sample >> @@ -227,7 +230,7 @@ usr/share/git-core/templates/hooks/pre-push.sample >> usr/share/git-core/templates/hooks/pre-rebase.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 >> +#usr/share/git-core/templates/info >> usr/share/git-core/templates/info/exclude >> #usr/share/git-gui >> #usr/share/git-gui/lib >> @@ -315,6 +318,7 @@ usr/share/git-core/templates/info/exclude >> #usr/share/locale/fr/LC_MESSAGES/git.mo >> #usr/share/locale/is/LC_MESSAGES/git.mo >> #usr/share/locale/it/LC_MESSAGES/git.mo >> +#usr/share/locale/ko/LC_MESSAGES/git.mo >> #usr/share/locale/pt_PT/LC_MESSAGES/git.mo >> #usr/share/locale/ru/LC_MESSAGES/git.mo >> #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 @@ >> >> include Config >> >> -VER = 2.4.4 >> +VER = 2.7.1 >> >> THISAPP = git-$(VER) >> DL_FILE = $(THISAPP).tar.xz >> @@ -44,7 +44,7 @@ objects = $(DL_FILE) >> >> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31 >> +$(DL_FILE)_MD5 = eece7b1e87983271621a0cb6aab37a25 >> >> install : $(TARGET) >> >> @@ -78,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> @$(PREBUILD) >> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >> cd $(DIR_APP) && ./configure \ >> + --with-gitconfig=/etc/gitconfig \ >> --prefix=/usr \ >> --with-libpcre \ >> --with-curl \ >> --with-expat >> - >> cd $(DIR_APP) && make $(MAKETUNING) >> cd $(DIR_APP) && make install >> - >> @rm -rf $(DIR_APP) >> @$(POSTBUILD)