git: update to 2.33.0

* refresh patches

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>

diff --git a/net/git/Makefile b/net/git/Makefile
index fe45ffd3bcbb78cb93caf8e1d7aeb641b56eed90..b17ae0a15313e2b3d28e87c6995d40ada960d907 100644 (file)
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.30.2
+PKG_VERSION:=2.33.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=41f7d90c71f9476cd387673fcb10ce09ccbed67332436a4cc58d7af32c355faa
+PKG_HASH:=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch
index 3fa826b6b1493f81713905ea0055520bdef95327..a782c7e7be5899b54319cf850e9b591c85ba9f68 100644 (file)
--- a/net/git/patches/100-configure_for_crosscompiling.patch
+++ b/net/git/patches/100-configure_for_crosscompiling.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1001,7 +1001,8 @@ AC_RUN_IFELSE(
+@@ -966,7 +966,8 @@ AC_RUN_IFELSE(
                FILE *f = fopen(".", "r");
                return f != NULL;]])],
        [ac_cv_fread_reads_directories=no],
@@ -10,7 +10,7 @@
  ])
  if test $ac_cv_fread_reads_directories = yes; then
        FREAD_READS_DIRECTORIES=UnfortunatelyYes
-@@ -1035,7 +1036,8 @@ AC_RUN_IFELSE(
+@@ -1000,7 +1001,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
-@@ -1058,7 +1060,8 @@ yippeeyeswehaveit
+@@ -1023,7 +1025,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 fc16f9461de772c812117deb7040924bda951cc2..38c17c25cf85d9738176b5196a2a66a328f0d793 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
-@@ -1434,7 +1434,7 @@ else
+@@ -1448,7 +1448,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"