diff options
| author | Peter Wagner <tripolar@gmx.at> | 2017-03-21 23:31:54 +0100 |
|---|---|---|
| committer | Peter Wagner <tripolar@gmx.at> | 2017-03-21 23:31:54 +0100 |
| commit | 2690fd9eecc0b164cf15a60d4792929c0a9a7d06 (patch) | |
| tree | 5115b5b39507be04b706f733df6ab0edc1926119 /net/git/patches | |
| parent | 9be7653a3a1a8a2865fa40aaef6cbf8b3258be8f (diff) | |
git: update to 1.12.1
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 (renamed from net/git/patches/300-configure_for_crosscompiling) | 6 | ||||
| -rw-r--r-- | net/git/patches/200-disable_fasthash.patch | 12 | ||||
| -rw-r--r-- | net/git/patches/200-imapsend_without_curl.patch (renamed from net/git/patches/400-imapsend_without_curl.patch) | 2 |
3 files changed, 4 insertions, 16 deletions
diff --git a/net/git/patches/300-configure_for_crosscompiling b/net/git/patches/100-configure_for_crosscompiling.patch index 8a8ce289d..e93f71b4d 100644 --- a/net/git/patches/300-configure_for_crosscompiling +++ b/net/git/patches/100-configure_for_crosscompiling.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -867,7 +867,8 @@ AC_RUN_IFELSE( +@@ -869,7 +869,8 @@ AC_RUN_IFELSE( FILE *f = fopen(".", "r"); return f && fread(&c, 1, 1, f)]])], [ac_cv_fread_reads_directories=no], @@ -10,7 +10,7 @@ ]) if test $ac_cv_fread_reads_directories = yes; then FREAD_READS_DIRECTORIES=UnfortunatelyYes -@@ -901,7 +902,8 @@ AC_RUN_IFELSE( +@@ -903,7 +904,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 -@@ -924,7 +926,8 @@ yippeeyeswehaveit +@@ -926,7 +928,8 @@ yippeeyeswehaveit #endif ]), [ac_cv_sane_mode_bits=yes], diff --git a/net/git/patches/200-disable_fasthash.patch b/net/git/patches/200-disable_fasthash.patch deleted file mode 100644 index 91f255f80..000000000 --- a/net/git/patches/200-disable_fasthash.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/config.mak.uname -+++ b/config.mak.uname -@@ -17,9 +17,6 @@ endif - # because maintaining the nesting to match is a pain. If - # we had "elif" things would have been much nicer... - --ifeq ($(uname_M),x86_64) -- XDL_FAST_HASH = YesPlease --endif - ifeq ($(uname_S),OSF1) - # Need this for u_short definitions et al - BASIC_CFLAGS += -D_OSF_SOURCE diff --git a/net/git/patches/400-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 06d32a9d5..83791f280 100644 --- a/net/git/patches/400-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1117,7 +1117,7 @@ else +@@ -1125,7 +1125,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" |