git: update to 2.18.0

Signed-off-by: Peter Wagner <tripolar@gmx.at>
This commit is contained in:
Peter Wagner 2018-06-22 20:04:23 +02:00
parent f4ee5ce092
commit ecf1e74183
3 changed files with 7 additions and 7 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=git PKG_NAME:=git
PKG_VERSION:=2.17.1 PKG_VERSION:=2.18.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/scm/git/ PKG_SOURCE_URL:=@KERNEL/software/scm/git/
PKG_HASH:=79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e PKG_HASH:=8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

View file

@ -1,8 +1,8 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -925,7 +925,8 @@ AC_RUN_IFELSE( @@ -929,7 +929,8 @@ AC_RUN_IFELSE(
FILE *f = fopen(".", "r"); FILE *f = fopen(".", "r");
return f)]])], return f != NULL;]])],
[ac_cv_fread_reads_directories=no], [ac_cv_fread_reads_directories=no],
- [ac_cv_fread_reads_directories=yes]) - [ac_cv_fread_reads_directories=yes])
+ [ac_cv_fread_reads_directories=yes], + [ac_cv_fread_reads_directories=yes],
@ -10,7 +10,7 @@
]) ])
if test $ac_cv_fread_reads_directories = yes; then if test $ac_cv_fread_reads_directories = yes; then
FREAD_READS_DIRECTORIES=UnfortunatelyYes FREAD_READS_DIRECTORIES=UnfortunatelyYes
@@ -959,7 +960,8 @@ AC_RUN_IFELSE( @@ -963,7 +964,8 @@ AC_RUN_IFELSE(
if (snprintf(buf, 3, "%s", "12345") != 5 if (snprintf(buf, 3, "%s", "12345") != 5
|| strcmp(buf, "12")) return 1]])], || strcmp(buf, "12")) return 1]])],
[ac_cv_snprintf_returns_bogus=no], [ac_cv_snprintf_returns_bogus=no],
@ -20,7 +20,7 @@
]) ])
if test $ac_cv_snprintf_returns_bogus = yes; then if test $ac_cv_snprintf_returns_bogus = yes; then
SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
@@ -982,7 +984,8 @@ yippeeyeswehaveit @@ -986,7 +988,8 @@ yippeeyeswehaveit
#endif #endif
]), ]),
[ac_cv_sane_mode_bits=yes], [ac_cv_sane_mode_bits=yes],

View file

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1238,7 +1238,7 @@ else @@ -1297,7 +1297,7 @@ else
endif endif
curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
ifeq "$(curl_check)" "072200" ifeq "$(curl_check)" "072200"