git: update to 2.14.0

Signed-off-by: Peter Wagner <tripolar@gmx.at>

diff --git a/net/git/Makefile b/net/git/Makefile
index 5de00f48ade0fe5d1088e2ccc0465226229c6170..b1d1e656fae885d8232bd4e5d504aa8e1b7ec921 100644 (file)
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.13.3
+PKG_VERSION:=2.14.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62
+PKG_HASH:=f93e6e6a307d2e953cccafd9f4003c62992628fa508d07586476c953c1655975
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch
index e93f71b4d0bb46287922fd3b8c01061c876f18e1..b077c55c20af7afaa359e725a03c773d86bc87b3 100644 (file)
--- a/net/git/patches/100-configure_for_crosscompiling.patch
+++ b/net/git/patches/100-configure_for_crosscompiling.patch
@@ -1,8 +1,8 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -869,7 +869,8 @@ AC_RUN_IFELSE(
+@@ -926,7 +926,8 @@ AC_RUN_IFELSE(
                FILE *f = fopen(".", "r");
-               return f && fread(&c, 1, 1, f)]])],
+               return f)]])],
        [ac_cv_fread_reads_directories=no],
 -      [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
        FREAD_READS_DIRECTORIES=UnfortunatelyYes
-@@ -903,7 +904,8 @@ AC_RUN_IFELSE(
+@@ -960,7 +961,8 @@ AC_RUN_IFELSE(
                  if (snprintf(buf, 3, "%s", "12345") != 5
                      || strcmp(buf, "12")) return 1]])],
        [ac_cv_snprintf_returns_bogus=no],
@@ -20,7 +20,7 @@
  ])
  if test $ac_cv_snprintf_returns_bogus = yes; then
        SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
-@@ -926,7 +928,8 @@ yippeeyeswehaveit
+@@ -983,7 +985,8 @@ yippeeyeswehaveit
  #endif
  ]),
        [ac_cv_sane_mode_bits=yes],

diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch
index 4431dab815304828e93fb2a872952e845544318a..1b9c478155a7c4aba260595072afc799853f62c8 100644 (file)
--- a/net/git/patches/200-imapsend_without_curl.patch
+++ b/net/git/patches/200-imapsend_without_curl.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1137,7 +1137,7 @@ else
+@@ -1197,7 +1197,7 @@ else
        endif
        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"