diff options
| author | Peter Wagner <tripolar@gmx.at> | 2017-08-07 18:43:31 +0200 |
|---|---|---|
| committer | Peter Wagner <tripolar@gmx.at> | 2017-08-07 18:43:31 +0200 |
| commit | 61f48f8df828a3e7a0f694183e5466a74919226d (patch) | |
| tree | ccd5bffdd37bf0bdf089177cc10340d6fca9cba3 /net/git/patches | |
| parent | 568882c31a15d5f9920c7d2bde1e0b09407ebcf2 (diff) | |
git: update to 2.14.0
Signed-off-by: Peter Wagner <tripolar@gmx.at>
Diffstat (limited to 'net/git/patches')
| -rw-r--r-- | net/git/patches/100-configure_for_crosscompiling.patch | 8 | ||||
| -rw-r--r-- | net/git/patches/200-imapsend_without_curl.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch index e93f71b4d..b077c55c2 100644 --- a/net/git/patches/100-configure_for_crosscompiling.patch +++ b/net/git/patches/100-configure_for_crosscompiling.patch @@ -1,8 +1,8 @@ --- a/configure.ac +++ b/configure.ac -@@ -869,7 +869,8 @@ AC_RUN_IFELSE( +@@ -926,7 +926,8 @@ AC_RUN_IFELSE( FILE *f = fopen(".", "r"); - return f && fread(&c, 1, 1, f)]])], + return f)]])], [ac_cv_fread_reads_directories=no], - [ac_cv_fread_reads_directories=yes]) + [ac_cv_fread_reads_directories=yes], @@ -10,7 +10,7 @@ ]) if test $ac_cv_fread_reads_directories = yes; then FREAD_READS_DIRECTORIES=UnfortunatelyYes -@@ -903,7 +904,8 @@ AC_RUN_IFELSE( +@@ -960,7 +961,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 -@@ -926,7 +928,8 @@ yippeeyeswehaveit +@@ -983,7 +985,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 4431dab81..1b9c47815 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 -@@ -1137,7 +1137,7 @@ else +@@ -1197,7 +1197,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" |