From 53fa23900a58fbd77a00c04e31d35a99ccf02b4c Mon Sep 17 00:00:00 2001 From: krant Date: Tue, 6 Feb 2024 10:10:04 +0200 Subject: [PATCH] git: update to 2.43.0 - Refresh patches Signed-off-by: krant (cherry picked from commit 158b76119385cc5d4bacdde9b903da8cabd44706) --- net/git/Makefile | 4 ++-- net/git/patches/100-configure_for_crosscompiling.patch | 6 +++--- net/git/patches/300-openssl-deprecated.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/git/Makefile b/net/git/Makefile index 7d674d78c9..88030a872c 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.39.2 +PKG_VERSION:=2.43.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 +PKG_HASH:=5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec 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 b2c77052f9..18b0aa96da 100644 --- 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 -@@ -955,7 +955,8 @@ AC_RUN_IFELSE( +@@ -964,7 +964,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 -@@ -989,7 +990,8 @@ AC_RUN_IFELSE( +@@ -998,7 +999,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 -@@ -1012,7 +1014,8 @@ yippeeyeswehaveit +@@ -1021,7 +1023,8 @@ yippeeyeswehaveit #endif ]), [ac_cv_sane_mode_bits=yes], diff --git a/net/git/patches/300-openssl-deprecated.patch b/net/git/patches/300-openssl-deprecated.patch index c0eb5a06f0..5a29a8d8e0 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 --- a/imap-send.c +++ b/imap-send.c -@@ -274,8 +274,10 @@ static int ssl_socket_connect(struct ima +@@ -279,8 +279,10 @@ static int ssl_socket_connect(struct ima int ret; X509 *cert; -- 2.30.2