git: update to 2.50.1

- Refresh and rebase patches

Signed-off-by: Richard Muzik <richard.muzik@turris.com>
This commit is contained in:
Richard Muzik
2025-07-21 09:47:37 +02:00
committed by Tianling Shen
parent e09ffebce1
commit a162c5dddc
4 changed files with 5 additions and 7 deletions

View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=git
PKG_VERSION:=2.46.4
PKG_VERSION:=2.50.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/scm/git/
PKG_HASH:=0d5c029edfea24abb4cbda385eff2b66ae946dd74849a350e4420f1eefa71aad
PKG_HASH:=7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING

View File

@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -1636,7 +1636,7 @@ else
@@ -1685,7 +1685,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"

View File

@@ -14,7 +14,7 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
--- a/imap-send.c
+++ b/imap-send.c
@@ -259,8 +259,10 @@ static int ssl_socket_connect(struct ima
@@ -263,8 +263,10 @@ static int ssl_socket_connect(struct ima
int ret;
X509 *cert;

View File

@@ -22,7 +22,7 @@ Signed-off-by: Mauro Condarelli <mc5686 at mclink.it>
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -4,12 +4,12 @@
@@ -4,11 +4,11 @@
# Microsoft's Safe Exception Handling in libraries (such as zlib).
# Typically required for VS2013+/32-bit compilation on Vista+ versions.
@@ -30,13 +30,11 @@ Signed-off-by: Mauro Condarelli <mc5686 at mclink.it>
-uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
-uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
-uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
-uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
-uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
+uname_S ?= $(shell sh -c 'uname -s 2>/dev/null || echo not')
+uname_M ?= $(shell sh -c 'uname -m 2>/dev/null || echo not')
+uname_O ?= $(shell sh -c 'uname -o 2>/dev/null || echo not')
+uname_R ?= $(shell sh -c 'uname -r 2>/dev/null || echo not')
+uname_P ?= $(shell sh -c 'uname -p 2>/dev/null || echo not')
+uname_V ?= $(shell sh -c 'uname -v 2>/dev/null || echo not')
ifneq ($(findstring MINGW,$(uname_S)),)