mbox

[v3] git: update to 2.12.1

Message ID 20170418125605.19448-1-marcel.lorenz@ipfire.org
State Accepted
Commit 4c6b2034921fcfbff5fc92ab567c56c47fe99137
Headers

Message

Marcel Lorenz April 18, 2017, 10:56 p.m. UTC 
  Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
 config/rootfiles/packages/git | 29 ++++++++++++++++-------------
 lfs/git                       |  8 ++++----
 2 files changed, 20 insertions(+), 17 deletions(-)

Comments

Michael Tremer April 18, 2017, 11:05 p.m. UTC | #1 
Thank you.

And since this is becoming a bit of a habit for some people here, a public
announcement: Do not forget to upload the source tarballs!

-Michael

On Tue, 2017-04-18 at 14:56 +0200, Marcel Lorenz wrote:
> Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
> ---
>  config/rootfiles/packages/git | 29 ++++++++++++++++-------------
>  lfs/git                       |  8 ++++----
>  2 files changed, 20 insertions(+), 17 deletions(-)
> 
> diff --git a/config/rootfiles/packages/git 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
>  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/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
>  #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
> @@ -138,7 +138,6 @@ usr/libexec/git-core/git-rebase--interactive
>  usr/libexec/git-core/git-rebase--merge
>  usr/libexec/git-core/git-receive-pack
>  usr/libexec/git-core/git-reflog
> -usr/libexec/git-core/git-relink
>  usr/libexec/git-core/git-remote
>  usr/libexec/git-core/git-remote-ext
>  usr/libexec/git-core/git-remote-fd
> @@ -201,6 +200,7 @@ usr/libexec/git-core/mergetools/diffmerge
>  usr/libexec/git-core/mergetools/diffuse
>  usr/libexec/git-core/mergetools/ecmerge
>  usr/libexec/git-core/mergetools/emerge
> +usr/libexec/git-core/mergetools/examdiff
>  usr/libexec/git-core/mergetools/gvimdiff
>  usr/libexec/git-core/mergetools/gvimdiff2
>  usr/libexec/git-core/mergetools/gvimdiff3
> @@ -228,6 +228,7 @@ usr/share/git-core/templates/hooks/pre-applypatch.sample
>  usr/share/git-core/templates/hooks/pre-commit.sample
>  usr/share/git-core/templates/hooks/pre-push.sample
>  usr/share/git-core/templates/hooks/pre-rebase.sample
> +usr/share/git-core/templates/hooks/pre-receive.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
> @@ -270,6 +271,7 @@ usr/share/git-core/templates/info/exclude
>  #usr/share/git-gui/lib/msgs/ja.msg
>  #usr/share/git-gui/lib/msgs/nb.msg
>  #usr/share/git-gui/lib/msgs/pt_br.msg
> +#usr/share/git-gui/lib/msgs/pt_pt.msg
>  #usr/share/git-gui/lib/msgs/ru.msg
>  #usr/share/git-gui/lib/msgs/sv.msg
>  #usr/share/git-gui/lib/msgs/vi.msg
> @@ -302,6 +304,7 @@ usr/share/git-core/templates/info/exclude
>  #usr/share/gitk/lib/msgs/it.msg
>  #usr/share/gitk/lib/msgs/ja.msg
>  #usr/share/gitk/lib/msgs/pt_br.msg
> +#usr/share/gitk/lib/msgs/pt_pt.msg
>  #usr/share/gitk/lib/msgs/ru.msg
>  #usr/share/gitk/lib/msgs/sv.msg
>  #usr/share/gitk/lib/msgs/vi.msg
> diff --git a/lfs/git b/lfs/git
> index 564bc09..9ffd089 100644
> --- a/lfs/git
> +++ b/lfs/git
> @@ -1,7 +1,7 @@
>  #############################################################################
> ##
>  #                                                                            
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2013  IPFire Team  <info@ipfire.org>                         
>  #
> +# Copyright (C) 2017  IPFire Team  <info@ipfire.org>                         
>  #
>  #                                                                            
>  #
>  # This program is free software: you can redistribute it and/or
> modify        #
>  # it under the terms of the GNU General Public License as published
> by        #
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 2.7.4
> +VER        = 2.12.2
>  
>  THISAPP    = git-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = git
> -PAK_VER    = 13
> +PAK_VER    = 14
>  
>  DEPS       = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
>  
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = b0219fcb6d73104361f4fbdba3741d00
> +$(DL_FILE)_MD5 = ad5ae08664c40caf074392abc301cccd
>  
>  install : $(TARGET)
>