public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH] git: update to 2.7.1 v2
@ 2016-03-22 17:43 Marcel Lorenz
  2016-03-22 22:05 ` Michael Tremer
  0 siblings, 1 reply; 3+ messages in thread
From: Marcel Lorenz @ 2016-03-22 17:43 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 5531 bytes --]

now with: DEPS       = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)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)
-- 
1.9.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] git: update to 2.7.1 v2
  2016-03-22 17:43 [PATCH] git: update to 2.7.1 v2 Marcel Lorenz
@ 2016-03-22 22:05 ` Michael Tremer
  2016-03-23  6:44   ` Marcel Lorenz
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Tremer @ 2016-03-22 22:05 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 6383 bytes --]

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(a)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)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] git: update to 2.7.1 v2
  2016-03-22 22:05 ` Michael Tremer
@ 2016-03-23  6:44   ` Marcel Lorenz
  0 siblings, 0 replies; 3+ messages in thread
From: Marcel Lorenz @ 2016-03-23  6:44 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 6714 bytes --]


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(a)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)


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-03-23  6:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-22 17:43 [PATCH] git: update to 2.7.1 v2 Marcel Lorenz
2016-03-22 22:05 ` Michael Tremer
2016-03-23  6:44   ` Marcel Lorenz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox