git: update to 2.46.2

- Refresh patches

Signed-off-by: Aleksey Vasilenko <[email protected]>

diff --git a/net/git/Makefile b/net/git/Makefile
index e79b400f5916b844f068b05b2019f9edbf851688..ffa5fdea38ba24f2d791a8c7df9f4c0f0220655a 100644 (file)
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.45.2
+PKG_VERSION:=2.46.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
+PKG_HASH:=5ee8a1c68536094a4f7f9515edc154b12a275b8a57dda4c21ecfbf1afbae2ca3
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch
index 725c62ec8b2854a947ef02e97571ceccdf9f733c..061a44341fbf63a418095bde236bab7974ff5e7f 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
-@@ -1642,7 +1642,7 @@ else
+@@ -1636,7 +1636,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"

diff --git a/net/git/patches/300-openssl-deprecated.patch b/net/git/patches/300-openssl-deprecated.patch
index abd5c61ada77e4ed262fc9be20a0fb6989f468e9..16b5543a0d8b50756c28fd8af174526b0b985ca3 100644 (file)
--- a/net/git/patches/300-openssl-deprecated.patch
+++ b/net/git/patches/300-openssl-deprecated.patch
@@ -14,7 +14,7 @@ Signed-off-by: Rosen Penev <[email protected]>
 
 --- a/imap-send.c
 +++ b/imap-send.c
-@@ -261,8 +261,10 @@ static int ssl_socket_connect(struct ima
+@@ -259,8 +259,10 @@ static int ssl_socket_connect(struct ima
        int ret;
        X509 *cert;