aboutsummaryrefslogtreecommitdiff
path: root/net/git/patches
diff options
context:
space:
mode:
authorMichal Vasilek <michal.vasilek@nic.cz>2021-08-18 14:52:15 +0200
committerMichal Vasilek <michal.vasilek@nic.cz>2021-08-18 14:53:03 +0200
commite684672916f3a8ca54ddd66ec09c2e87b32726d9 (patch)
treeca059268084ed9829226116b7b0c3868187eea9a /net/git/patches
parent1cba8af1b1eb4b499488534164cd3d41b33026ea (diff)
git: update to 2.33.0
* refresh patches Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
Diffstat (limited to 'net/git/patches')
-rw-r--r--net/git/patches/100-configure_for_crosscompiling.patch6
-rw-r--r--net/git/patches/200-imapsend_without_curl.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch
index 3fa826b6b..a782c7e7b 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
-@@ -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 fc16f9461..38c17c25c 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
-@@ -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"