From: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
Date: Tue, 24 Sep 2024 12:28:17 +0000 (+0300)
Subject: git: update to 2.46.2
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a8dd735d98f36faf0d6a2bad5c550c18e40b2e13;p=feed%2Fpackages.git

git: update to 2.46.2

- Refresh patches

Signed-off-by: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
---

diff --git a/net/git/Makefile b/net/git/Makefile
index e79b400f59..ffa5fdea38 100644
--- 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 725c62ec8b..061a44341f 100644
--- 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 abd5c61ada..16b5543a0d 100644
--- 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 <rosenp@gmail.com>
 
 --- 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;